diff --git a/po/ca.po b/po/ca.po index 3ef4ffc01ae51c..ace9b3ca460a68 100644 --- a/po/ca.po +++ b/po/ca.po @@ -88,234 +88,227 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.2.2\n" -#: add-interactive.c:391 +#: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "Perdó (%s)?" -#: add-interactive.c:545 add-interactive.c:855 builtin/merge.c:383 -#: builtin/rebase.c:1329 builtin/rebase.c:1741 reset.c:146 sequencer.c:3812 -#: sequencer.c:4289 sequencer.c:4682 +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "no s'ha pogut llegir l'índex" -#: add-interactive.c:599 +#: add-interactive.c msgid "binary" msgstr "binari" -#: add-interactive.c:657 +#: add-interactive.c msgid "nothing" msgstr "res" -#: add-interactive.c:658 +#: add-interactive.c msgid "unchanged" msgstr "sense canvis" -#: add-interactive.c:695 +#: add-interactive.c msgid "Update" msgstr "Actualitza" -#: add-interactive.c:716 add-interactive.c:720 add-interactive.c:911 +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "no s'ha pogut fer «stage» «%s»" -#: add-interactive.c:726 add-interactive.c:918 builtin/stash.c:525 -#: builtin/stash.c:542 builtin/stash.c:612 builtin/stash.c:1379 -#: builtin/stash.c:1571 reset.c:175 sequencer.c:4053 +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "no s'ha pogut escriure l'índex" -#: add-interactive.c:729 +#: add-interactive.c #, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: add-interactive.c:747 +#: add-interactive.c #, c-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: add-interactive.c:752 apply.c:4161 builtin/checkout.c:325 -#: builtin/reset.c:184 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí «%s»" -#: add-interactive.c:784 +#: add-interactive.c msgid "Revert" msgstr "Reverteix" -#: add-interactive.c:800 +#: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "No s'ha pogut analitzar HEAD^{tree}" -#: add-interactive.c:838 +#: add-interactive.c #, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camí\n" msgstr[1] "revertits %d camins\n" -#: add-interactive.c:890 +#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: add-interactive.c:894 +#: add-interactive.c msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: add-interactive.c:921 +#: add-interactive.c #, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camí\n" msgstr[1] "afegits %d camins\n" -#: add-interactive.c:951 +#: add-interactive.c #, c-format msgid "ignoring unmerged: %s" msgstr "s'està ignorant allò no fusionat: %s" -#: add-interactive.c:963 +#: add-interactive.c #, c-format msgid "Only binary files changed.\n" msgstr "Només han canviat fitxers binaris.\n" -#: add-interactive.c:965 +#: add-interactive.c #, c-format msgid "No changes.\n" msgstr "Sense canvis.\n" -#: add-interactive.c:969 +#: add-interactive.c msgid "Patch update" msgstr "Actualització del pedaç" -#: add-interactive.c:1010 +#: add-interactive.c msgid "Review diff" msgstr "Reviseu les diferències" -#: add-interactive.c:1037 +#: add-interactive.c msgid "show paths with changes" msgstr "mostra els camins amb canvis" -#: add-interactive.c:1039 +#: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»" -#: add-interactive.c:1041 +#: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD" -#: add-interactive.c:1043 +#: add-interactive.c msgid "pick hunks and update selectively" msgstr "selecciona els trossos i actualitza selectivament" -#: add-interactive.c:1045 +#: add-interactive.c msgid "view diff between HEAD and index" msgstr "visualitza les diferències entre HEAD i l'índex" -#: add-interactive.c:1047 +#: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»" -#: add-interactive.c:1055 add-interactive.c:1104 +#: add-interactive.c msgid "Prompt help:" msgstr "Mostra ajuda:" -#: add-interactive.c:1057 +#: add-interactive.c msgid "select a single item" msgstr "seleccioneu un únic ítem" -#: add-interactive.c:1059 +#: add-interactive.c msgid "select a range of items" msgstr "seleccioneu un rang d'ítems" -#: add-interactive.c:1061 +#: add-interactive.c msgid "select multiple ranges" msgstr "seleccioneu rangs múltiples" -#: add-interactive.c:1063 add-interactive.c:1108 +#: add-interactive.c msgid "select item based on unique prefix" msgstr "seleccioneu un ítem basant-se en un prefix únic" -#: add-interactive.c:1065 +#: add-interactive.c msgid "unselect specified items" msgstr "desselecciona els ítems especificats" -#: add-interactive.c:1067 +#: add-interactive.c msgid "choose all items" msgstr "trieu tots els ítems" -#: add-interactive.c:1069 +#: add-interactive.c msgid "(empty) finish selecting" msgstr "(buit) finalitza la selecció" -#: add-interactive.c:1106 +#: add-interactive.c msgid "select a numbered item" msgstr "seleccioneu un ítem numerat" -#: add-interactive.c:1110 +#: add-interactive.c msgid "(empty) select nothing" msgstr "(buit) no seleccionis res" -#: add-interactive.c:1118 builtin/clean.c:845 +#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** Ordres ***" -#: add-interactive.c:1119 builtin/clean.c:846 +#: add-interactive.c builtin/clean.c msgid "What now" msgstr "I ara què" -#: add-interactive.c:1171 +#: add-interactive.c msgid "staged" msgstr "staged" -#: add-interactive.c:1171 +#: add-interactive.c msgid "unstaged" msgstr "unstaged" -#: add-interactive.c:1171 apply.c:5074 apply.c:5077 builtin/am.c:2366 -#: builtin/am.c:2369 builtin/bugreport.c:124 builtin/clone.c:144 -#: builtin/diagnose.c:28 builtin/fetch.c:2184 builtin/hook.c:31 -#: builtin/merge.c:274 builtin/pull.c:197 builtin/submodule--helper.c:1856 -#: builtin/submodule--helper.c:1859 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "camí" -#: add-interactive.c:1178 +#: add-interactive.c msgid "could not refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: add-interactive.c:1192 builtin/clean.c:810 +#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" msgstr "Adeu.\n" -#: add-patch.c:44 +#: add-patch.c #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:45 +#: add-patch.c #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:46 +#: add-patch.c #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:47 +#: add-patch.c #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " -#: add-patch.c:49 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." @@ -323,7 +316,7 @@ msgstr "" "Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " "«staging»." -#: add-patch.c:52 +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -338,27 +331,27 @@ msgstr "" "d - no facis «stage» d'aquest tros ni de cap altre tros posterior del " "fitxer\n" -#: add-patch.c:66 +#: add-patch.c #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:67 +#: add-patch.c #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:68 +#: add-patch.c #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:69 +#: add-patch.c #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " -#: add-patch.c:71 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." @@ -366,7 +359,7 @@ msgstr "" "Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament " "per a «stashing»." -#: add-patch.c:74 +#: add-patch.c msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -381,27 +374,27 @@ msgstr "" "d - no facis «stash» d'aquest tros ni de cap altre tros posterior del " "fitxer\n" -#: add-patch.c:90 +#: add-patch.c #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:91 +#: add-patch.c #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:92 +#: add-patch.c #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:93 +#: add-patch.c #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " -#: add-patch.c:95 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." @@ -409,7 +402,7 @@ msgstr "" "Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " "«unstaging»." -#: add-patch.c:98 +#: add-patch.c msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -423,27 +416,27 @@ msgstr "" "a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n" -#: add-patch.c:113 +#: add-patch.c #, c-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,?]? " -#: add-patch.c:114 +#: add-patch.c #, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? " -#: add-patch.c:115 +#: add-patch.c #, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? " -#: add-patch.c:116 +#: add-patch.c #, c-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,?]? " -#: add-patch.c:118 add-patch.c:186 add-patch.c:231 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -451,7 +444,7 @@ msgstr "" "Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " "aplicar-lo." -#: add-patch.c:121 +#: add-patch.c msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -465,27 +458,27 @@ 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\n" -#: add-patch.c:136 add-patch.c:204 +#: add-patch.c #, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:137 add-patch.c:205 +#: add-patch.c #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:138 add-patch.c:206 +#: add-patch.c #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:139 add-patch.c:207 +#: add-patch.c #, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:141 add-patch.c:164 add-patch.c:209 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." @@ -493,7 +486,7 @@ msgstr "" "Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " "ser descartat." -#: add-patch.c:144 add-patch.c:212 +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -507,31 +500,31 @@ 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\n" -#: add-patch.c:159 +#: add-patch.c #, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a," "d%s,?]? " -#: add-patch.c:160 +#: add-patch.c #, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:161 +#: add-patch.c #, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta l'addició de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:162 +#: add-patch.c #, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta aquest tros de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:167 +#: add-patch.c msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -545,28 +538,28 @@ 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\n" -#: add-patch.c:181 +#: add-patch.c #, c-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 a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:182 +#: add-patch.c #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:183 +#: add-patch.c #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:184 +#: add-patch.c #, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:189 +#: add-patch.c msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -580,27 +573,27 @@ 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\n" -#: add-patch.c:226 +#: add-patch.c #, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:227 +#: add-patch.c #, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:228 +#: add-patch.c #, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:229 +#: add-patch.c #, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:234 +#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -614,29 +607,29 @@ 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\n" -#: add-patch.c:354 +#: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»" -#: add-patch.c:448 +#: add-patch.c msgid "could not parse diff" msgstr "no s'ha pogut analitzar el diff" -#: add-patch.c:467 +#: add-patch.c msgid "could not parse colored diff" msgstr "no s'ha pogut analitzar el diff acolorit" -#: add-patch.c:481 +#: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "no s'ha pogut executar «%s»" -#: add-patch.c:640 +#: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "sortida no coincident des d'interactive.diffFilter" -#: add-patch.c:641 +#: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -644,7 +637,7 @@ msgstr "" "El filtre ha de mantenir una correspondència d'un a un\n" "entre les línies d'entrada i sortida." -#: add-patch.c:828 +#: add-patch.c #, c-format msgid "" "expected context line #%d in\n" @@ -653,7 +646,7 @@ msgstr "" "s'esperava la línia amb contingut #%d a\n" "%.*s" -#: add-patch.c:843 +#: add-patch.c #, c-format msgid "" "hunks do not overlap:\n" @@ -666,12 +659,12 @@ msgstr "" "\tno acaben amb:\n" "%.*s" -#: add-patch.c:1120 +#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'edició de trossos manual - vegeu més avall per a una guia ràpida.\n" -#: add-patch.c:1124 +#: add-patch.c #, c-format msgid "" "---\n" @@ -684,7 +677,7 @@ msgstr "" "Per a eliminar les línies «%c», suprimiu-les.\n" "Les línies que comencin per %s s'eliminaran.\n" -#: add-patch.c:1139 +#: add-patch.c 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" @@ -694,11 +687,11 @@ msgstr "" "de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: add-patch.c:1173 +#: add-patch.c msgid "could not parse hunk header" msgstr "no s'ha pogut analitzar la capçalera del tros" -#: add-patch.c:1218 +#: add-patch.c msgid "'git apply --cached' failed" msgstr "«git apply --cached» ha fallat" @@ -708,26 +701,26 @@ msgstr "«git apply --cached» ha fallat" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#: add-patch.c:1288 +#: add-patch.c 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]? " -#: add-patch.c:1331 +#: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "Els trossos seleccionats no s'apliquen a l'índex!" -#: add-patch.c:1332 +#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball? " -#: add-patch.c:1339 +#: add-patch.c msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: add-patch.c:1396 +#: add-patch.c msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -751,91 +744,91 @@ msgstr "" "p - imprimeix el tros actual, «P» per a usar el paginador\n" "? - imprimeix l'ajuda\n" -#: add-patch.c:1539 +#: add-patch.c #, c-format msgid "Only one letter is expected, got '%s'" msgstr "S'espera una lletra, s'ha obtingut «%s»" -#: add-patch.c:1578 add-patch.c:1588 +#: add-patch.c msgid "No previous hunk" msgstr "Sense tros previ" -#: add-patch.c:1583 add-patch.c:1593 +#: add-patch.c msgid "No next hunk" msgstr "No hi ha tros següent" -#: add-patch.c:1599 +#: add-patch.c msgid "No other hunks to goto" msgstr "No hi ha altres trossos on anar-hi" -#: add-patch.c:1610 +#: add-patch.c msgid "go to which hunk ( to see more)? " msgstr "ves a quin tros ( per a veure'n més)? " -#: add-patch.c:1611 +#: add-patch.c msgid "go to which hunk? " msgstr "ves a quin tros? " -#: add-patch.c:1622 +#: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "Número no vàlid: «%s»" -#: add-patch.c:1627 +#: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Només %d tros disponible." msgstr[1] "Només %d trossos disponibles." -#: add-patch.c:1636 +#: add-patch.c msgid "No other hunks to search" msgstr "No hi ha cap altre tros a cercar" -#: add-patch.c:1642 +#: add-patch.c msgid "search for regex? " msgstr "cerca per expressió regular? " -#: add-patch.c:1657 +#: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "Expressió regular de cerca mal formada %s: %s" -#: add-patch.c:1674 +#: add-patch.c msgid "No hunk matches the given pattern" msgstr "No hi ha trossos que coincideixin amb el patró donat" -#: add-patch.c:1682 +#: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "No es pot dividir aquest tros" -#: add-patch.c:1686 +#: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "Divideix en %d trossos." -#: add-patch.c:1692 +#: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "No es pot editar aquest tros" -#: add-patch.c:1725 +#: add-patch.c #, c-format msgid "Unknown command '%s' (use '?' for help)" msgstr "Ordre desconeguda: «%s» (useu «?» per a obtenir ajuda)" -#: add-patch.c:1750 +#: add-patch.c msgid "'git apply' failed" msgstr "«git apply» ha fallat" -#: add-patch.c:1813 +#: add-patch.c msgid "No changes." msgstr "No hi ha canvis." -#: add-patch.c:1815 +#: add-patch.c msgid "Only binary files changed." msgstr "Només han canviat els fitxers binaris." -#: advice.c:95 +#: advice.c #, c-format msgid "" "\n" @@ -844,36 +837,36 @@ msgstr "" "\n" "Desactiva aquest missatge amb «git config advice.%s false»" -#: advice.c:111 +#: advice.c #, c-format msgid "%shint:%s%.*s%s\n" msgstr "%sconsell:%s%.*s%s\n" -#: advice.c:205 +#: advice.c 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:207 +#: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:209 +#: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:211 +#: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:213 +#: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:215 +#: advice.c msgid "Rebasing is not possible because you have unmerged files." msgstr "Fer «rebase» no és possible perquè teniu fitxers sense fusionar." -#: advice.c:224 +#: advice.c msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -882,23 +875,23 @@ msgstr "" "«git add/rm » segons sigui apropiat per a\n" "marcar la resolució i feu una comissió." -#: advice.c:232 +#: advice.c msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:237 builtin/merge.c:1406 +#: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:239 +#: advice.c msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:240 +#: advice.c msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:246 +#: advice.c msgid "" "Diverging branches can't be fast-forwarded, you need to either:\n" "\n" @@ -916,11 +909,11 @@ msgstr "" "\n" "\tgit rebase\n" -#: advice.c:253 +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: advice.c:263 +#: advice.c #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -931,7 +924,7 @@ msgstr "" "amb camins que existeixen fora de la vostra definició de\n" "«sparse-checkout», així que no serà actualitzaran en l'índex:\n" -#: advice.c:270 +#: advice.c msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -941,7 +934,7 @@ msgstr "" "* Utilitzeu l'opció --sparse.\n" "* Inhabiliteu o modifiqueu les regles de dispersió." -#: advice.c:278 +#: advice.c #, c-format msgid "" "Note: switching to '%s'.\n" @@ -982,7 +975,7 @@ msgstr "" "«false»\n" "\n" -#: advice.c:305 +#: advice.c #, c-format msgid "" "The following paths have been moved outside the\n" @@ -993,7 +986,7 @@ msgstr "" "definició de sparse-checkout però no són dispersos\n" "a causa de modificacions en local.\n" -#: advice.c:312 +#: advice.c msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse \" to update the index\n" @@ -1003,128 +996,108 @@ msgstr "" "* Useu «git add --sparse » per a actualitzar l'índex\n" "* Useu «git sparse-checkout reapply» per a aplicar les regles de dispersió" -#: alias.c:75 +#: alias.c msgid "cmdline ends with \\" msgstr "la línia d'ordres acaba amb \\" -#: alias.c:76 +#: alias.c msgid "unclosed quote" msgstr "cometes no tancades" -#: alias.c:77 builtin/cat-file.c:1083 builtin/notes.c:449 builtin/notes.c:511 -#: builtin/notes.c:592 builtin/notes.c:604 builtin/notes.c:687 -#: builtin/notes.c:763 builtin/notes.c:916 builtin/notes.c:1072 -#: builtin/notes.c:1095 builtin/prune-packed.c:29 builtin/receive-pack.c:2524 -#: builtin/refs.c:38 builtin/tag.c:648 t/helper/test-pkt-line.c:89 +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "hi ha massa arguments" -#: apply.c:87 +#: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc «%s» no reconeguda" -#: apply.c:103 +#: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció ignora l'espai en blanc «%s» no reconeguda" -#: apply.c:156 archive.c:687 builtin/add.c:396 builtin/add.c:398 -#: builtin/add.c:404 builtin/add.c:416 builtin/branch.c:841 -#: builtin/checkout-index.c:277 builtin/checkout.c:487 builtin/checkout.c:490 -#: builtin/checkout.c:1802 builtin/checkout.c:1912 builtin/checkout.c:1915 -#: builtin/clean.c:965 builtin/clone.c:1024 builtin/clone.c:1029 -#: builtin/commit.c:361 builtin/commit.c:364 builtin/commit.c:1234 -#: builtin/commit.c:1290 builtin/commit.c:1307 builtin/describe.c:622 -#: builtin/diff-tree.c:167 builtin/difftool.c:754 builtin/fast-export.c:1273 -#: builtin/fetch.c:2295 builtin/fetch.c:2322 builtin/fetch.c:2336 -#: builtin/fetch.c:2341 builtin/help.c:622 builtin/index-pack.c:1871 -#: builtin/init-db.c:113 builtin/log.c:2246 builtin/log.c:2248 -#: builtin/ls-files.c:747 builtin/merge-base.c:177 builtin/merge-base.c:183 -#: builtin/merge-tree.c:598 builtin/merge.c:1427 builtin/merge.c:1429 -#: builtin/pack-objects.c:4540 builtin/rebase.c:1284 builtin/rebase.c:1286 -#: builtin/rebase.c:1295 builtin/repack.c:1310 builtin/replay.c:325 -#: builtin/reset.c:386 builtin/reset.c:423 builtin/rev-list.c:579 -#: builtin/rev-parse.c:944 builtin/rev-parse.c:951 builtin/rev-parse.c:962 -#: builtin/show-branch.c:732 builtin/show-branch.c:737 builtin/stash.c:1807 -#: builtin/stash.c:1810 builtin/submodule--helper.c:1217 -#: builtin/submodule--helper.c:3091 builtin/tag.c:582 builtin/tag.c:629 -#: builtin/worktree.c:731 builtin/worktree.c:734 builtin/worktree.c:807 -#: builtin/worktree.c:810 builtin/worktree.c:813 builtin/worktree.c:1060 -#: parse-options.c:286 parse-options.c:1332 range-diff.c:576 revision.c:2481 -#: revision.c:2486 revision.c:2490 revision.c:2499 revision.c:2504 -#: revision.c:2736 revision.c:2807 revision.c:2819 revision.c:2825 -#: revision.c:2845 revision.c:2855 revision.c:2865 revision.c:3152 -#: revision.c:3164 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c +#: range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "les opcions «%s» i «%s» no es poden usar juntes" -#: apply.c:159 apply.c:170 apply.c:173 +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "«%s» fora d'un repositori" -#: apply.c:403 +#: apply.c msgid "failed to read patch" msgstr "s'ha produït un error en llegir el pedaç" -#: apply.c:405 +#: apply.c msgid "patch too large" msgstr "el pedaç és massa gran" -#: apply.c:819 +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: apply.c:828 +#: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per a l'entrada: %s" -#: apply.c:902 +#: apply.c #, 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:940 +#: apply.c #, 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:946 +#: apply.c #, 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:947 +#: apply.c #, 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:952 +#: apply.c #, 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:981 +#: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "mode no vàlid en la línia %d: %s" -#: apply.c:1308 +#: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "línies de capçalera %d i %d inconsistents" -#: apply.c:1398 +#: apply.c #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1139,93 +1112,93 @@ 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:1411 +#: apply.c #, 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:1507 +#: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: línia inesperada: %.*s" -#: apply.c:1576 +#: apply.c #, 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:1779 +#: apply.c msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: apply.c:1781 +#: apply.c msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: apply.c:1815 +#: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "pedaç malmès a la línia %d" -#: apply.c:1852 +#: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: apply.c:1854 +#: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: apply.c:1857 +#: apply.c #, 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:2005 +#: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: apply.c:2042 +#: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: apply.c:2204 +#: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: apply.c:2291 +#: apply.c #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: apply.c:2295 +#: apply.c #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2964 +#: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: «%c»" -#: apply.c:3081 +#: apply.c #, 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:3093 +#: apply.c #, 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:3099 +#: apply.c #, c-format msgid "" "while searching for:\n" @@ -1234,23 +1207,23 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3121 +#: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de «%s»" -#: apply.c:3129 +#: apply.c #, 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:3174 +#: apply.c #, 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:3185 +#: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1258,289 +1231,287 @@ msgstr "" "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3193 +#: apply.c #, 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:3212 +#: apply.c #, 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:3224 +#: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a «%s»" -#: apply.c:3231 +#: apply.c #, 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:3252 +#: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3376 builtin/mv.c:533 +#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3428 apply.c:3439 apply.c:3485 midx.c:116 pack-mtimes.c:42 -#: pack-revindex.c:225 setup.c:334 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3436 +#: apply.c #, 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:3465 apply.c:3740 +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3577 apply.c:3755 +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: apply.c:3586 apply.c:3763 apply.c:3988 +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: apply.c:3623 +#: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" "al repositori li manca el blob necessari per a fer a una fusió de 3 vies." -#: apply.c:3626 +#: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "S'està fent una fusió de 3 vies...\n" -#: apply.c:3642 apply.c:3646 +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de «%s»" -#: apply.c:3658 +#: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "S'ha produït un error en fer una fusió de tres vies...\n" -#: apply.c:3672 +#: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" -#: apply.c:3677 +#: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a «%s» netament.\n" -#: apply.c:3694 +#: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "S'està usant alternativament l'aplicació directa...\n" -#: apply.c:3707 +#: apply.c msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3789 +#: apply.c #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3791 +#: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3928 apply.c:3930 read-cache.c:843 read-cache.c:872 -#: read-cache.c:1305 +#: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: «%s»" -#: apply.c:3986 +#: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: apply.c:3990 +#: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:4010 +#: apply.c #, 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:4015 +#: apply.c #, 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:4035 apply.c:4465 +#: apply.c #, 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:4039 +#: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:4054 +#: apply.c #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4146 +#: apply.c #, 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:4153 +#: apply.c #, 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:4156 +#: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4165 +#: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'índex temporal" -#: apply.c:4175 +#: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: apply.c:4313 +#: apply.c #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: apply.c:4347 +#: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4353 +#: apply.c #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" -#: apply.c:4361 +#: apply.c #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de suport per al fitxer novament creat %s" -#: apply.c:4367 apply.c:4542 +#: apply.c #, 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:4410 builtin/bisect.c:613 builtin/gc.c:2574 builtin/gc.c:2636 +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: apply.c:4414 +#: apply.c #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer «%s»" -#: apply.c:4512 +#: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer «%s» mode %o" -#: apply.c:4612 +#: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4620 +#: apply.c msgid "internal error" msgstr "error intern" -#: apply.c:4623 +#: apply.c #, 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:4636 apply.c:4645 apply.c:4651 +#: apply.c #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4640 rerere.c:1081 +#: apply.c rerere.c #, c-format msgid "cannot unlink '%s'" msgstr "no es pot fer «unlink» de «%s»" -#: apply.c:4668 +#: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4672 +#: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4803 +#: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4812 +#: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "No hi ha pedaços vàlids a l'entrada (permeteu-los amb «--allow-empty»)" -#: apply.c:4833 t/helper/test-cache-tree.c:40 +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4990 +#: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:5017 +#: apply.c #, 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:5023 apply.c:5038 +#: apply.c #, 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:5031 +#: apply.c #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1549,409 +1520,398 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:5047 builtin/mv.c:574 builtin/rm.c:443 +#: apply.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:5075 +#: apply.c msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:5078 +#: apply.c msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:5080 builtin/am.c:2375 +#: apply.c builtin/am.c msgid "num" msgstr "nombre" -#: apply.c:5081 +#: apply.c msgid "remove leading slashes from traditional diff paths" msgstr "" "elimina barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:5084 +#: apply.c msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:5086 +#: apply.c 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:5090 +#: apply.c 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:5092 +#: apply.c 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:5094 +#: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, determina si el pedaç és aplicable" -#: apply.c:5096 +#: apply.c msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:5098 +#: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "marca els fitxers nous amb «git add --intent-to-add»" -#: apply.c:5100 +#: apply.c msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:5102 +#: apply.c msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:5105 +#: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:5107 +#: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "intenta una fusió de tres vies, si falla intenta llavors un pedaç normal" -#: apply.c:5109 builtin/merge-file.c:74 +#: apply.c builtin/merge-file.c msgid "for conflicts, use our version" msgstr "en conflictes, usa la nostra versió" -#: apply.c:5112 builtin/merge-file.c:76 +#: apply.c builtin/merge-file.c msgid "for conflicts, use their version" msgstr "en conflictes, usa la seva versió" -#: apply.c:5115 builtin/merge-file.c:78 +#: apply.c builtin/merge-file.c msgid "for conflicts, use a union version" msgstr "en conflictes, usa una versió d'unió" -#: apply.c:5118 +#: apply.c msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:5121 builtin/checkout-index.c:237 +#: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:5123 +#: apply.c msgid "ensure at least lines of context match" msgstr "assegura't que almenys línies de context coincideixin" -#: apply.c:5124 builtin/am.c:2351 builtin/am.c:2354 -#: builtin/interpret-trailers.c:206 builtin/interpret-trailers.c:208 -#: builtin/pack-objects.c:4422 builtin/rebase.c:1139 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "acció" -#: apply.c:5125 +#: apply.c 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:5128 apply.c:5131 +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:5134 +#: apply.c msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:5136 +#: apply.c msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:5138 +#: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5140 +#: apply.c msgid "allow overlapping hunks" msgstr "permet trossos superposats" -#: apply.c:5143 +#: apply.c 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:5146 +#: apply.c 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:5148 builtin/am.c:2363 +#: apply.c builtin/am.c msgid "root" msgstr "arrel" -#: apply.c:5149 +#: apply.c msgid "prepend to all filenames" msgstr "anteposa a tots els noms de fitxer" -#: apply.c:5152 +#: apply.c msgid "don't return error for empty patches" msgstr "no retornis l'error per als pedaços buits" -#: apply.c:5159 +#: apply.c msgid "--ours, --theirs, and --union require --3way" msgstr "--ours, --theirs, i --union requereixen --3way" -#: archive-tar.c:140 archive-zip.c:354 +#: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "no es pot transmetre el blob %s" -#: archive-tar.c:280 archive-zip.c:367 +#: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" -#: archive-tar.c:460 archive-zip.c:478 builtin/pack-objects.c:376 -#: builtin/pack-objects.c:379 +#: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: archive-tar.c:513 +#: archive-tar.c #, c-format msgid "unable to start '%s' filter" msgstr "no s'ha pogut iniciar el filtre «%s»" -#: archive-tar.c:516 +#: archive-tar.c msgid "unable to redirect descriptor" msgstr "no s'ha pogut redirigir el descriptor" -#: archive-tar.c:523 +#: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "«%s» error reportat pel filtre" -#: archive-zip.c:327 +#: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "el camí no és vàlid en UTF-8: %s" -#: archive-zip.c:331 +#: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s" -#: archive-zip.c:612 +#: archive-zip.c #, c-format msgid "timestamp too large for this system: %" msgstr "marca de temps massa gran per a aquest sistema: %" -#: archive.c:26 +#: archive.c msgid "git archive [] [...]" msgstr "git archive [] [...]" -#: archive.c:28 +#: archive.c msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote [--exec ] [] " "[...]" -#: archive.c:29 +#: archive.c msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c:222 archive.c:359 builtin/gc.c:612 builtin/notes.c:297 -#: builtin/tag.c:635 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" -#: archive.c:454 +#: archive.c #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "" "l'especificació de camí «%s» coincideix amb fitxers fora del directori actual" -#: archive.c:477 builtin/add.c:139 builtin/add.c:545 builtin/rm.c:347 +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer" -#: archive.c:500 +#: archive.c #, c-format msgid "no such ref: %.*s" msgstr "no existeix la referència: %.*s" -#: archive.c:507 +#: archive.c #, c-format msgid "not a valid object name: %s" msgstr "no és un nom d'objecte vàlid: %s" -#: archive.c:522 t/helper/test-cache-tree.c:45 +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "no és un objecte d'arbre: %s" -#: archive.c:539 +#: archive.c #, c-format msgid "failed to unpack tree object %s" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre %s" -#: archive.c:584 +#: archive.c #, c-format msgid "File not found: %s" msgstr "Fitxer no trobat: %s" -#: archive.c:586 +#: archive.c #, c-format msgid "Not a regular file: %s" msgstr "No és un fitxer normal: %s" -#: archive.c:595 +#: archive.c #, c-format msgid "unclosed quote: '%s'" msgstr "cometes no tancades: «%s»" -#: archive.c:598 +#: archive.c #, c-format msgid "missing colon: '%s'" msgstr "falten els dos punts: «%s»" -#: archive.c:601 +#: archive.c #, c-format msgid "empty file name: '%s'" msgstr "nom de fitxer buit: «%s»" -#: archive.c:648 +#: archive.c msgid "fmt" msgstr "format" -#: archive.c:648 +#: archive.c msgid "archive format" msgstr "format d'arxiu" -#: archive.c:649 builtin/log.c:2073 parse-options.h:532 +#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "prefix" -#: archive.c:650 +#: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:651 archive.c:657 builtin/blame.c:903 builtin/blame.c:907 -#: builtin/blame.c:908 builtin/commit-tree.c:111 builtin/config.c:71 -#: builtin/fast-export.c:1209 builtin/fast-export.c:1211 -#: builtin/fast-export.c:1215 builtin/gc.c:1630 builtin/gc.c:1695 -#: builtin/grep.c:995 builtin/hash-object.c:116 builtin/ls-files.c:613 -#: builtin/ls-files.c:616 builtin/notes.c:486 builtin/notes.c:661 -#: builtin/read-tree.c:123 parse-options.h:330 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "fitxer" -#: archive.c:652 archive.c:655 +#: archive.c msgid "add untracked file to archive" msgstr "inclou els fitxers no seguits a l'arxiu" -#: archive.c:655 +#: archive.c msgid "path:content" msgstr "camí: contingut" -#: archive.c:658 builtin/archive.c:89 +#: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:660 +#: archive.c msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:661 +#: archive.c msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:662 builtin/clone.c:148 builtin/fetch.c:2215 -#: builtin/pack-objects.c:4391 builtin/pack-objects.c:4395 builtin/pull.c:218 +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c msgid "time" msgstr "data" -#: archive.c:663 +#: archive.c msgid "set modification time of archive entries" msgstr "estableix l'hora de modificació de les entrades de l'arxiu" -#: archive.c:666 +#: archive.c msgid "set compression level" msgstr "estableix el nivell de compressió" -#: archive.c:669 +#: archive.c msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" -#: archive.c:671 builtin/archive.c:90 builtin/clone.c:134 builtin/clone.c:137 -#: builtin/submodule--helper.c:1868 builtin/submodule--helper.c:2804 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "repositori" -#: archive.c:672 builtin/archive.c:91 +#: archive.c builtin/archive.c msgid "retrieve the archive from remote repository " msgstr "recupera l'arxiu del repositori remot " -#: archive.c:673 builtin/archive.c:92 builtin/difftool.c:729 -#: builtin/notes.c:581 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "ordre" -#: archive.c:674 builtin/archive.c:93 +#: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remota" -#: archive.c:681 +#: archive.c msgid "Unexpected option --remote" msgstr "Opció inesperada --remote" -#: archive.c:683 builtin/add.c:419 builtin/add.c:451 builtin/checkout.c:1921 -#: builtin/clone.c:1258 builtin/clone.c:1261 builtin/commit.c:373 -#: builtin/fast-export.c:1258 builtin/index-pack.c:1867 builtin/log.c:2420 -#: builtin/reset.c:395 builtin/reset.c:456 builtin/rm.c:291 -#: builtin/stash.c:1819 builtin/worktree.c:819 builtin/worktree.c:1062 -#: fetch-pack.c:346 http-fetch.c:157 http-fetch.c:166 revision.c:3166 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c +#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "l'opció «%s» requereix «%s»" -#: archive.c:685 +#: archive.c msgid "Unexpected option --output" msgstr "Opció inesperada --output" -#: archive.c:694 t/unit-tests/unit-test.c:31 +#: archive.c t/unit-tests/unit-test.c #, c-format msgid "extra command line parameter '%s'" msgstr "paràmetre extra de la línia d'ordres «%s»" -#: archive.c:711 +#: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut «%s»" -#: archive.c:720 +#: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument no admès per al format «%s»: -%d" -#: attr.c:221 +#: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut vàlid" -#: attr.c:249 +#: attr.c msgid "unable to add additional attribute" msgstr "no s'ha pogut afegir l'atribut addicional" -#: attr.c:371 +#: attr.c #, c-format msgid "ignoring overly long attributes line %d" msgstr "s'ignorarà la línia d'atributs massa llarga %d" -#: attr.c:386 +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no està permès: %s:%d" -#: attr.c:425 +#: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1959,58 +1919,56 @@ msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" "Useu «\\!» per exclamació capdavantera literal." -#: attr.c:748 +#: attr.c #, c-format msgid "cannot fstat gitattributes file '%s'" msgstr "no es pot fer fstat gitattributes al fitxer «%s»" -#: attr.c:753 +#: attr.c #, c-format msgid "ignoring overly large gitattributes file '%s'" msgstr "s'ignorarà el fitxer «%s» gitattributes per a ser massa gran" -#: attr.c:780 +#: attr.c #, c-format msgid "ignoring overly large gitattributes blob '%s'" msgstr "s'ignorarà el blob «%s» gitattributes per a ser massa gran" -#: attr.c:1234 +#: attr.c msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" msgstr "no es pot usar --attr-source o GIT_ATTR_SOURCE sense repository" -#: attr.c:1242 +#: attr.c msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "--attr-source incorrecte o GIT_ATTR_SOURCE" -#: attr.c:1294 read-cache.c:802 +#: attr.c read-cache.c #, c-format msgid "unable to stat '%s'" msgstr "no s'ha pogut fer «stat» a «%s»" -#: bisect.c:164 builtin/cat-file.c:230 builtin/cat-file.c:494 -#: builtin/index-pack.c:767 builtin/notes.c:718 builtin/pack-objects.c:302 -#: builtin/pack-objects.c:363 builtin/pack-objects.c:471 combine-diff.c:343 -#: object-file.c:2000 object-file.c:2006 rerere.c:987 +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: bisect.c:495 +#: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" -#: bisect.c:707 +#: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:764 +#: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió vàlid %s" -#: bisect.c:789 +#: bisect.c #, c-format msgid "" "The merge base %s is bad.\n" @@ -2019,7 +1977,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:794 +#: bisect.c #, c-format msgid "" "The merge base %s is new.\n" @@ -2028,7 +1986,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:799 +#: bisect.c #, c-format msgid "" "The merge base %s is %s.\n" @@ -2037,7 +1995,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:807 +#: bisect.c #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -2048,7 +2006,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:820 +#: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -2060,41 +2018,41 @@ msgstr "" "%s.\n" "Continuem de totes maneres." -#: bisect.c:861 +#: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:914 +#: bisect.c #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:944 +#: bisect.c #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: bisect.c:979 builtin/notes.c:176 +#: bisect.c builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»" -#: bisect.c:1000 builtin/merge.c:159 +#: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: bisect.c:1042 +#: bisect.c msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:1072 +#: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:1082 +#: bisect.c #, c-format msgid "" "No testable commit found.\n" @@ -2103,7 +2061,7 @@ msgstr "" "No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb paràmetres de camí incorrectes?\n" -#: bisect.c:1113 +#: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -2113,51 +2071,46 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1119 +#: bisect.c #, 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:2774 +#: blame.c msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: blame.c:2826 +#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent junts requereixen una última comissió especificada" -#: blame.c:2835 builtin/bisect.c:587 builtin/bisect.c:1112 -#: builtin/commit.c:1128 builtin/log.c:514 builtin/log.c:1277 -#: builtin/log.c:1911 builtin/log.c:2374 builtin/log.c:2694 builtin/merge.c:419 -#: builtin/pack-objects.c:3548 builtin/pack-objects.c:3706 -#: builtin/pack-objects.c:4197 builtin/pack-objects.c:4212 -#: builtin/shortlog.c:272 midx-write.c:815 pack-bitmap.c:1152 -#: pack-bitmap.c:2552 remote.c:2267 sequencer.c:2541 sequencer.c:5536 -#: submodule.c:929 +#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c +#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "la configuració del recorregut de revisions ha fallat" -#: blame.c:2853 +#: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent junts requereixen un rang de la cadena de pares " "primers" -#: blame.c:2864 +#: blame.c #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: blame.c:2877 +#: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" -#: branch.c:102 +#: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" @@ -2165,31 +2118,31 @@ msgstr "" "no es pot heretar la configuració del seguiment de la font de múltiples " "referències quan es demana fer «rebase»" -#: branch.c:113 +#: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "no s'està establert la branca «%s» com a la seva pròpia font" -#: branch.c:169 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "la branca «%s» està configurada per a seguir «%s» fent «rebase»." -#: branch.c:170 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "la branca «%s» està configurada per a seguir «%s»." -#: branch.c:173 +#: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "la branca «%s» està configurada per a seguir:" -#: branch.c:185 +#: branch.c msgid "unable to write upstream branch configuration" msgstr "no es pot escriure la configuració de la branca font" -#: branch.c:187 +#: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -2199,21 +2152,21 @@ msgstr "" "Després de corregir la causa de l'error, podeu intentar\n" "corregir la informació de seguiment remot executant:" -#: branch.c:228 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "" "s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap " "remot" -#: branch.c:234 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" "s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap " "configuració de fusionat" -#: branch.c:294 +#: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "no s'està seguint: informació ambigua per a la referència «%s»" @@ -2229,7 +2182,7 @@ msgstr "no s'està seguint: informació ambigua per a la referència «%s»" #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c:306 object-name.c:493 +#: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" @@ -2237,7 +2190,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c:312 +#: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2258,40 +2211,40 @@ msgstr "" "els diferents refspecs remots s'assignen a diferents espais de noms\n" "de seguiment." -#: branch.c:376 +#: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "«%s» no és un nom de branca vàlid" -#: branch.c:378 builtin/branch.c:592 +#: branch.c builtin/branch.c msgid "See `man git check-ref-format`" msgstr "Vegeu `man git check-ref-format`" -#: branch.c:475 +#: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "ja existeix una branca amb nom «%s»" -#: branch.c:479 +#: branch.c #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" "no es pot forçar l'actualització de la branca «%s» utilitzada per l'arbre de " "treball a «%s»" -#: branch.c:504 +#: branch.c #, c-format msgid "cannot set up 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:506 +#: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branca font demanada «%s» no existeix" -#: branch.c:508 +#: branch.c msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2312,28 +2265,27 @@ msgstr "" "«git push -u» per a establir la configuració font\n" "mentre pugeu." -#: branch.c:556 builtin/replace.c:335 builtin/replace.c:391 -#: builtin/replace.c:437 builtin/replace.c:467 +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "no és un nom d'objecte vàlid: «%s»" -#: branch.c:577 +#: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "nom d'objecte ambigu: «%s»" -#: branch.c:582 +#: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "no és un punt de ramificació vàlid: «%s»" -#: branch.c:775 +#: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "submòdul «%s»: no es pot trobar el submòdul" -#: branch.c:778 +#: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" @@ -2342,131 +2294,131 @@ msgstr "" "Podeu provar d'actualitzar els submòduls utilitzant «git checkout --no-" "recurse-submodules %s && git submodule update --init»" -#: branch.c:789 branch.c:815 +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "submòdul «%s»: no es pot crear la branca: «%s»" -#: branch.c:850 +#: branch.c #, c-format msgid "'%s' is already used by worktree at '%s'" msgstr "«%s» ja s'utilitza en l'arbre de treball a «%s»" -#: builtin/add.c:27 +#: builtin/add.c msgid "git add [] [--] ..." msgstr "git add [] [--] ..." -#: builtin/add.c:62 +#: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" msgstr "no es pot fer chmod %cx «%s»" -#: builtin/add.c:129 +#: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:193 +#: builtin/add.c msgid "could not read the index" msgstr "no s'ha pogut llegir l'índex" -#: builtin/add.c:208 +#: builtin/add.c msgid "editing patch failed" msgstr "l'edició del pedaç ha fallat" -#: builtin/add.c:211 read-cache.c:3233 +#: builtin/add.c read-cache.c #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" -#: builtin/add.c:213 +#: builtin/add.c msgid "empty patch. aborted" msgstr "pedaç buit. interromput" -#: builtin/add.c:219 +#: builtin/add.c #, c-format msgid "could not apply '%s'" msgstr "no s'ha pogut aplicar «%s»" -#: builtin/add.c:228 +#: builtin/add.c 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:250 builtin/clean.c:936 builtin/fetch.c:2205 builtin/mv.c:191 -#: builtin/prune-packed.c:18 builtin/pull.c:211 builtin/push.c:575 -#: builtin/remote.c:1510 builtin/rm.c:251 builtin/send-pack.c:193 +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c msgid "dry run" msgstr "fes una prova" -#: builtin/add.c:251 builtin/check-ignore.c:23 builtin/commit.c:1518 -#: builtin/count-objects.c:103 builtin/fsck.c:911 builtin/log.c:2645 -#: builtin/mv.c:190 builtin/read-tree.c:128 builtin/refs.c:74 +#: builtin/add.c builtin/check-ignore.c builtin/commit.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "sigues detallat" -#: builtin/add.c:253 +#: builtin/add.c msgid "interactive picking" msgstr "selecció interactiva" -#: builtin/add.c:254 builtin/checkout.c:1737 builtin/reset.c:370 +#: builtin/add.c builtin/checkout.c builtin/reset.c msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:255 +#: builtin/add.c msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:256 +#: builtin/add.c msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:257 +#: builtin/add.c msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:258 +#: builtin/add.c msgid "renormalize EOL of tracked files (implies -u)" msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)" -#: builtin/add.c:259 +#: builtin/add.c 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:260 +#: builtin/add.c msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:263 +#: builtin/add.c 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:265 +#: builtin/add.c msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:266 +#: builtin/add.c 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:267 +#: builtin/add.c msgid "check if - even missing - files are ignored in dry run" msgstr "" "comprova si els fitxers, fins i tot els absents, s'ignoren en fer una prova" -#: builtin/add.c:268 builtin/mv.c:195 builtin/rm.c:258 +#: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" msgstr "permet actualitzar les entrades fora del con del «sparse-checkout»" -#: builtin/add.c:270 builtin/update-index.c:972 +#: builtin/add.c builtin/update-index.c msgid "override the executable bit of the listed files" msgstr "sobreescriu el bit executable dels fitxers llistats" -#: builtin/add.c:272 +#: builtin/add.c msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un repositori incrustat" -#: builtin/add.c:294 +#: builtin/add.c #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -2497,163 +2449,152 @@ msgstr "" "\n" "Vegeu «git help submodule» per a més informació." -#: builtin/add.c:323 +#: builtin/add.c #, c-format msgid "adding embedded git repository: %s" msgstr "s'està afegint un repositori incrustat: %s" -#: builtin/add.c:343 +#: builtin/add.c msgid "Use -f if you really want to add them." msgstr "\"Useu -f si realment voleu afegir-los." -#: builtin/add.c:356 +#: builtin/add.c msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:423 +#: builtin/add.c #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x" -#: builtin/add.c:444 builtin/checkout.c:1909 builtin/commit.c:367 -#: builtin/reset.c:389 builtin/rm.c:285 builtin/stash.c:1813 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "«%s» i l'especificació de camí no es poden usar juntes" -#: builtin/add.c:455 +#: builtin/add.c #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:457 +#: builtin/add.c msgid "Maybe you wanted to say 'git add .'?" msgstr "Que potser volíeu dir «git add.»?" -#: builtin/add.c:473 builtin/check-ignore.c:187 builtin/checkout.c:570 -#: builtin/checkout.c:786 builtin/clean.c:1015 builtin/commit.c:381 -#: builtin/diff-tree.c:134 builtin/grep.c:556 builtin/mv.c:223 -#: builtin/reset.c:462 builtin/rm.c:305 builtin/submodule--helper.c:208 -#: builtin/submodule--helper.c:3376 read-cache.c:2032 read-cache.c:2352 -#: rerere.c:561 rerere.c:595 rerere.c:1115 submodule.c:1870 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c +#: rerere.c submodule.c msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/add.c:585 builtin/am.c:2022 builtin/am.c:2056 builtin/checkout.c:639 -#: builtin/checkout.c:928 builtin/clone.c:791 builtin/commit.c:449 -#: builtin/commit.c:474 builtin/commit.c:522 builtin/stash.c:305 merge.c:111 -#: rerere.c:717 +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c +#: builtin/commit.c builtin/stash.c merge.c rerere.c msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: builtin/am.c:198 builtin/mailinfo.c:48 mailinfo.c:1264 +#: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" msgstr "acció «%s» incorrecta per a «%s»" -#: builtin/am.c:216 builtin/am.c:2279 builtin/am.c:2301 builtin/blame.c:740 -#: builtin/blame.c:760 builtin/fetch.c:169 builtin/pack-objects.c:3893 -#: builtin/pull.c:47 builtin/pull.c:49 builtin/pull.c:324 builtin/revert.c:66 -#: config.c:1414 diff-merges.c:94 gpg-interface.c:748 gpg-interface.c:763 -#: ls-refs.c:38 parallel-checkout.c:49 sequencer.c:3102 setup.c:652 setup.c:664 -#: setup.c:682 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c +#: ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "valor no vàlid per a «%s»: «%s»" -#: builtin/am.c:303 builtin/commit.c:854 builtin/merge.c:1164 sequencer.c:600 -#: sequencer.c:2083 sequencer.c:3403 sequencer.c:3854 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" -#: builtin/am.c:406 +#: builtin/am.c msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:413 builtin/am.c:458 builtin/am.c:463 builtin/am.c:1465 -#: builtin/am.c:2159 builtin/replace.c:470 commit.c:62 sequencer.c:3396 +#: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" -#: builtin/am.c:499 +#: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:529 +#: builtin/am.c #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:567 +#: builtin/am.c #, 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:593 +#: builtin/am.c msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:761 builtin/am.c:853 builtin/rebase.c:697 sequencer.c:986 -#: wrapper.c:198 wrapper.c:368 +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: builtin/am.c:770 builtin/rebase.c:648 editor.c:152 sequencer.c:4417 -#: wrapper.c:196 wrapper.c:366 +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" -#: builtin/am.c:781 +#: builtin/am.c #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:846 +#: builtin/am.c 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:894 +#: builtin/am.c msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:899 builtin/am.c:911 +#: builtin/am.c msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:906 +#: builtin/am.c msgid "invalid timezone offset" msgstr "desplaçament del fus horari no vàlid" -#: builtin/am.c:999 +#: builtin/am.c msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:1004 builtin/clone.c:319 +#: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:1010 +#: builtin/am.c msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1164 +#: builtin/am.c #, c-format msgid "When you have resolved this problem, run \"%s --continue\".\n" msgstr "Quan hàgiu resolt aquest problema, executeu «%s --continue».\n" -#: builtin/am.c:1165 +#: builtin/am.c #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" msgstr "" "Si preferiu ometre aquest pedaç, executeu «%s --skip» en lloc d'això.\n" -#: builtin/am.c:1170 +#: builtin/am.c #, c-format msgid "" "To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" @@ -2661,45 +2602,44 @@ msgstr "" "Per a enregistrar un pedaç buit com a comissió buida, executeu «%s --allow-" "empty».\n" -#: builtin/am.c:1172 +#: builtin/am.c #, 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:1270 +#: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Pedaç enviat amb format=flowed; es pot perdre l'espai al final de les línies." -#: builtin/am.c:1359 +#: builtin/am.c #, c-format msgid "missing author line in commit %s" msgstr "manca la línia d'autor en la comissió %s" -#: builtin/am.c:1362 +#: builtin/am.c #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1384 builtin/checkout.c:832 builtin/clone.c:781 -#: commit-graph.c:1243 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: builtin/am.c:1594 +#: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al repositori li manquen els blobs necessaris per a retrocedir a una fusió " "de 3 vies." -#: builtin/am.c:1596 +#: builtin/am.c 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:1616 +#: builtin/am.c msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2707,33 +2647,32 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1622 +#: builtin/am.c 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:1648 +#: builtin/am.c msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1674 builtin/merge.c:703 sequencer.c:1591 +#: builtin/am.c builtin/merge.c sequencer.c msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/am.c:1682 +#: builtin/am.c msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1701 builtin/commit.c:1859 builtin/merge.c:926 -#: builtin/merge.c:953 builtin/replay.c:76 sequencer.c:1701 +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/am.c:1736 builtin/am.c:1740 +#: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1758 +#: builtin/am.c msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -2741,60 +2680,60 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1768 +#: builtin/am.c #, c-format 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:1815 builtin/commit.c:414 +#: builtin/am.c builtin/commit.c msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/am.c:1819 +#: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1861 +#: builtin/am.c #, c-format msgid "Skipping: %.*s" msgstr "S'està ometent: %.*s" -#: builtin/am.c:1866 +#: builtin/am.c #, c-format msgid "Creating an empty commit: %.*s" msgstr "S'està creant una comissió buida: %.*s" -#: builtin/am.c:1870 +#: builtin/am.c msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1881 builtin/am.c:1950 +#: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1898 +#: builtin/am.c msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1904 +#: builtin/am.c #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1908 +#: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Useu «git am --show-current-patch=diff» per a veure el pedaç que ha fallat" -#: builtin/am.c:1954 +#: builtin/am.c msgid "No changes - recorded it as an empty commit." msgstr "No hi ha canvis - enregistrat com una comissió buida." -#: builtin/am.c:1956 +#: builtin/am.c msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2804,7 +2743,7 @@ msgstr "" "Si no hi ha res per a fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1964 +#: builtin/am.c msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -2817,17 +2756,16 @@ msgstr "" "Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel " "fitxer." -#: builtin/am.c:2072 builtin/am.c:2076 builtin/am.c:2090 builtin/reset.c:409 -#: builtin/reset.c:417 +#: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte «%s»." -#: builtin/am.c:2126 builtin/am.c:2203 +#: builtin/am.c msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2170 +#: builtin/am.c msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2835,165 +2773,155 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de «am».\n" "No s'està rebobinant a ORIG_HEAD" -#: builtin/am.c:2246 builtin/bisect.c:182 builtin/tag.c:360 worktree.c:259 +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" -#: builtin/am.c:2320 +#: builtin/am.c msgid "git am [] [( | )...]" msgstr "git am [] [( | )...]" -#: builtin/am.c:2321 +#: builtin/am.c msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [] (--continue | --skip | --abort)" -#: builtin/am.c:2327 +#: builtin/am.c msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2329 +#: builtin/am.c msgid "bypass pre-applypatch and applypatch-msg hooks" msgstr "evita els lligams pre-applypatch i applypatch-msg" -#: builtin/am.c:2331 +#: builtin/am.c msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2333 +#: builtin/am.c msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2334 builtin/init-db.c:98 builtin/prune-packed.c:20 -#: builtin/repack.c:1208 builtin/stash.c:1027 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2336 +#: builtin/am.c msgid "add a Signed-off-by trailer to the commit message" msgstr "afegeix un «trailer» tipus «Signed-off-by» al missatge de comissió" -#: builtin/am.c:2339 +#: builtin/am.c msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2341 +#: builtin/am.c msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2343 +#: builtin/am.c msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2345 +#: builtin/am.c msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2347 +#: builtin/am.c msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" -#: builtin/am.c:2350 +#: builtin/am.c msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2352 +#: builtin/am.c msgid "pass it through git-mailinfo" msgstr "passa-ho a través del git-mailinfo" -#: builtin/am.c:2355 builtin/am.c:2358 builtin/am.c:2361 builtin/am.c:2364 -#: builtin/am.c:2367 builtin/am.c:2370 builtin/am.c:2373 builtin/am.c:2376 -#: builtin/am.c:2382 +#: builtin/am.c msgid "pass it through git-apply" msgstr "passa-ho a través de git-apply" -#: builtin/am.c:2372 builtin/commit.c:1549 builtin/fmt-merge-msg.c:23 -#: builtin/fmt-merge-msg.c:26 builtin/grep.c:979 builtin/merge.c:250 -#: builtin/pull.c:145 builtin/pull.c:207 builtin/pull.c:224 -#: builtin/rebase.c:1134 builtin/repack.c:1219 builtin/repack.c:1223 -#: builtin/repack.c:1225 builtin/show-branch.c:668 builtin/show-ref.c:314 -#: builtin/tag.c:490 parse-options.h:215 parse-options.h:276 -#: parse-options.h:526 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h msgid "n" msgstr "n" -#: builtin/am.c:2378 builtin/branch.c:775 builtin/bugreport.c:126 -#: builtin/cat-file.c:967 builtin/cat-file.c:971 builtin/cat-file.c:978 -#: builtin/clone.c:160 builtin/diagnose.c:30 builtin/for-each-ref.c:47 -#: builtin/init-db.c:105 builtin/ls-files.c:637 builtin/ls-tree.c:368 -#: builtin/refs.c:25 builtin/replace.c:572 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2806 builtin/submodule--helper.c:3435 -#: builtin/tag.c:528 builtin/verify-tag.c:34 +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c +#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "format" -#: builtin/am.c:2379 +#: builtin/am.c msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2385 +#: builtin/am.c msgid "override error message when patch failure occurs" msgstr "sobreescriu el missatge d'error si falla l'aplicació del pedaç" -#: builtin/am.c:2387 +#: builtin/am.c msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2390 +#: builtin/am.c msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2393 +#: builtin/am.c msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2396 +#: builtin/am.c msgid "restore the original branch and abort the patching operation" msgstr "restaura la branca original i interromp l'operació d'apedaçament" -#: builtin/am.c:2399 +#: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" msgstr "interromp l'operació d'apedaçament però manté HEAD on és" -#: builtin/am.c:2403 +#: builtin/am.c msgid "show the patch being applied" msgstr "mostra el pedaç que s'està aplicant" -#: builtin/am.c:2407 +#: builtin/am.c msgid "try to apply current patch again" msgstr "intenta aplicar el pedaç actual de nou" -#: builtin/am.c:2410 +#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "registra el pedaç buit com una comissió buida" -#: builtin/am.c:2414 +#: builtin/am.c msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2416 +#: builtin/am.c msgid "use current timestamp for author date" msgstr "usa la marca de temps actual per a la data d'autor" -#: builtin/am.c:2418 builtin/commit-tree.c:114 builtin/commit.c:1678 -#: builtin/merge.c:289 builtin/pull.c:182 builtin/rebase.c:1190 -#: builtin/revert.c:131 builtin/tag.c:507 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2419 builtin/rebase.c:1191 +#: builtin/am.c builtin/rebase.c msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2422 +#: builtin/am.c msgid "how to handle empty patches" msgstr "com gestionar les comissions buides" -#: builtin/am.c:2425 +#: builtin/am.c msgid "(internal use for git-rebase)" msgstr "(ús intern per a git-rebase)" -#: builtin/am.c:2443 +#: builtin/am.c msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -3001,18 +2929,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no fa res, i\n" "s'eliminarà. No l'useu més." -#: builtin/am.c:2450 +#: builtin/am.c msgid "failed to read the index" msgstr "s'ha produït un error en llegir l'índex" -#: builtin/am.c:2465 +#: builtin/am.c #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "un directori de «rebase» anterior %s encara existeix però s'ha donat una " "bústia." -#: builtin/am.c:2489 +#: builtin/am.c #, c-format msgid "" "Stray %s directory found.\n" @@ -3021,40 +2949,40 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu «git am --abort» per a eliminar-lo." -#: builtin/am.c:2495 +#: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/am.c:2505 +#: builtin/am.c msgid "interactive mode requires patches on the command line" msgstr "el mode interactiu requereix pedaços a la línia d'ordres" -#: builtin/apply.c:8 +#: builtin/apply.c msgid "git apply [] [...]" msgstr "git apply [] [...]" -#: builtin/archive.c:18 diagnose.c:211 +#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "no s'ha pogut redirigir la sortida" -#: builtin/archive.c:57 +#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge" -#: builtin/archive.c:60 +#: builtin/archive.c #, c-format msgid "git archive: NACK %s" msgstr "git archive: %s NACK" -#: builtin/archive.c:61 +#: builtin/archive.c msgid "git archive: protocol error" msgstr "git archive: error de protocol" -#: builtin/archive.c:65 +#: builtin/archive.c msgid "git archive: expected a flush" msgstr "git archive: s'esperava una neteja" -#: builtin/bisect.c:28 +#: builtin/bisect.c msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3062,71 +2990,71 @@ msgstr "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" -#: builtin/bisect.c:32 +#: builtin/bisect.c msgid "git bisect (good|bad) [...]" msgstr "git bisect (good|bad) [...]" -#: builtin/bisect.c:36 +#: builtin/bisect.c msgid "git bisect skip [(|)...]" msgstr "git bisect skip [(|)...]" -#: builtin/bisect.c:40 +#: builtin/bisect.c msgid "git bisect reset []" msgstr "git bisect reset []" -#: builtin/bisect.c:44 +#: builtin/bisect.c msgid "git bisect replay " msgstr "git bisect replay " -#: builtin/bisect.c:48 +#: builtin/bisect.c msgid "git bisect run [...]" msgstr "git bisect run [...]" -#: builtin/bisect.c:135 +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "no es pot obrir el fitxer «%s» en mode «%s»" -#: builtin/bisect.c:142 +#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "no s'ha pogut escriure el fitxer «%s»" -#: builtin/bisect.c:180 +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "no es pot obrir «%s» per a lectura" -#: builtin/bisect.c:196 +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "«%s» no és un terme vàlid" -#: builtin/bisect.c:200 +#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no es pot usar l'ordre interna «%s» com a terme" -#: builtin/bisect.c:210 +#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no es pot canviar el significat del terme «%s»" -#: builtin/bisect.c:220 +#: builtin/bisect.c msgid "please use two different terms" msgstr "useu dos termes diferents" -#: builtin/bisect.c:236 +#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "No estem bisecant.\n" -#: builtin/bisect.c:243 +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "«%s» no és una comissió vàlida" -#: builtin/bisect.c:254 +#: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -3134,27 +3062,27 @@ msgstr "" "no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset " "»." -#: builtin/bisect.c:298 +#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "Argument «bisect_write» incorrecte: %s" -#: builtin/bisect.c:303 +#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»" -#: builtin/bisect.c:315 +#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "no s'ha pogut obrir el fitxer «%s»" -#: builtin/bisect.c:341 +#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ordre no vàlida: esteu actualment en una bisecció %s/%s" -#: builtin/bisect.c:370 +#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -3163,7 +3091,7 @@ msgstr "" "Heu de donar com a mínim un %s i una revisió %s.\n" "Podeu usar «git bisect %s» i «git bisect %s» per a això." -#: builtin/bisect.c:374 +#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -3174,7 +3102,7 @@ msgstr "" "Heu de donar com a mínim un %s i una revisió %s.\n" "Podeu usar «git bisect %s» i «git bisect %s» per a això." -#: builtin/bisect.c:394 +#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "bisecant amb només una comissió %s" @@ -3183,15 +3111,15 @@ msgstr "bisecant amb només una comissió %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c:402 +#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect.c:460 +#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "estat: s'estan esperant les comissions bones i dolentes\n" -#: builtin/bisect.c:462 +#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" @@ -3201,16 +3129,16 @@ msgstr[1] "" "estat: s'està esperant una comissió incorrecta, es coneixen %d comissions " "bones\n" -#: builtin/bisect.c:466 +#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "" "estat: s'està esperant comissions bones, es coneix una comissió incorrecta\n" -#: builtin/bisect.c:505 +#: builtin/bisect.c msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect.c:508 +#: builtin/bisect.c #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -3219,7 +3147,7 @@ msgstr "" "Els termes actuals són %s per a l'estat antic\n" "i %s per al nou estat.\n" -#: builtin/bisect.c:518 +#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -3228,45 +3156,45 @@ msgstr "" "argument no vàlid %s per a «git bisect terms».\n" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." -#: builtin/bisect.c:609 +#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "no s'ha pogut obrir «%s» per a afegir-hi" -#: builtin/bisect.c:733 builtin/bisect.c:746 +#: builtin/bisect.c msgid "'' is not a valid term" msgstr "«%s» no és un terme vàlid" -#: builtin/bisect.c:756 +#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "opció no reconeguda: «%s»" -#: builtin/bisect.c:760 +#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "«%s» no sembla ser una revisió vàlida" -#: builtin/bisect.c:792 +#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - cal una HEAD" -#: builtin/bisect.c:808 +#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "l'agafament de «%s» ha fallat. Proveu «git bisect start »." -#: builtin/bisect.c:825 +#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" -#: builtin/bisect.c:845 +#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "referència no és vàlida: «%s»" -#: builtin/bisect.c:903 +#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "Cal començar per «git bisect start»\n" @@ -3274,281 +3202,278 @@ msgstr "Cal començar per «git bisect start»\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c:914 +#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "Voleu que ho faci per vostè [Y/n]? " -#: builtin/bisect.c:931 +#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "Executeu «--bisect-state» amb almenys un argument" -#: builtin/bisect.c:944 +#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "«git bisect %s» només pot acceptar un argument." -#: builtin/bisect.c:957 builtin/bisect.c:970 +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "Entrada amb revisió errònia: %s" -#: builtin/bisect.c:977 +#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Entrada de revisió errònia (no és una comissió): %s" -#: builtin/bisect.c:1009 +#: builtin/bisect.c msgid "We are not bisecting." msgstr "No estem bisecant." -#: builtin/bisect.c:1059 +#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "«%s»? Què voleu dir?" -#: builtin/bisect.c:1071 +#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "no es pot llegir «%s» per a reproducció" -#: builtin/bisect.c:1179 +#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "s'està executant %s\n" -#: builtin/bisect.c:1228 +#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre." -#: builtin/bisect.c:1248 +#: builtin/bisect.c #, c-format msgid "unable to verify %s on good revision" msgstr "no s'ha pogut verificar «%s» en una bona revisió" -#: builtin/bisect.c:1254 +#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "codi d'error de sortida %d per a una bona revisió" -#: builtin/bisect.c:1262 +#: builtin/bisect.c #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "" "l'execució de la de bisecció ha fallat: codi de sortida %d de %s és < 0 o >= " "128" -#: builtin/bisect.c:1277 +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "no es pot obrir «%s» per a escriptura" -#: builtin/bisect.c:1295 +#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "l'execució de la bisecció no pot continuar més" -#: builtin/bisect.c:1297 +#: builtin/bisect.c msgid "bisect run success" msgstr "execució de bisecció amb èxit" -#: builtin/bisect.c:1300 +#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "la bisecció ha trobat una primera comissió errònia" -#: builtin/bisect.c:1303 +#: builtin/bisect.c #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "" "ha fallat l'execució del bisect: «git bisect %s» ha sortit amb el codi " "d'error %d" -#: builtin/bisect.c:1318 +#: builtin/bisect.c #, c-format msgid "'%s' requires either no argument or a commit" msgstr "«%s» no requereix cap argument ni comissió" -#: builtin/bisect.c:1329 +#: builtin/bisect.c #, c-format msgid "'%s' requires 0 or 1 argument" msgstr "%s requereix 0 o 1 arguments" -#: builtin/bisect.c:1353 +#: builtin/bisect.c #, c-format msgid "'%s' requires 0 arguments" msgstr "«%s» requereix 0 arguments" -#: builtin/bisect.c:1372 +#: builtin/bisect.c msgid "no logfile given" msgstr "no s'ha donat cap fitxer de registre" -#: builtin/bisect.c:1408 +#: builtin/bisect.c #, c-format msgid "'%s' failed: no command provided." msgstr "«%s» ha fallat: no s'ha proporcionat cap ordre." -#: builtin/bisect.c:1442 +#: builtin/bisect.c msgid "need a command" msgstr "cal una subordre" -#: builtin/bisect.c:1447 builtin/cat-file.c:747 +#: builtin/bisect.c builtin/cat-file.c #, c-format msgid "unknown command: '%s'" msgstr "ordre desconeguda: «%s»" -#: builtin/blame.c:37 +#: builtin/blame.c msgid "git blame [] [] [] [--] " msgstr "git blame [] [] [] [--] fitxer" -#: builtin/blame.c:38 +#: builtin/blame.c msgid "git annotate [] [] [] [--] " msgstr "git annotate [] [] [] [--] " -#: builtin/blame.c:43 builtin/blame.c:50 +#: builtin/blame.c msgid " are documented in git-rev-list(1)" msgstr "es documenten les en git-rev-list(1)" -#: builtin/blame.c:419 +#: builtin/blame.c #, c-format msgid "expecting a color: %s" msgstr "s'esperava un color: %s" -#: builtin/blame.c:426 +#: builtin/blame.c msgid "must end with a color" msgstr "ha d'acabar amb un color" -#: builtin/blame.c:861 +#: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" msgstr "no s'ha pogut trobar la revisió %s a ignorar" -#: builtin/blame.c:886 +#: builtin/blame.c msgid "show blame entries as we find them, incrementally" msgstr "mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:887 +#: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" msgstr "" "no mostris els noms d'objectes de les comissions de frontera (per defecte: " "desactivat)" -#: builtin/blame.c:888 +#: builtin/blame.c msgid "do not treat root commits as boundaries (Default: off)" msgstr "" "no tractis les comissions arrel com de frontera (per defecte: desactivat)" -#: builtin/blame.c:889 +#: builtin/blame.c msgid "show work cost statistics" msgstr "mostra les estadístiques del cost de treball" -#: builtin/blame.c:890 builtin/checkout.c:1691 builtin/clone.c:110 -#: builtin/commit-graph.c:82 builtin/commit-graph.c:252 builtin/fetch.c:2212 -#: builtin/merge.c:288 builtin/multi-pack-index.c:132 -#: builtin/multi-pack-index.c:191 builtin/multi-pack-index.c:218 -#: builtin/multi-pack-index.c:247 builtin/pull.c:123 builtin/push.c:591 -#: builtin/remote.c:713 builtin/send-pack.c:201 +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/blame.c:891 +#: builtin/blame.c msgid "show output score for blame entries" msgstr "mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:892 +#: builtin/blame.c msgid "show original filename (Default: auto)" msgstr "mostra el nom de fitxer original (per defecte: automàtic)" -#: builtin/blame.c:893 +#: builtin/blame.c msgid "show original linenumber (Default: off)" msgstr "mostra el número de línia original (per defecte: desactivat)" -#: builtin/blame.c:894 +#: builtin/blame.c msgid "show in a format designed for machine consumption" msgstr "presenta en un format dissenyat per a ser consumit per una màquina" -#: builtin/blame.c:895 +#: builtin/blame.c msgid "show porcelain format with per-line commit information" msgstr "mostra en format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:896 +#: builtin/blame.c 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:897 +#: builtin/blame.c msgid "show raw timestamp (Default: off)" msgstr "mostra la marca de temps en cru (per defecte: desactivat)" -#: builtin/blame.c:898 +#: builtin/blame.c msgid "show long commit SHA1 (Default: off)" msgstr "mostra l'SHA1 de la comissió en format llarg (per defecte: desactivat)" -#: builtin/blame.c:899 +#: builtin/blame.c 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:900 +#: builtin/blame.c msgid "show author email instead of name (Default: off)" msgstr "" "mostra el correu electrònic de l'autor en comptes del nom (per defecte: " "desactivat)" -#: builtin/blame.c:901 +#: builtin/blame.c msgid "ignore whitespace differences" msgstr "ignora les diferències d'espai en blanc" -#: builtin/blame.c:902 builtin/log.c:2121 +#: builtin/blame.c builtin/log.c msgid "rev" msgstr "rev" -#: builtin/blame.c:902 +#: builtin/blame.c msgid "ignore when blaming" msgstr "ignora ñ- en fer «blame»" -#: builtin/blame.c:903 +#: builtin/blame.c msgid "ignore revisions from " msgstr "ignora les revisions de " -#: builtin/blame.c:904 +#: builtin/blame.c msgid "color redundant metadata from previous line differently" msgstr "" "acoloreix les metadades redundants de la línia anterior de manera diferent" -#: builtin/blame.c:905 +#: builtin/blame.c msgid "color lines by age" msgstr "acoloreix les línies per antiguitat" -#: builtin/blame.c:906 +#: builtin/blame.c msgid "spend extra cycles to find better match" msgstr "gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:907 +#: builtin/blame.c msgid "use revisions from instead of calling git-rev-list" msgstr "usa les revisions de en lloc d'invocar git-rev-list" -#: builtin/blame.c:908 +#: builtin/blame.c msgid "use 's contents as the final image" msgstr "usa els continguts de com a la imatge final" -#: builtin/blame.c:909 builtin/blame.c:910 +#: builtin/blame.c msgid "score" msgstr "puntuació" -#: builtin/blame.c:909 +#: builtin/blame.c 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:910 +#: builtin/blame.c msgid "find line movements within and across files" msgstr "troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:911 +#: builtin/blame.c msgid "range" msgstr "rang" -#: builtin/blame.c:912 +#: builtin/blame.c msgid "process only line range , or function :" msgstr "processa només el rang , o la funció :" -#: builtin/blame.c:974 +#: builtin/blame.c msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -3561,26 +3486,26 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:1025 +#: builtin/blame.c msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:1141 +#: builtin/blame.c #, 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:1189 +#: builtin/blame.c msgid "Blaming lines" msgstr "S'està fent un «blame»" -#: builtin/branch.c:31 +#: builtin/branch.c msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:32 +#: builtin/branch.c msgid "" "git branch [] [-f] [--recurse-submodules] []" @@ -3588,31 +3513,31 @@ msgstr "" "git branch [] [-f] [--recurse-submodules] []" -#: builtin/branch.c:33 +#: builtin/branch.c msgid "git branch [] [-l] [...]" msgstr "git branch [] [-l] [...]" -#: builtin/branch.c:34 +#: builtin/branch.c msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [] [-r] (-d | -D) ..." -#: builtin/branch.c:35 +#: builtin/branch.c msgid "git branch [] (-m | -M) [] " msgstr "git branch [] (-m | -M) [] " -#: builtin/branch.c:36 +#: builtin/branch.c msgid "git branch [] (-c | -C) [] " msgstr "git branch [] (-c | -C) [] " -#: builtin/branch.c:37 +#: builtin/branch.c msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [] [-r | -a] [--points-at]" -#: builtin/branch.c:38 +#: builtin/branch.c msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [] [-r | -a] [--format]" -#: builtin/branch.c:178 +#: builtin/branch.c #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3621,7 +3546,7 @@ msgstr "" "s'està suprimint la branca «%s» que s'ha fusionat a\n" " «%s», però encara no s'ha fusionat a HEAD" -#: builtin/branch.c:182 +#: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3630,41 +3555,41 @@ msgstr "" "no s'està suprimint la branca «%s» que encara no s'ha fusionat a\n" " «%s», encara que s'hagi fusionat a HEAD" -#: builtin/branch.c:196 +#: builtin/branch.c #, c-format msgid "couldn't look up commit object for '%s'" msgstr "no s'ha pogut cercar l'objecte de comissió per a «%s»" -#: builtin/branch.c:200 +#: builtin/branch.c #, c-format msgid "the branch '%s' is not fully merged" msgstr "la branca «%s» no està completament fusionada" -#: builtin/branch.c:202 +#: builtin/branch.c #, c-format msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "Si esteu segur que voleu suprimir-la, executeu «git branch -D %s»" -#: builtin/branch.c:214 +#: builtin/branch.c msgid "update of config-file failed" msgstr "ha fallat l'actualització del fitxer de configuració" -#: builtin/branch.c:249 +#: builtin/branch.c msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:267 +#: builtin/branch.c #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" msgstr "" "no es pot suprimir la branca «%s» utilitzada per l'arbre de treball a «%s»" -#: builtin/branch.c:283 +#: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found" msgstr "no s'ha trobat la branca de seguiment remot «%s»" -#: builtin/branch.c:296 +#: builtin/branch.c #, c-format msgid "" "branch '%s' not found.\n" @@ -3673,100 +3598,100 @@ msgstr "" "no s'ha trobat la branca «%s».\n" "Us heu oblidat de --remote?" -#: builtin/branch.c:300 +#: builtin/branch.c #, c-format msgid "branch '%s' not found" msgstr "no s'ha trobat la branca «%s»" -#: builtin/branch.c:333 +#: builtin/branch.c #, 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:334 +#: builtin/branch.c #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "S'ha suprimit la branca %s (era %s).\n" -#: builtin/branch.c:472 builtin/tag.c:69 +#: builtin/branch.c builtin/tag.c msgid "unable to parse format string" msgstr "no s'ha pogut analitzar la cadena de format" -#: builtin/branch.c:509 +#: builtin/branch.c msgid "could not resolve HEAD" msgstr "no s'ha pogut resoldre HEAD" -#: builtin/branch.c:515 +#: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) apunta fora de refs/heads/" -#: builtin/branch.c:530 +#: builtin/branch.c #, c-format msgid "branch %s is being rebased at %s" msgstr "a la branca %s se li està fent a «rebase» a %s" -#: builtin/branch.c:534 +#: builtin/branch.c #, c-format msgid "branch %s is being bisected at %s" msgstr "la branca %s s'està bisecant a %s" -#: builtin/branch.c:563 +#: builtin/branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD de l'arbre de treball %s no està actualitzat" -#: builtin/branch.c:590 +#: builtin/branch.c #, c-format msgid "invalid branch name: '%s'" msgstr "el nom de la branca no és vàlid: «%s»" -#: builtin/branch.c:610 builtin/branch.c:906 builtin/branch.c:951 +#: builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" msgstr "encara no hi ha cap comissió a la branca «%s»" -#: builtin/branch.c:612 builtin/branch.c:907 +#: builtin/branch.c #, c-format msgid "no branch named '%s'" msgstr "no hi ha cap branca anomenada «%s»" -#: builtin/branch.c:640 +#: builtin/branch.c msgid "branch rename failed" msgstr "ha fallat el canvi de nom de la branca" -#: builtin/branch.c:642 +#: builtin/branch.c msgid "branch copy failed" msgstr "ha fallat la còpia de la branca" -#: builtin/branch.c:646 +#: builtin/branch.c #, 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:649 +#: builtin/branch.c #, c-format msgid "renamed a misnamed branch '%s' away" msgstr "s'ha canviat el nom d'una branca «%s» mal anomenada" -#: builtin/branch.c:656 +#: builtin/branch.c #, 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 s'ha actualitzat" -#: builtin/branch.c:663 +#: builtin/branch.c msgid "branch is renamed, but update of config-file failed" msgstr "" "s'ha canviat el nom de la branca, però ha fallat l'actualització del fitxer " "de configuració" -#: builtin/branch.c:666 +#: builtin/branch.c msgid "branch is copied, but update of config-file failed" msgstr "" "s'ha copiat la branca, però ha fallat l'actualització del fitxer de " "configuració" -#: builtin/branch.c:686 +#: builtin/branch.c #, c-format msgid "" "Please edit the description for the branch\n" @@ -3778,155 +3703,152 @@ msgstr "" "S'eliminaran les línies que comencin amb «%s».\n" "\"\n" -#: builtin/branch.c:727 +#: builtin/branch.c msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:729 +#: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i l'assumpte, useu-lo dues vegades per a la branca font" -#: builtin/branch.c:730 +#: builtin/branch.c msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:732 builtin/checkout.c:1709 -#: builtin/submodule--helper.c:3119 +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "estableix la configuració del seguiment de la branca" -#: builtin/branch.c:735 +#: builtin/branch.c msgid "do not use" msgstr "no usar" -#: builtin/branch.c:737 +#: builtin/branch.c msgid "upstream" msgstr "font" -#: builtin/branch.c:737 +#: builtin/branch.c msgid "change the upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:738 +#: builtin/branch.c msgid "unset the upstream info" msgstr "treu la informació de la font" -#: builtin/branch.c:739 +#: builtin/branch.c msgid "use colored output" msgstr "usa sortida amb colors" -#: builtin/branch.c:740 +#: builtin/branch.c msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:743 builtin/branch.c:745 +#: builtin/branch.c msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:744 builtin/branch.c:746 +#: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "imprimeix només les branques que no continguin la comissió" -#: builtin/branch.c:749 +#: builtin/branch.c msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:750 +#: builtin/branch.c msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:753 +#: builtin/branch.c msgid "delete fully merged branch" msgstr "suprimeix la branca si està completament fusionada" -#: builtin/branch.c:754 +#: builtin/branch.c msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:755 +#: builtin/branch.c msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referències" -#: builtin/branch.c:756 +#: builtin/branch.c msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:758 builtin/for-each-ref.c:43 builtin/tag.c:521 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "do not output a newline after empty formatted refs" msgstr "no emetis cap línia nova després de refs amb format buit" -#: builtin/branch.c:759 +#: builtin/branch.c msgid "copy a branch and its reflog" msgstr "copia una branca i el seu registre de referències" -#: builtin/branch.c:760 +#: builtin/branch.c msgid "copy a branch, even if target exists" msgstr "copia una branca, encara que el destí existeixi" -#: builtin/branch.c:761 +#: builtin/branch.c msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:762 +#: builtin/branch.c msgid "show current branch name" msgstr "mostra el nom de la branca actual" -#: builtin/branch.c:763 builtin/submodule--helper.c:3117 +#: builtin/branch.c builtin/submodule--helper.c msgid "create the branch's reflog" msgstr "crea el registre de referències de la branca" -#: builtin/branch.c:765 +#: builtin/branch.c msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:766 +#: builtin/branch.c msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:767 +#: builtin/branch.c msgid "print only branches that are merged" msgstr "imprimeix només les branques que s'han fusionat" -#: builtin/branch.c:768 +#: builtin/branch.c msgid "print only branches that are not merged" msgstr "imprimeix només les branques que no s'han fusionat" -#: builtin/branch.c:769 +#: builtin/branch.c msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:771 builtin/for-each-ref.c:52 builtin/notes.c:489 -#: builtin/notes.c:492 builtin/notes.c:664 builtin/notes.c:667 -#: builtin/tag.c:524 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "objecte" -#: builtin/branch.c:772 +#: builtin/branch.c msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" -#: builtin/branch.c:773 builtin/for-each-ref.c:58 builtin/tag.c:531 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" msgstr "ordenació i filtratge distingeixen entre majúscules i minúscules" -#: builtin/branch.c:774 builtin/ls-files.c:626 +#: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" msgstr "inclou recursivament els submòduls" -#: builtin/branch.c:775 builtin/for-each-ref.c:47 builtin/ls-files.c:638 -#: builtin/ls-tree.c:369 builtin/tag.c:529 builtin/verify-tag.c:34 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:800 +#: builtin/branch.c msgid "failed to resolve HEAD as a valid ref" msgstr "no s'ha pogut resoldre HEAD com a referència vàlida" -#: builtin/branch.c:804 builtin/clone.c:760 +#: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:825 +#: builtin/branch.c msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" @@ -3934,74 +3856,74 @@ msgstr "" "la branca amb --recurse-submodules només es pot utilitzar si submodule." "propagateBranches està habilitat" -#: builtin/branch.c:827 +#: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules només es pot utilitzar per a crear branques" -#: builtin/branch.c:858 builtin/branch.c:918 +#: builtin/branch.c msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:894 +#: builtin/branch.c msgid "cannot give description to detached HEAD" msgstr "no s'ha pogut donar la descripció al HEAD separat" -#: builtin/branch.c:900 +#: builtin/branch.c 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:920 +#: builtin/branch.c msgid "cannot copy the current branch while not on any" msgstr "no es pot copiar la branca actual mentre no pertanyi a cap" -#: builtin/branch.c:921 +#: builtin/branch.c msgid "cannot rename the current branch while not on any" msgstr "" "no s'ha pogut canviar el nom de la branca actual mentre no pertanyi a cap" -#: builtin/branch.c:927 +#: builtin/branch.c msgid "too many branches for a copy operation" msgstr "hi ha massa branques per a una operació de còpia" -#: builtin/branch.c:928 +#: builtin/branch.c msgid "too many arguments for a rename operation" msgstr "hi ha massa arguments per a una operació de canvi de nom" -#: builtin/branch.c:939 +#: builtin/branch.c msgid "too many arguments to set new upstream" msgstr "hi ha massa arguments per a establir una nova font" -#: builtin/branch.c:943 +#: builtin/branch.c #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" msgstr "" "no s'ha pogut configurar la font de HEAD a %s quan no apunta a cap branca" -#: builtin/branch.c:946 builtin/branch.c:975 +#: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "no existeix la branca «%s»" -#: builtin/branch.c:952 +#: builtin/branch.c #, c-format msgid "branch '%s' does not exist" msgstr "la branca «%s» no existeix" -#: builtin/branch.c:969 +#: builtin/branch.c msgid "too many arguments to unset upstream" msgstr "hi ha massa arguments per a desassignar la font" -#: builtin/branch.c:973 +#: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "no s'ha pogut desassignar la font del HEAD quan no apunta a cap branca" -#: builtin/branch.c:979 +#: builtin/branch.c #, c-format msgid "branch '%s' has no upstream information" msgstr "la branca «%s» no té informació de la font" -#: builtin/branch.c:993 +#: builtin/branch.c msgid "" "the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" @@ -4009,7 +3931,7 @@ msgstr "" "les opcions -a, i -r, a «git branch» no prenen un nom de branca.\n" "Volíeu utilitzar: -a|-r --list ?" -#: builtin/branch.c:997 +#: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead" @@ -4017,29 +3939,29 @@ msgstr "" "l'opció «--set-upstream» ja no és admesa. Utilitzeu en comptes «--track» o " "«--set-upstream-to»" -#: builtin/bugreport.c:22 +#: builtin/bugreport.c msgid "git version:\n" msgstr "versió de git:\n" -#: builtin/bugreport.c:28 +#: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() ha fallat amb l'error «%s» (%d)\n" -#: builtin/bugreport.c:38 +#: builtin/bugreport.c msgid "compiler info: " msgstr "informació del compilador: " -#: builtin/bugreport.c:41 +#: builtin/bugreport.c msgid "libc info: " msgstr "informació de la libc: " -#: builtin/bugreport.c:55 +#: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" msgstr "" "no s'està executant en un repositori de git - no hi ha lligams a mostrar\n" -#: builtin/bugreport.c:68 +#: builtin/bugreport.c msgid "" "git bugreport [(-o | --output-directory) ]\n" " [(-s | --suffix) | --no-suffix]\n" @@ -4049,7 +3971,7 @@ msgstr "" " [(-s | --suffix) | --no-suffix]\n" " [--diagnose[=]]" -#: builtin/bugreport.c:77 +#: builtin/bugreport.c msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -4083,60 +4005,59 @@ msgstr "" "Reviseu la resta de l'informe d'error de sota.\n" "Podeu eliminar qualsevol línia que vulgueu.\n" -#: builtin/bugreport.c:121 builtin/commit.c:1536 builtin/commit.c:1540 -#: builtin/commit.c:1704 builtin/fast-export.c:1200 builtin/fast-export.c:1203 -#: builtin/fast-export.c:1206 builtin/rebase.c:1201 parse-options.h:581 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c +#: parse-options.h msgid "mode" msgstr "mode" -#: builtin/bugreport.c:122 +#: builtin/bugreport.c msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "" "crea un arxiu zip addicional amb diagnòstics detallats (per defecte «stats»)" -#: builtin/bugreport.c:125 +#: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" msgstr "especifiqueu una destinació per al fitxer de l'informe d'error" -#: builtin/bugreport.c:127 +#: builtin/bugreport.c msgid "specify a strftime format suffix for the filename(s)" msgstr "especifiqueu un sufix en format strftime per al nom de fitxer" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c #, c-format msgid "unknown argument `%s'" msgstr "argument desconegut «%s»" -#: builtin/bugreport.c:158 builtin/diagnose.c:56 +#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" msgstr "no s'han pogut crear els directoris principals de «%s»" -#: builtin/bugreport.c:171 builtin/diagnose.c:62 +#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "unable to create diagnostics archive %s" msgstr "no s'ha pogut crear l'arxiu de diagnòstic %s" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c msgid "System Info" msgstr "Informació del sistema" -#: builtin/bugreport.c:182 +#: builtin/bugreport.c msgid "Enabled Hooks" msgstr "Habilita els lligams" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c #, c-format msgid "unable to write to %s" msgstr "no s'ha pogut escriure a %s" -#: builtin/bugreport.c:199 +#: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" msgstr "S'ha creat un nou informe a «%s».\n" -#: builtin/bundle.c:19 +#: builtin/bundle.c msgid "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " @@ -4144,112 +4065,112 @@ msgstr "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " -#: builtin/bundle.c:22 +#: builtin/bundle.c msgid "git bundle verify [-q | --quiet] " msgstr "git bundle verify [-q | --quiet] " -#: builtin/bundle.c:24 +#: builtin/bundle.c msgid "git bundle list-heads [...]" msgstr "git bundle list-heads [...]" -#: builtin/bundle.c:26 +#: builtin/bundle.c msgid "git bundle unbundle [--progress] [...]" msgstr "git bundle unbundle [--progress] [...]" -#: builtin/bundle.c:65 +#: builtin/bundle.c msgid "need a argument" msgstr "necessita un argument " -#: builtin/bundle.c:76 builtin/pack-objects.c:4333 +#: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/bundle.c:79 builtin/bundle.c:200 builtin/pack-objects.c:4336 +#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/bundle.c:82 +#: builtin/bundle.c msgid "historical; same as --progress" msgstr "històric; el mateix que --progress" -#: builtin/bundle.c:85 +#: builtin/bundle.c msgid "historical; does nothing" msgstr "històric; no fa res" -#: builtin/bundle.c:88 +#: builtin/bundle.c msgid "specify bundle format version" msgstr "especifica la versió del format del farcell" -#: builtin/bundle.c:102 +#: builtin/bundle.c msgid "Need a repository to create a bundle." msgstr "Cal un repositori per a crear un farcell." -#: builtin/bundle.c:133 +#: builtin/bundle.c msgid "do not show bundle details" msgstr "no mostris els detalls del farcell" -#: builtin/bundle.c:144 bundle.c:236 +#: builtin/bundle.c bundle.c msgid "need a repository to verify a bundle" msgstr "cal un repositori per a verificar un farcell" -#: builtin/bundle.c:159 +#: builtin/bundle.c #, c-format msgid "%s is okay\n" msgstr "%s està bé\n" -#: builtin/bundle.c:211 +#: builtin/bundle.c msgid "Need a repository to unbundle." msgstr "Cal un repositori per a desfer un farcell." -#: builtin/bundle.c:219 +#: builtin/bundle.c msgid "Unbundling objects" msgstr "S'estan desagrupant objectes" -#: builtin/cat-file.c:73 merge-recursive.c:967 +#: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: builtin/cat-file.c:679 +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "flush només és per al mode --buffer" -#: builtin/cat-file.c:723 +#: builtin/cat-file.c msgid "empty command in input" msgstr "ordre buida en l'entrada" -#: builtin/cat-file.c:725 +#: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" msgstr "espai en blanc abans de l'ordre: «%s»" -#: builtin/cat-file.c:734 +#: builtin/cat-file.c #, c-format msgid "%s requires arguments" msgstr "%s requereix arguments" -#: builtin/cat-file.c:739 +#: builtin/cat-file.c #, c-format msgid "%s takes no arguments" msgstr "%s no accepta arguments" -#: builtin/cat-file.c:907 +#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "només es pot especificar una opció per lots" -#: builtin/cat-file.c:941 +#: builtin/cat-file.c msgid "git cat-file " msgstr "git cat-file " -#: builtin/cat-file.c:942 +#: builtin/cat-file.c msgid "git cat-file (-e | -p) " msgstr "git cat-file (-e | -p) " -#: builtin/cat-file.c:943 +#: builtin/cat-file.c msgid "git cat-file (-t | -s) [--allow-unknown-type] " msgstr "git cat-file (-t | -s) [--allow-unknown-type] " -#: builtin/cat-file.c:944 +#: builtin/cat-file.c msgid "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" @@ -4257,7 +4178,7 @@ msgstr "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" -#: builtin/cat-file.c:946 +#: builtin/cat-file.c msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -4269,148 +4190,147 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-Z]" -#: builtin/cat-file.c:953 +#: builtin/cat-file.c msgid "Check object existence or emit object contents" msgstr "Comprova l'existència de l'objecte o emet el contingut de l'objecte" -#: builtin/cat-file.c:955 +#: builtin/cat-file.c msgid "check if exists" msgstr "comprova si existeix" -#: builtin/cat-file.c:956 +#: builtin/cat-file.c msgid "pretty-print content" msgstr "impressió embellida del contingut de l'" -#: builtin/cat-file.c:958 +#: builtin/cat-file.c msgid "Emit [broken] object attributes" msgstr "Emet els atributs [broken] de l'objecte" -#: builtin/cat-file.c:959 +#: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "" "mostra el tipus d'objecte (un dels següents: «blob», «tree», «commit», " "«tag», ...)" -#: builtin/cat-file.c:960 +#: builtin/cat-file.c msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:962 +#: builtin/cat-file.c 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:963 builtin/log.c:268 +#: builtin/cat-file.c builtin/log.c msgid "use mail map file" msgstr "usa el fitxer de mapa de correu" -#: builtin/cat-file.c:966 +#: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Objectes de lots sol·licitats a stdin (o --batch-all-objects)" -#: builtin/cat-file.c:968 +#: builtin/cat-file.c msgid "show full or contents" msgstr "mostra el contingut complet de o " -#: builtin/cat-file.c:972 +#: builtin/cat-file.c msgid "like --batch, but don't emit " msgstr "com a --batch, però no emetis " -#: builtin/cat-file.c:975 +#: builtin/cat-file.c msgid "stdin is NUL-terminated" msgstr "l'entrada és acabada amb NUL" -#: builtin/cat-file.c:977 +#: builtin/cat-file.c msgid "stdin and stdout is NUL-terminated" msgstr "stdin i stdout estan terminats amb NUL" -#: builtin/cat-file.c:979 +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "llegeix les ordres de stdin" -#: builtin/cat-file.c:983 +#: builtin/cat-file.c msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "" "amb --batch[-check]: ignora stdin, posa en lots tots els objectes coneguts" -#: builtin/cat-file.c:985 +#: builtin/cat-file.c msgid "Change or optimize batch output" msgstr "Canvia o optimitza la sortida per lots" -#: builtin/cat-file.c:986 +#: builtin/cat-file.c msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:988 +#: builtin/cat-file.c msgid "follow in-tree symlinks" msgstr "segueix els enllaços simbòlics en l'arbre" -#: builtin/cat-file.c:990 +#: builtin/cat-file.c msgid "do not order objects before emitting them" msgstr "no ordenis els objectes abans d'emetre'ls" -#: builtin/cat-file.c:992 +#: builtin/cat-file.c msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "" "Emet l'objecte (blob o arbre) amb conversió o filtre (stand-alone, o amb lot)" -#: builtin/cat-file.c:994 +#: builtin/cat-file.c msgid "run textconv on object's content" msgstr "executar textconv al contingut de l'objecte" -#: builtin/cat-file.c:996 +#: builtin/cat-file.c msgid "run filters on object's content" msgstr "executa els filtres al contingut de l'objecte" -#: builtin/cat-file.c:997 +#: builtin/cat-file.c msgid "blob|tree" msgstr "blob|tree" -#: builtin/cat-file.c:998 +#: builtin/cat-file.c msgid "use a for (--textconv | --filters); Not with 'batch'" msgstr "useu un per a (--textconv | --filters); no amb «batch»" -#: builtin/cat-file.c:1019 +#: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "«%s=<%s>» necessita «%s» o «%s»" -#: builtin/cat-file.c:1021 +#: builtin/cat-file.c msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c:1028 builtin/cat-file.c:1031 builtin/cat-file.c:1034 -#: builtin/cat-file.c:1037 builtin/cat-file.c:1040 +#: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "«%s» requereix un mode batch" -#: builtin/cat-file.c:1061 +#: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "«-%c» és incompatible amb el model batch" -#: builtin/cat-file.c:1064 +#: builtin/cat-file.c msgid "batch modes take no arguments" msgstr "el mode batch no accepta cap argument" -#: builtin/cat-file.c:1072 builtin/cat-file.c:1075 +#: builtin/cat-file.c #, c-format msgid " required with '%s'" msgstr " requerida amb «%s»" -#: builtin/cat-file.c:1078 +#: builtin/cat-file.c #, c-format msgid " required with '-%c'" msgstr " requerit amb «-%c»" -#: builtin/cat-file.c:1087 +#: builtin/cat-file.c #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "només es permeten dos arguments en el mode , no %d" -#: builtin/check-attr.c:18 +#: builtin/check-attr.c msgid "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." @@ -4418,276 +4338,269 @@ msgstr "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." -#: builtin/check-attr.c:19 +#: builtin/check-attr.c msgid "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgstr "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" -#: builtin/check-attr.c:26 +#: builtin/check-attr.c msgid "report all attributes set on file" msgstr "informa de tots els atributs establerts en el fitxer" -#: builtin/check-attr.c:27 +#: builtin/check-attr.c msgid "use .gitattributes only from the index" msgstr "usa .gitattributes només des de l'índex" -#: builtin/check-attr.c:28 builtin/check-ignore.c:26 builtin/hash-object.c:113 +#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" msgstr "llegeix els noms de fitxer de stdin" -#: builtin/check-attr.c:30 builtin/check-ignore.c:28 +#: builtin/check-attr.c builtin/check-ignore.c 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-attr.c:31 +#: builtin/check-attr.c msgid "" msgstr "" -#: builtin/check-attr.c:31 +#: builtin/check-attr.c msgid "which tree-ish to check attributes at" msgstr "a quin tree-ish s'han de comprovar els atributs" -#: builtin/check-ignore.c:22 builtin/checkout.c:1687 builtin/gc.c:680 -#: builtin/worktree.c:791 +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "omet els informes de progrés" -#: builtin/check-ignore.c:30 +#: builtin/check-ignore.c msgid "show non-matching input paths" msgstr "mostra els camins d'entrada que no coincideixin" -#: builtin/check-ignore.c:32 +#: builtin/check-ignore.c msgid "ignore index when checking" msgstr "ignora l'índex en comprovar" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" msgstr "no es poden especificar noms de camí amb --stdin" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c msgid "-z only makes sense with --stdin" msgstr "-z només té sentit amb --stdin" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c msgid "no path specified" msgstr "cap camí especificat" -#: builtin/check-ignore.c:178 +#: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" msgstr "--quiet només és vàlid amb un sol nom de camí" -#: builtin/check-ignore.c:180 +#: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" msgstr "no es poden especificar --quiet i --verbose alhora" -#: builtin/check-ignore.c:183 +#: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" msgstr "--non-matching és vàlid només amb --verbose" -#: builtin/check-mailmap.c:15 +#: builtin/check-mailmap.c msgid "git check-mailmap [] ..." msgstr "git check-mailmap [] ..." -#: builtin/check-mailmap.c:20 +#: builtin/check-mailmap.c msgid "also read contacts from stdin" msgstr "també llegeix els contactes des de stdin" # no traduïsc mailmap -#: builtin/check-mailmap.c:21 +#: builtin/check-mailmap.c msgid "read additional mailmap entries from file" msgstr "llegeix les entrades mailmap addicionals del fitxer" -#: builtin/check-mailmap.c:22 +#: builtin/check-mailmap.c msgid "blob" msgstr "blob" -#: builtin/check-mailmap.c:22 +#: builtin/check-mailmap.c msgid "read additional mailmap entries from blob" msgstr "llegeix entrades mailmap addicionals del blob" -#: builtin/check-mailmap.c:63 +#: builtin/check-mailmap.c msgid "no contacts specified" msgstr "no hi ha contactes especificats" -#: builtin/checkout--worker.c:113 +#: builtin/checkout--worker.c msgid "git checkout--worker []" msgstr "git checkout--worker []" -#: builtin/checkout--worker.c:124 builtin/checkout-index.c:242 -#: builtin/column.c:36 builtin/column.c:37 builtin/submodule--helper.c:1862 -#: builtin/submodule--helper.c:1865 builtin/worktree.c:789 -#: builtin/worktree.c:1089 +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c +#: builtin/submodule--helper.c builtin/worktree.c msgid "string" msgstr "cadena" -#: builtin/checkout--worker.c:125 builtin/checkout-index.c:243 +#: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend " msgstr "en crear fitxers, anteposa " -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [] [--] [...]" -#: builtin/checkout-index.c:205 +#: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" msgstr "«stage» ha de ser entre 1 i 3 o all" -#: builtin/checkout-index.c:226 +#: builtin/checkout-index.c msgid "check out all files in the index" msgstr "agafa tots els fitxers en l'índex" -#: builtin/checkout-index.c:228 +#: builtin/checkout-index.c msgid "do not skip files with skip-worktree set" msgstr "no ometis els fitxers amb skip-worktree establert" -#: builtin/checkout-index.c:229 +#: builtin/checkout-index.c msgid "force overwrite of existing files" msgstr "força la sobreescriptura de fitxers existents" -#: builtin/checkout-index.c:231 +#: builtin/checkout-index.c msgid "no warning for existing files and files not in index" msgstr "" "cap advertència per a fitxers existents i fitxers que no siguin a l'índex" -#: builtin/checkout-index.c:233 +#: builtin/checkout-index.c msgid "don't checkout new files" msgstr "no agafis fitxers nous" -#: builtin/checkout-index.c:235 +#: builtin/checkout-index.c msgid "update stat information in the index file" msgstr "actualitza la informació d'estadístiques en el fitxer d'índex" -#: builtin/checkout-index.c:239 +#: builtin/checkout-index.c msgid "read list of paths from the standard input" msgstr "llegeix la llista de camins des de l'entrada estàndard" -#: builtin/checkout-index.c:241 +#: builtin/checkout-index.c msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" -#: builtin/checkout-index.c:245 +#: builtin/checkout-index.c msgid "copy out the files from named stage" msgstr "copia els fitxers des de «stage» amb nom" -#: builtin/checkout.c:44 +#: builtin/checkout.c msgid "git checkout [] " msgstr "git checkout [] " -#: builtin/checkout.c:45 +#: builtin/checkout.c msgid "git checkout [] [] -- ..." msgstr "git checkout [] [] -- ..." -#: builtin/checkout.c:50 +#: builtin/checkout.c msgid "git switch [] []" msgstr "git switch [] []" -#: builtin/checkout.c:55 +#: builtin/checkout.c msgid "git restore [] [--source=] ..." msgstr "git restore [] [--source=] ..." -#: builtin/checkout.c:212 builtin/checkout.c:251 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "el camí «%s» no té la nostra versió" -#: builtin/checkout.c:214 builtin/checkout.c:253 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "el camí «%s» no té la seva versió" -#: builtin/checkout.c:230 +#: builtin/checkout.c #, 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:285 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí «%s» no té les versions necessàries" -#: builtin/checkout.c:305 +#: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" msgstr "camí «%s»: no es pot fusionar" -#: builtin/checkout.c:321 +#: builtin/checkout.c #, 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:439 +#: builtin/checkout.c #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Recreat un conflicte de fusió" msgstr[1] "Recreats %d conflictes de fusió" -#: builtin/checkout.c:444 +#: builtin/checkout.c #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "S'ha actualitzat %d camí a partir de %s" msgstr[1] "S'han actualitzat %d camins a partir de %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "S'ha actualitzat %d camí a partir de l'índex" msgstr[1] "S'han actualitzat %d camins a partir de l'índex" -#: builtin/checkout.c:474 builtin/checkout.c:477 builtin/checkout.c:480 -#: builtin/checkout.c:484 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:494 +#: builtin/checkout.c #, 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:498 +#: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" msgstr "no s'ha especificat ni «%s» ni «%s»" -#: builtin/checkout.c:502 +#: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»" -#: builtin/checkout.c:520 builtin/checkout.c:524 +#: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "«%s» o «%s» no poden utilitzar-se amb %s" -#: builtin/checkout.c:534 +#: builtin/checkout.c #, c-format msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "«%s», «%s» o «%s» no es poden utilitzar en agafar un arbre" -#: builtin/checkout.c:607 builtin/checkout.c:614 +#: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:799 builtin/checkout.c:1271 builtin/checkout.c:1277 -#: builtin/grep.c:525 builtin/grep.c:668 builtin/grep.c:708 -#: builtin/merge-tree.c:449 builtin/merge-tree.c:454 builtin/merge-tree.c:459 -#: builtin/reset.c:121 merge-ort.c:5143 reset.c:168 sequencer.c:776 -#: sequencer.c:4049 tree-walk.c:95 +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c +#: merge-ort.c reset.c sequencer.c tree-walk.c #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/checkout.c:815 +#: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:870 +#: builtin/checkout.c #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -4696,50 +4609,50 @@ msgstr "" "no es pot continuar amb els canvis «staged» als fitxers següents:\n" "%s" -#: builtin/checkout.c:968 +#: builtin/checkout.c #, 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:1015 +#: builtin/checkout.c msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:1019 builtin/clone.c:677 builtin/clone.c:706 +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:1023 +#: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:1026 +#: builtin/checkout.c #, c-format msgid "Already on '%s'\n" msgstr "Ja esteu en «%s»\n" -#: builtin/checkout.c:1030 +#: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:1032 builtin/checkout.c:1485 +#: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:1034 +#: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:1087 +#: builtin/checkout.c #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:1093 +#: builtin/checkout.c #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4762,7 +4675,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1112 +#: builtin/checkout.c #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4789,19 +4702,19 @@ msgstr[1] "" " git branch %s\n" "\n" -#: builtin/checkout.c:1148 +#: builtin/checkout.c msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1152 +#: builtin/checkout.c msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:1197 builtin/checkout.c:1479 +#: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:1290 +#: builtin/checkout.c #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -4810,7 +4723,7 @@ msgstr "" "«%s» podria ser tant un fitxer local com una branca de seguiment.\n" "Useu -- (i opcionalment --no-guess) per a desambiguar-ho" -#: builtin/checkout.c:1297 +#: builtin/checkout.c msgid "" "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" @@ -4830,58 +4743,58 @@ msgstr "" "remota, p. ex. «origin» al remot, considereu configurar l'opció\n" "checkout.defaultRemote=origin en la vostra configuració." -#: builtin/checkout.c:1307 +#: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes" -#: builtin/checkout.c:1374 +#: builtin/checkout.c msgid "only one reference expected" msgstr "només s'esperava una referència" -#: builtin/checkout.c:1391 +#: builtin/checkout.c #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1437 builtin/worktree.c:443 builtin/worktree.c:898 +#: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1450 builtin/checkout.c:1883 +#: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1501 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»" -#: builtin/checkout.c:1503 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»" -#: builtin/checkout.c:1505 builtin/checkout.c:1514 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "s'espera una branca, s'ha obtingut «%s»" -#: builtin/checkout.c:1508 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" msgstr "s'espera una branca, s'ha obtingut la comissió «%s»" -#: builtin/checkout.c:1517 +#: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "" "Si voleu desacoblar HEAD a la comissió, torneu-ho a provar amb l'opció --" "detach." -#: builtin/checkout.c:1530 +#: builtin/checkout.c msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -4889,7 +4802,7 @@ msgstr "" "no es pot canviar de branca mentre es fusiona\n" "Considereu usar «git merge --quit» o «git worktree add»." -#: builtin/checkout.c:1534 +#: builtin/checkout.c msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -4897,7 +4810,7 @@ msgstr "" "no es pot canviar de branca en mig d'una sessió «am»\n" "Considereu usar «git am --quit» o «git worktree add»." -#: builtin/checkout.c:1538 +#: builtin/checkout.c msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -4905,7 +4818,7 @@ msgstr "" "no es pot canviar de branca mentre es fa «rebase»\n" "Considereu usar «git rebase --quit» o «git worktree add»." -#: builtin/checkout.c:1542 +#: builtin/checkout.c msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -4913,7 +4826,7 @@ msgstr "" "no es pot canviar de branca mentre es fa «cherry-pick»\n" "Considereu usar «git cherry-pick --quit» o «git worktree add»." -#: builtin/checkout.c:1546 +#: builtin/checkout.c msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -4921,134 +4834,133 @@ msgstr "" "no es pot canviar de branca mentre s'està revertint\n" "Considereu «git revert --quit» o «git worktree add»." -#: builtin/checkout.c:1550 +#: builtin/checkout.c msgid "you are switching branch while bisecting" msgstr "s'està canviant la branca mentre es fa una bisecció" -#: builtin/checkout.c:1584 +#: builtin/checkout.c msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1587 builtin/checkout.c:1591 builtin/checkout.c:1599 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" # és com si faltara un objecte directe per a agafar -#: builtin/checkout.c:1597 +#: builtin/checkout.c #, c-format msgid "'%s' needs the paths to check out" msgstr "«%s» necessita els camins per a agafar" -#: builtin/checkout.c:1604 builtin/checkout.c:1607 builtin/checkout.c:1610 -#: builtin/checkout.c:1615 builtin/checkout.c:1620 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1617 +#: builtin/checkout.c #, c-format msgid "'%s' cannot take " msgstr "«%s» no pot prendre " -#: builtin/checkout.c:1625 +#: builtin/checkout.c #, 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:1630 +#: builtin/checkout.c msgid "missing branch or commit argument" msgstr "manca branca o argument de comissió" -#: builtin/checkout.c:1675 +#: builtin/checkout.c #, c-format msgid "unknown conflict style '%s'" msgstr "estil de conflicte desconegut «%s»" -#: builtin/checkout.c:1692 +#: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1693 builtin/log.c:2108 parse-options.h:542 +#: builtin/checkout.c builtin/log.c parse-options.h msgid "style" msgstr "estil" -#: builtin/checkout.c:1694 +#: builtin/checkout.c msgid "conflict style (merge, diff3, or zdiff3)" msgstr "estil de conflicte (merge, diff3, o zdiff3)" -#: builtin/checkout.c:1707 builtin/worktree.c:786 +#: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1712 +#: builtin/checkout.c msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1714 +#: builtin/checkout.c msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1714 +#: builtin/checkout.c msgid "new unborn branch" msgstr "branca no nascuda nova" -#: builtin/checkout.c:1716 builtin/merge.c:292 +#: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1719 +#: builtin/checkout.c msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si un altre arbre de treball té la referència donada" -#: builtin/checkout.c:1732 +#: builtin/checkout.c msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1735 +#: builtin/checkout.c msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1739 +#: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1798 +#: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "les opcions «-%c», «-%c», i «%s» no es poden usar juntes" -#: builtin/checkout.c:1839 +#: builtin/checkout.c msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1844 +#: builtin/checkout.c #, c-format msgid "missing branch name; try -%c" msgstr "falta el nom de la branca; proveu -%c" -#: builtin/checkout.c:1876 +#: builtin/checkout.c #, c-format msgid "could not resolve %s" msgstr "no es pot resoldre %s" -#: builtin/checkout.c:1892 +#: builtin/checkout.c msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1899 +#: builtin/checkout.c #, 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:1903 +#: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un argument de camí «%s»" -#: builtin/checkout.c:1928 +#: builtin/checkout.c msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5056,75 +4968,72 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/checkout.c:1933 +#: builtin/checkout.c msgid "you must specify path(s) to restore" msgstr "heu d'especificar el camí o camins a restaurar" -#: builtin/checkout.c:1968 builtin/checkout.c:1970 builtin/checkout.c:2018 -#: builtin/checkout.c:2020 builtin/clone.c:142 builtin/remote.c:176 -#: builtin/remote.c:178 builtin/replay.c:306 builtin/submodule--helper.c:3074 -#: builtin/submodule--helper.c:3427 builtin/worktree.c:781 -#: builtin/worktree.c:783 +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c +#: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "branca" -#: builtin/checkout.c:1969 +#: builtin/checkout.c msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1971 +#: builtin/checkout.c msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1972 +#: builtin/checkout.c msgid "create reflog for new branch" msgstr "crea un registre de referències per a la branca nova" -#: builtin/checkout.c:1974 +#: builtin/checkout.c msgid "second guess 'git checkout ' (default)" msgstr "segona deducció «git checkout » (per defecte)" -#: builtin/checkout.c:1975 +#: builtin/checkout.c msgid "use overlay mode (default)" msgstr "utilitza el mode de superposició (per defecte)" -#: builtin/checkout.c:2019 +#: builtin/checkout.c msgid "create and switch to a new branch" msgstr "crea i canvia a una branca nova" -#: builtin/checkout.c:2021 +#: builtin/checkout.c msgid "create/reset and switch to a branch" msgstr "crea/restableix i canvia a una branca" -#: builtin/checkout.c:2023 +#: builtin/checkout.c msgid "second guess 'git switch '" msgstr "segona deducció «git switch »" -#: builtin/checkout.c:2025 +#: builtin/checkout.c msgid "throw away local modifications" msgstr "descarta les modificacions locals" -#: builtin/checkout.c:2058 +#: builtin/checkout.c msgid "which tree-ish to checkout from" msgstr "des de quin arbre agafar" -#: builtin/checkout.c:2060 +#: builtin/checkout.c msgid "restore the index" msgstr "restaura l'índex" -#: builtin/checkout.c:2062 +#: builtin/checkout.c msgid "restore the working tree (default)" msgstr "restaura l'arbre de treball (per defecte)" -#: builtin/checkout.c:2064 +#: builtin/checkout.c msgid "ignore unmerged entries" msgstr "ignora les entrades sense fusionar" -#: builtin/checkout.c:2065 +#: builtin/checkout.c msgid "use overlay mode" msgstr "utilitza el mode de superposició" -#: builtin/clean.c:32 +#: builtin/clean.c msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" @@ -5132,45 +5041,45 @@ msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" -#: builtin/clean.c:36 +#: builtin/clean.c #, c-format msgid "Removing %s\n" msgstr "S'està eliminant %s\n" -#: builtin/clean.c:37 +#: builtin/clean.c #, c-format msgid "Would remove %s\n" msgstr "Eliminaria %s\n" -#: builtin/clean.c:38 +#: builtin/clean.c #, c-format msgid "Skipping repository %s\n" msgstr "S'està ometent el repositori %s\n" -#: builtin/clean.c:39 +#: builtin/clean.c #, c-format msgid "Would skip repository %s\n" msgstr "Ometria el repositori %s\n" -#: builtin/clean.c:40 midx.c:750 +#: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" msgstr "s'ha produït un error en eliminar %s" -#: builtin/clean.c:41 +#: builtin/clean.c #, c-format msgid "could not lstat %s\n" msgstr "no s'ha pogut fer lstat %s\n" -#: builtin/clean.c:42 +#: builtin/clean.c msgid "Refusing to remove current working directory\n" msgstr "S'ha rebutjat suprimir el directori de treball actual\n" -#: builtin/clean.c:43 +#: builtin/clean.c msgid "Would refuse to remove current working directory\n" msgstr "Es rebutjarà eliminar el directori de treball actual\n" -#: builtin/clean.c:332 +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -5183,7 +5092,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:336 +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -5204,32 +5113,32 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:551 +#: builtin/clean.c #, c-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:691 +#: builtin/clean.c #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:725 +#: builtin/clean.c #, 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:746 +#: builtin/clean.c msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:787 +#: builtin/clean.c #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:818 +#: builtin/clean.c msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5247,297 +5156,286 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció manual" -#: builtin/clean.c:854 +#: builtin/clean.c 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:870 +#: builtin/clean.c msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:935 +#: builtin/clean.c msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:937 +#: builtin/clean.c msgid "force" msgstr "força" -#: builtin/clean.c:938 +#: builtin/clean.c msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:940 +#: builtin/clean.c msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:941 builtin/config.c:876 builtin/config.c:929 -#: builtin/config.c:985 builtin/describe.c:594 builtin/describe.c:596 -#: builtin/grep.c:997 builtin/log.c:275 builtin/log.c:277 -#: builtin/ls-files.c:610 builtin/name-rev.c:573 builtin/name-rev.c:575 -#: builtin/pack-refs.c:35 builtin/pack-refs.c:37 builtin/show-ref.c:321 -#: ref-filter.h:138 +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c +#: builtin/show-ref.c ref-filter.h msgid "pattern" msgstr "patró" -#: builtin/clean.c:942 +#: builtin/clean.c msgid "add to ignore rules" msgstr "afegiu per a ignorar les regles" -#: builtin/clean.c:943 +#: builtin/clean.c msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:945 +#: builtin/clean.c msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:955 +#: builtin/clean.c msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "" "clean.requireForce està establert a cert i no s'ha indicat -f : es rebutja " "netejar" -#: builtin/clone.c:57 +#: builtin/clone.c msgid "git clone [] [--] []" msgstr "git clone [] [--] []" -#: builtin/clone.c:112 +#: builtin/clone.c msgid "don't clone shallow repository" msgstr "no clonis un repositori superficial" -#: builtin/clone.c:114 +#: builtin/clone.c msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/init-db.c:93 +#: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "crea un repositori nu" -#: builtin/clone.c:119 +#: builtin/clone.c msgid "create a mirror repository (implies --bare)" msgstr "crear un repositori mirall (implica --bare)" -#: builtin/clone.c:121 +#: builtin/clone.c msgid "to clone from a local repository" msgstr "per a clonar des d'un repositori local" -#: builtin/clone.c:123 +#: builtin/clone.c msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:125 +#: builtin/clone.c msgid "setup as shared repository" msgstr "configura com a repositori compartit" -#: builtin/clone.c:127 +#: builtin/clone.c msgid "pathspec" msgstr "especificació de camí" -#: builtin/clone.c:127 +#: builtin/clone.c msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:131 +#: builtin/clone.c msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:132 builtin/init-db.c:90 +#: builtin/clone.c builtin/init-db.c msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:133 builtin/init-db.c:91 +#: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:135 builtin/clone.c:137 builtin/submodule--helper.c:1869 -#: builtin/submodule--helper.c:2805 builtin/submodule--helper.c:3434 +#: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "repositori de referència" -#: builtin/clone.c:139 builtin/submodule--helper.c:1873 -#: builtin/submodule--helper.c:2809 +#: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:140 builtin/column.c:32 builtin/fmt-merge-msg.c:32 -#: builtin/init-db.c:101 builtin/merge-file.c:86 builtin/merge.c:277 -#: builtin/pack-objects.c:4406 builtin/repack.c:1232 -#: builtin/submodule--helper.c:3438 t/helper/test-simple-ipc.c:596 -#: t/helper/test-simple-ipc.c:598 +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c +#: builtin/submodule--helper.c t/helper/test-simple-ipc.c msgid "name" msgstr "nom" -#: builtin/clone.c:141 +#: builtin/clone.c msgid "use instead of 'origin' to track upstream" msgstr "usa en lloc d'«origin» per a seguir la font" -#: builtin/clone.c:143 +#: builtin/clone.c msgid "checkout instead of the remote's HEAD" msgstr "agafa en lloc de la HEAD del remot" -#: builtin/clone.c:145 +#: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:146 builtin/fetch.c:2213 builtin/pull.c:215 +#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "depth" msgstr "profunditat" -#: builtin/clone.c:147 +#: builtin/clone.c msgid "create a shallow clone of that depth" msgstr "crea un clon superficial d'aquesta profunditat" -#: builtin/clone.c:149 +#: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una data específica" -#: builtin/clone.c:150 builtin/fetch.c:2217 builtin/fetch.c:2240 -#: builtin/pull.c:221 builtin/pull.c:246 builtin/rebase.c:1110 -#: builtin/replay.c:309 +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "revisió" -#: builtin/clone.c:151 builtin/fetch.c:2218 builtin/pull.c:222 +#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:153 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2823 +#: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:155 +#: builtin/clone.c 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 les segueixin" -#: builtin/clone.c:157 +#: builtin/clone.c msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:158 builtin/init-db.c:99 +#: builtin/clone.c builtin/init-db.c msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:159 builtin/init-db.c:100 +#: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:161 builtin/init-db.c:106 builtin/submodule--helper.c:1871 -#: builtin/submodule--helper.c:2807 builtin/submodule--helper.c:3436 +#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "especifiqueu el format de referència a usar" -#: builtin/clone.c:162 +#: builtin/clone.c msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:163 +#: builtin/clone.c msgid "set config inside the new repository" msgstr "estableix la configuració dins del repositori nou" -#: builtin/clone.c:165 builtin/fetch.c:2238 builtin/ls-remote.c:87 -#: builtin/pull.c:237 builtin/push.c:600 builtin/send-pack.c:199 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "server-specific" msgstr "específic al servidor" -#: builtin/clone.c:165 builtin/fetch.c:2238 builtin/ls-remote.c:87 -#: builtin/pull.c:238 builtin/push.c:600 builtin/send-pack.c:200 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/clone.c:169 +#: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "aplica els filtres de clonatge parcial als submòduls" -#: builtin/clone.c:171 +#: builtin/clone.c msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot" -#: builtin/clone.c:173 +#: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" msgstr "" "inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a " "l'arrel" -#: builtin/clone.c:175 +#: builtin/clone.c msgid "uri" msgstr "uri" -#: builtin/clone.c:175 +#: builtin/clone.c msgid "a URI for downloading bundles before fetching from origin remote" msgstr "un URI per a baixar paquets abans d'obtenir des del remot origen" -#: builtin/clone.c:250 +#: builtin/clone.c #, 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:321 builtin/diff.c:93 builtin/rm.c:143 grep.c:1941 -#: setup.c:202 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" -#: builtin/clone.c:323 +#: builtin/clone.c #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:357 +#: builtin/clone.c #, c-format msgid "'%s' is a symlink, refusing to clone with --local" msgstr "«%s» és un enllaç simbòlic, es rebutja clonar amb --local" -#: builtin/clone.c:361 +#: builtin/clone.c #, c-format msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut iniciar l'iterador sobre «%s»" -#: builtin/clone.c:376 +#: builtin/clone.c #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "l'enllaç simbòlic «%s» existeix, es rebutja a clonar amb --local" -#: builtin/clone.c:391 compat/precompose_utf8.c:63 +#: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar «%s»" -#: builtin/clone.c:403 +#: builtin/clone.c #, c-format msgid "hardlink cannot be checked at '%s'" msgstr "no es pot comprovar l'enllaç físic en «%s»" -#: builtin/clone.c:410 +#: builtin/clone.c #, c-format msgid "hardlink different from source at '%s'" msgstr "l'enllaç físic és diferent de la font en «%s»" -#: builtin/clone.c:415 +#: builtin/clone.c #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç «%s»" -#: builtin/clone.c:419 +#: builtin/clone.c #, 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:424 refs/files-backend.c:3577 +#: builtin/clone.c refs/files-backend.c #, c-format msgid "failed to iterate over '%s'" msgstr "no s'ha pogut iterar sobre «%s»" -#: builtin/clone.c:449 +#: builtin/clone.c #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:463 +#: builtin/clone.c msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5547,108 +5445,106 @@ msgstr "" "Podeu inspeccionar el que s'ha agafat amb «git status»\n" "i tornar-ho a provar amb «git restore --source=HEAD :/»\n" -#: builtin/clone.c:544 +#: builtin/clone.c #, 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:649 fetch-pack.c:2101 +#: builtin/clone.c fetch-pack.c msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:665 +#: builtin/clone.c #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:726 +#: builtin/clone.c msgid "failed to initialize sparse-checkout" msgstr "no s'ha pogut inicialitzar «sparse-checkout»" -#: builtin/clone.c:750 +#: builtin/clone.c msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" "el HEAD remot es refereix a una referència que no existeix, no s'ha pogut " "agafar" -#: builtin/clone.c:786 +#: builtin/clone.c msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:880 +#: builtin/clone.c msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:947 +#: builtin/clone.c msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:949 +#: builtin/clone.c msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:1001 +#: builtin/clone.c msgid "Too many arguments." msgstr "Hi ha massa arguments." -#: builtin/clone.c:1005 scalar.c:459 +#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "Heu d'especificar un repositori per a clonar." -#: builtin/clone.c:1016 builtin/init-db.c:173 builtin/refs.c:44 -#: builtin/submodule--helper.c:1900 builtin/submodule--helper.c:2854 -#: builtin/submodule--helper.c:3466 setup.c:2458 setup.c:2514 +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c +#: setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "el format d'emmagatzematge de referència «%s» és desconegut" -#: builtin/clone.c:1043 +#: builtin/clone.c #, c-format msgid "repository '%s' does not exist" msgstr "el repositori «%s» no existeix" -#: builtin/clone.c:1047 builtin/fetch.c:2350 +#: builtin/clone.c builtin/fetch.c #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és un nombre positiu" -#: builtin/clone.c:1057 +#: builtin/clone.c #, 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:1063 +#: builtin/clone.c #, c-format msgid "repository 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:1077 +#: builtin/clone.c #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:1092 builtin/clone.c:1113 builtin/difftool.c:269 -#: builtin/log.c:2313 builtin/worktree.c:455 builtin/worktree.c:487 +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:1097 +#: builtin/clone.c #, 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:1117 +#: builtin/clone.c #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al repositori nu «%s»...\n" -#: builtin/clone.c:1119 +#: builtin/clone.c #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1148 +#: builtin/clone.c msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -5656,115 +5552,115 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1277 builtin/remote.c:206 builtin/remote.c:752 +#: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» no és un nom de remot vàlid" -#: builtin/clone.c:1311 +#: builtin/clone.c 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:1313 +#: builtin/clone.c 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:1315 +#: builtin/clone.c 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:1317 +#: builtin/clone.c 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:1320 fetch-pack.c:1219 fetch-pack.c:1572 +#: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "el repositori font és superficial, es rebutja clonar-ho." -#: builtin/clone.c:1322 +#: builtin/clone.c msgid "source repository is shallow, ignoring --local" msgstr "el repositori font és superficial, s'està ignorant --local" -#: builtin/clone.c:1327 +#: builtin/clone.c msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1343 +#: builtin/clone.c msgid "cannot clone from filtered bundle" msgstr "no es pot clonar des del farell filtrat" -#: builtin/clone.c:1410 builtin/clone.c:1427 +#: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "no s'ha pogut inicialitzar el repositori, s'omet l'URI del paquet" -#: builtin/clone.c:1412 +#: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "no s'han pogut obtenir els objectes de l'URI del paquet «%s»" -#: builtin/clone.c:1430 +#: builtin/clone.c msgid "failed to fetch advertised bundles" msgstr "no s'han pogut obtenir els paquets anunciats" -#: builtin/clone.c:1459 builtin/clone.c:1519 +#: builtin/clone.c msgid "remote transport reported error" msgstr "el transport remot ha informat d'un error" -#: builtin/clone.c:1469 +#: builtin/clone.c #, 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:1480 +#: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un repositori buit." -#: builtin/column.c:11 +#: builtin/column.c msgid "git column []" msgstr "git column []" -#: builtin/column.c:32 +#: builtin/column.c msgid "lookup config vars" msgstr "cerca les variables de configuració" -#: builtin/column.c:33 builtin/column.c:34 +#: builtin/column.c msgid "layout to use" msgstr "disposició a usar" -#: builtin/column.c:35 +#: builtin/column.c msgid "maximum width" msgstr "amplada màxima" -#: builtin/column.c:36 +#: builtin/column.c msgid "padding space on left border" msgstr "espai de farciment al marge esquerre" -#: builtin/column.c:37 +#: builtin/column.c msgid "padding space on right border" msgstr "espai de farciment al marge dret" -#: builtin/column.c:38 +#: builtin/column.c msgid "padding space between columns" msgstr "espai de farciment entre columnes" -#: builtin/column.c:53 +#: builtin/column.c #, c-format msgid "%s must be non-negative" msgstr "%s ha de ser no negatiu" -#: builtin/column.c:58 +#: builtin/column.c msgid "--command must be the first argument" msgstr "--command ha de ser el primer argument" -#: builtin/commit-graph.c:17 +#: builtin/commit-graph.c msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:20 +#: builtin/commit-graph.c msgid "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " @@ -5780,104 +5676,103 @@ msgstr "" "[no-]progress]\n" " " -#: builtin/commit-graph.c:55 builtin/fetch.c:2227 builtin/log.c:2077 -#: builtin/repack.c:1238 builtin/repack.c:1240 +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "directori" -#: builtin/commit-graph.c:56 +#: builtin/commit-graph.c msgid "the object directory to store the graph" msgstr "el directori d'objectes a emmagatzemar al graf" -#: builtin/commit-graph.c:80 +#: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" msgstr "" "si el graf de comissions està dividit només, verifica el fitxer de consell" -#: builtin/commit-graph.c:109 +#: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" msgstr "No s'ha pogut obrir el graf de comissions «%s»" -#: builtin/commit-graph.c:113 +#: builtin/commit-graph.c #, c-format msgid "could not open commit-graph chain '%s'" msgstr "no s'ha pogut obrir la cadena «%s» del graf de comissions" -#: builtin/commit-graph.c:160 +#: builtin/commit-graph.c #, c-format msgid "unrecognized --split argument, %s" msgstr "argument --split no reconegut, %s" -#: builtin/commit-graph.c:173 +#: builtin/commit-graph.c #, c-format msgid "unexpected non-hex object ID: %s" msgstr "ID de l'objecte no hexadecimal inesperat: %s" -#: builtin/commit-graph.c:178 +#: builtin/commit-graph.c #, c-format msgid "invalid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/commit-graph.c:198 parse-options-cb.c:27 parse-options-cb.c:31 +#: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "l'opció «%s» espera un valor numèric" -#: builtin/commit-graph.c:229 +#: builtin/commit-graph.c msgid "start walk at all refs" msgstr "comença el recorregut en totes les referències" -#: builtin/commit-graph.c:231 +#: builtin/commit-graph.c msgid "scan pack-indexes listed by stdin for commits" msgstr "explora els índexs del paquet llistats per a stdin per a comissions" -#: builtin/commit-graph.c:233 +#: builtin/commit-graph.c msgid "start walk at commits listed by stdin" msgstr "comença el recorregut per les comissions llistades per stdin" -#: builtin/commit-graph.c:235 +#: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" msgstr "inclou ja totes les comissions al fitxer del graf de comissions" -#: builtin/commit-graph.c:237 +#: builtin/commit-graph.c msgid "enable computation for changed paths" msgstr "habilita la computació per als camins canviats" -#: builtin/commit-graph.c:239 +#: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" msgstr "permet escriure un fitxer de graf de comissions incrementals" -#: builtin/commit-graph.c:243 +#: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "nombre màxim de comissions en un graf de comissions separades sense base" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit" -#: builtin/commit-graph.c:247 +#: builtin/commit-graph.c msgid "only expire files older than a given date-time" msgstr "fes caducar només els objectes més antics que l'hora i data donades" -#: builtin/commit-graph.c:249 +#: builtin/commit-graph.c msgid "maximum number of changed-path Bloom filters to compute" msgstr "nombre màxim de canvis de camí en filtres de Bloom a calcular" -#: builtin/commit-graph.c:275 +#: builtin/commit-graph.c msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "usa com a màxim un entre --reachable, --stdin-commits, o --stdin-packs" -#: builtin/commit-graph.c:306 +#: builtin/commit-graph.c msgid "Collecting commits from input" msgstr "S'estan recollint les comissions de l'entrada" -#: builtin/commit-tree.c:18 +#: builtin/commit-tree.c msgid "git commit-tree [(-p )...]" msgstr "git commit-tree [(-p )...]" -#: builtin/commit-tree.c:19 +#: builtin/commit-tree.c msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " @@ -5885,62 +5780,61 @@ msgstr "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " -#: builtin/commit-tree.c:32 +#: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" msgstr "s'han ignorat el pare %s duplicat" -#: builtin/commit-tree.c:49 builtin/commit-tree.c:131 builtin/log.c:691 +#: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "no és un nom d'objecte vàlid %s" -#: builtin/commit-tree.c:87 +#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree: ha fallat en llegir «%s»" -#: builtin/commit-tree.c:89 +#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree: ha fallat en tancar «%s»" -#: builtin/commit-tree.c:105 +#: builtin/commit-tree.c msgid "parent" msgstr "pare" -#: builtin/commit-tree.c:106 +#: builtin/commit-tree.c msgid "id of a parent commit object" msgstr "id d'un objecte de comissió pare" -#: builtin/commit-tree.c:108 builtin/commit.c:1662 builtin/merge.c:271 -#: builtin/notes.c:483 builtin/notes.c:658 builtin/stash.c:1776 -#: builtin/tag.c:499 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c msgid "message" msgstr "missatge" -#: builtin/commit-tree.c:109 builtin/commit.c:1662 +#: builtin/commit-tree.c builtin/commit.c msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit-tree.c:112 +#: builtin/commit-tree.c msgid "read commit log message from file" msgstr "llegeix el missatge de registre de comissió des d'un fitxer" -#: builtin/commit-tree.c:115 builtin/commit.c:1679 builtin/merge.c:290 -#: builtin/pull.c:183 builtin/revert.c:132 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "GPG sign commit" msgstr "signa la comissió amb GPG" -#: builtin/commit-tree.c:128 +#: builtin/commit-tree.c msgid "must give exactly one tree" msgstr "ha de donar exactament un arbre" -#: builtin/commit-tree.c:135 +#: builtin/commit-tree.c msgid "git commit-tree: failed to read" msgstr "git commit-tree: ha fallat en llegir" -#: builtin/commit.c:44 +#: builtin/commit.c msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" @@ -5962,11 +5856,11 @@ msgstr "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" -#: builtin/commit.c:56 +#: builtin/commit.c msgid "git status [] [--] [...]" msgstr "git status [] [--] [...]" -#: builtin/commit.c:61 +#: builtin/commit.c 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" @@ -5976,7 +5870,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:66 +#: builtin/commit.c msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -5991,15 +5885,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:73 +#: builtin/commit.c msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Altrament, si us plau useu «git rebase --skip»\n" -#: builtin/commit.c:76 +#: builtin/commit.c msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Altrament, si us plau useu «git cherry-pick --skip»\n" -#: builtin/commit.c:79 +#: builtin/commit.c msgid "" "and then use:\n" "\n" @@ -6021,74 +5915,74 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:300 read-cache.c:3944 +#: builtin/commit.c read-cache.c msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: builtin/commit.c:327 +#: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:378 +#: builtin/commit.c msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." -#: builtin/commit.c:391 +#: builtin/commit.c msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:400 +#: builtin/commit.c msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:416 +#: builtin/commit.c msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:418 +#: builtin/commit.c 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:503 +#: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:505 +#: builtin/commit.c 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:507 +#: builtin/commit.c msgid "cannot do a partial commit during a rebase." msgstr "no es pot fer una comissió parcial durant un «rebase»." -#: builtin/commit.c:515 +#: builtin/commit.c msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:534 +#: builtin/commit.c msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:632 +#: builtin/commit.c #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió «%s» li manca la capçalera d'autor" -#: builtin/commit.c:634 +#: builtin/commit.c #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió «%s» té una línia d'autor mal formada" -#: builtin/commit.c:653 +#: builtin/commit.c msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:661 ident.c:531 +#: builtin/commit.c ident.c #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: builtin/commit.c:709 +#: builtin/commit.c msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6096,49 +5990,48 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:765 builtin/commit.c:800 builtin/commit.c:1204 +#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "no s'ha pogut cercar la comissió «%s»" -#: builtin/commit.c:778 builtin/shortlog.c:460 +#: builtin/commit.c builtin/shortlog.c #, 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:780 +#: builtin/commit.c 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:784 +#: builtin/commit.c #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: builtin/commit.c:822 +#: builtin/commit.c #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "les opcions «%s» i «%s:%s» no es poden usar juntes" -#: builtin/commit.c:834 builtin/commit.c:850 +#: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:841 +#: builtin/commit.c msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:882 bundle.c:157 rerere.c:476 rerere.c:687 sequencer.c:2906 -#: sequencer.c:3692 +#: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir «%s»" -#: builtin/commit.c:901 +#: builtin/commit.c msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:914 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6147,7 +6040,7 @@ msgstr "" "Introduïu el missatge de comissió per als vostres canvis. \n" "S'ignoraran les línies que comencin amb «%s».\n" -#: builtin/commit.c:916 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6157,7 +6050,7 @@ msgstr "" "S'ignoraran les línies que comencin amb «%s». Un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:920 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6167,7 +6060,7 @@ msgstr "" "les línies que comencin amb «%s»; podeu eliminar-les vosaltres mateixos\n" "si voleu.\n" -#: builtin/commit.c:924 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6178,7 +6071,7 @@ msgstr "" "Es mantindran les línies que comencin amb «%s»; podeu eliminar-les \n" "vosaltres mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:935 +#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -6192,7 +6085,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:940 +#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -6206,143 +6099,142 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:967 +#: builtin/commit.c #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:975 +#: builtin/commit.c #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:982 +#: builtin/commit.c #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:1000 +#: builtin/commit.c msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:1039 builtin/tag.c:349 +#: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" msgstr "no s'han pogut passar els «trailers» a --trailers" -#: builtin/commit.c:1079 +#: builtin/commit.c msgid "Error building trees" msgstr "Error en construir els arbres" -#: builtin/commit.c:1093 builtin/tag.c:354 +#: builtin/commit.c builtin/tag.c #, 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:1139 +#: builtin/commit.c #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author «%s» no és «Nom » i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1153 +#: builtin/commit.c #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode d'ignorància no vàlid «%s»" -#: builtin/commit.c:1192 builtin/commit.c:1481 +#: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid «%s»" -#: builtin/commit.c:1265 +#: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." msgstr "Esteu enmig d'una fusió -- no es pot fer «reword»." -#: builtin/commit.c:1267 +#: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Esteu enmig d'un «cherry pick» -- no es pot fer «reword»." -#: builtin/commit.c:1270 +#: builtin/commit.c #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "les opcions de «reword» «%s» i camí «%s» no es poden usar juntes" -#: builtin/commit.c:1272 +#: builtin/commit.c #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "les opcions de «reword» «%s» i «%s» no es poden usar juntes" -#: builtin/commit.c:1297 +#: builtin/commit.c msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1300 +#: builtin/commit.c msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1302 +#: builtin/commit.c 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:1304 +#: builtin/commit.c msgid "You are in the middle of a rebase -- cannot amend." msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar." -#: builtin/commit.c:1324 +#: builtin/commit.c 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:1371 +#: builtin/commit.c #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "opció desconeguda: --fixup=%s:%s" -#: builtin/commit.c:1388 +#: builtin/commit.c #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "els camins «%s ...» amb -a no tenen sentit" -#: builtin/commit.c:1520 builtin/commit.c:1690 +#: builtin/commit.c msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1522 builtin/commit.c:1692 +#: builtin/commit.c msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1524 +#: builtin/commit.c msgid "show stash information" msgstr "mostra la informació de «stash»" -#: builtin/commit.c:1526 builtin/commit.c:1694 +#: builtin/commit.c msgid "compute full ahead/behind values" msgstr "calcula els valors complets endavant/darrere" -#: builtin/commit.c:1528 +#: builtin/commit.c msgid "version" msgstr "versió" -#: builtin/commit.c:1528 builtin/commit.c:1696 builtin/fetch.c:2206 -#: builtin/push.c:576 builtin/worktree.c:1046 +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "sortida llegible per una màquina" -#: builtin/commit.c:1531 builtin/commit.c:1698 +#: builtin/commit.c msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1534 builtin/commit.c:1701 +#: builtin/commit.c msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1537 builtin/commit.c:1704 +#: builtin/commit.c 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:1541 +#: builtin/commit.c msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -6350,11 +6242,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1543 parse-options.h:338 +#: builtin/commit.c parse-options.h msgid "when" msgstr "quan" -#: builtin/commit.c:1544 +#: builtin/commit.c msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6362,200 +6254,199 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1546 +#: builtin/commit.c msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1547 +#: builtin/commit.c msgid "do not detect renames" msgstr "no detectis canvis de noms" -#: builtin/commit.c:1549 +#: builtin/commit.c msgid "detect renames, optionally set similarity index" msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança" -#: builtin/commit.c:1572 +#: builtin/commit.c msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "No s'admet la combinació d'arguments d'ignorància i de fitxers no seguits" -#: builtin/commit.c:1655 +#: builtin/commit.c msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1656 +#: builtin/commit.c msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1658 +#: builtin/commit.c msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1659 builtin/merge.c:275 builtin/tag.c:501 +#: builtin/commit.c builtin/merge.c builtin/tag.c msgid "read message from file" msgstr "llegeix el missatge des d'un fitxer" -#: builtin/commit.c:1660 +#: builtin/commit.c msgid "author" msgstr "autor" -#: builtin/commit.c:1660 +#: builtin/commit.c msgid "override author for commit" msgstr "sobreescriu l'autor de la comissió" -#: builtin/commit.c:1661 builtin/gc.c:681 +#: builtin/commit.c builtin/gc.c msgid "date" msgstr "data" -#: builtin/commit.c:1661 +#: builtin/commit.c msgid "override date for commit" msgstr "sobreescriu la data de la comissió" -#: builtin/commit.c:1663 builtin/commit.c:1664 builtin/commit.c:1670 -#: parse-options.h:571 ref-filter.h:126 +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "comissió" -#: builtin/commit.c:1663 +#: builtin/commit.c msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1664 +#: builtin/commit.c msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. -#: builtin/commit.c:1669 +#: builtin/commit.c msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1669 +#: builtin/commit.c msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "usa un missatge amb format de «squash» automàtic per a fer amend/reword de " "la comissió especificada" -#: builtin/commit.c:1670 +#: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa un missatge amb format de «squash» automàtic per a fer «squash» de la " "comissió especificada" -#: builtin/commit.c:1671 +#: builtin/commit.c msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1672 builtin/interpret-trailers.c:217 builtin/tag.c:502 +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c msgid "trailer" msgstr "remolc" -#: builtin/commit.c:1672 builtin/tag.c:503 +#: builtin/commit.c builtin/tag.c msgid "add custom trailer(s)" msgstr "afegeix un «trailer» personalitzat" -#: builtin/commit.c:1673 builtin/log.c:2050 builtin/merge.c:293 -#: builtin/pull.c:149 builtin/revert.c:124 +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "afegeix un «trailer» tipus «Signed-off-by»" -#: builtin/commit.c:1674 +#: builtin/commit.c msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1675 +#: builtin/commit.c msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1677 +#: builtin/commit.c msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1682 +#: builtin/commit.c msgid "Commit contents options" msgstr "Opcions per al contingut de les comissions" -#: builtin/commit.c:1683 +#: builtin/commit.c msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1684 +#: builtin/commit.c msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1685 +#: builtin/commit.c msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1686 +#: builtin/commit.c msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1687 +#: builtin/commit.c msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1688 +#: builtin/commit.c msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/commit.c:1689 +#: builtin/commit.c msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1702 +#: builtin/commit.c msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1703 +#: builtin/commit.c msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1710 +#: builtin/commit.c msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1712 +#: builtin/commit.c msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1744 sequencer.c:1522 sequencer.c:1602 +#: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1790 +#: builtin/commit.c #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1797 +#: builtin/commit.c msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1818 +#: builtin/commit.c #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1825 +#: builtin/commit.c #, 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:1830 +#: builtin/commit.c #, 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:1841 +#: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" "S'està interrompent la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1875 +#: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" "new index file. Check that disk is not full and quota is\n" @@ -6567,12 +6458,12 @@ msgstr "" "per a recuperar-ho." # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:19 builtin/config.c:31 +#: builtin/config.c msgid "git config list [] [] [--includes]" msgstr "git config list [] [] [--includes]" # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:20 +#: builtin/config.c msgid "" "git config get [] [] [--includes] [--all] [--" "regexp] [--value=] [--fixed-value] [--default=] " @@ -6581,7 +6472,7 @@ msgstr "" "[--regexp] [--value=] [--fixed-value] [--default=] " # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:21 +#: builtin/config.c msgid "" "git config set [] [--type=] [--all] [--value=] [--" "fixed-value] " @@ -6590,7 +6481,7 @@ msgstr "" "[--fixed-value] " # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:22 builtin/config.c:46 +#: builtin/config.c msgid "" "git config unset [] [--all] [--value=] [--fixed-value] " " " @@ -6598,27 +6489,27 @@ msgstr "" "git config unset [] [--all] [--value=] [--fixed-value] " " " -#: builtin/config.c:23 builtin/config.c:51 +#: builtin/config.c msgid "git config rename-section [] " msgstr "git config rename-section [] " # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:24 builtin/config.c:56 +#: builtin/config.c msgid "git config remove-section [] " msgstr "git config remove-section [] " # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:25 builtin/config.c:61 +#: builtin/config.c msgid "git config edit []" msgstr "git config edit []" # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:26 +#: builtin/config.c msgid "git config [] --get-colorbool []" msgstr "git config [] --get-colorbool []" # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:36 +#: builtin/config.c msgid "" "git config get [] [] [--includes] [--all] [--" "regexp=] [--value=] [--fixed-value] [--default=] " @@ -6629,7 +6520,7 @@ msgstr "" "default=] " # Cal traduir els paràmetres amb <...>? -#: builtin/config.c:41 +#: builtin/config.c msgid "" "git config set [] [--type=] [--comment=] [--all] " "[--value=] [--fixed-value] " @@ -6637,159 +6528,159 @@ msgstr "" "git config set [] [--type=] [--comment=] [--" "all] [--value=] [--fixed-value] " -#: builtin/config.c:66 +#: builtin/config.c msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:67 +#: builtin/config.c msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:68 +#: builtin/config.c msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:69 +#: builtin/config.c msgid "use repository config file" msgstr "usa el fitxer de configuració del repositori" -#: builtin/config.c:70 +#: builtin/config.c msgid "use per-worktree config file" msgstr "usa un fitxer de configuració per repositori" -#: builtin/config.c:71 builtin/gc.c:1630 builtin/gc.c:1695 +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:72 +#: builtin/config.c msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:72 +#: builtin/config.c msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:89 +#: builtin/config.c msgid "Type" msgstr "Tipus" -#: builtin/config.c:90 builtin/hash-object.c:109 +#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "tipus" -#: builtin/config.c:90 +#: builtin/config.c msgid "value is given this type" msgstr "el valor és d'aquest tipus que s'ha donat" -#: builtin/config.c:91 +#: builtin/config.c msgid "value is \"true\" or \"false\"" msgstr "el valor és «true» o «false»" -#: builtin/config.c:92 +#: builtin/config.c msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:93 +#: builtin/config.c msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:94 +#: builtin/config.c msgid "value is --bool or string" msgstr "el valor és --bool o string" -#: builtin/config.c:95 +#: builtin/config.c msgid "value is a path (file or directory name)" msgstr "el valor és un camí (nom de fitxer o directori)" -#: builtin/config.c:96 +#: builtin/config.c msgid "value is an expiry date" msgstr "el valor és una data de venciment" -#: builtin/config.c:99 +#: builtin/config.c msgid "Display options" msgstr "Opcions de visualització" -#: builtin/config.c:100 +#: builtin/config.c msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:101 +#: builtin/config.c msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:102 +#: builtin/config.c 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:103 +#: builtin/config.c msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "mostra l'abast de la configuració («worktree», «local», «global», «system», " "«command»)" -#: builtin/config.c:104 +#: builtin/config.c msgid "show config keys in addition to their values" msgstr "mostra les claus de configuració a més dels seus valors" -#: builtin/config.c:169 +#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type no reconegut, %s" -#: builtin/config.c:181 +#: builtin/config.c msgid "only one type at a time" msgstr "només un tipus cada cop" -#: builtin/config.c:194 +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "nombre d'arguments erroni, ha de ser %d" -#: builtin/config.c:196 +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "nombre d'arguments erroni, ha de ser %d a %d" -#: builtin/config.c:396 +#: builtin/config.c #, c-format msgid "invalid key pattern: %s" msgstr "patró de la clau no vàlid: %s" -#: builtin/config.c:420 config.c:3280 +#: builtin/config.c config.c #, c-format msgid "invalid pattern: %s" msgstr "patró no vàlid: %s" -#: builtin/config.c:441 +#: builtin/config.c #, c-format msgid "failed to format default config value: %s" msgstr "" "s'ha produït un error en formatar el valor per defecte de la configuració: %s" -#: builtin/config.c:506 +#: builtin/config.c #, c-format msgid "cannot parse color '%s'" msgstr "no es pot analitzar el color «%s»" -#: builtin/config.c:557 +#: builtin/config.c msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:622 builtin/config.c:1076 +#: builtin/config.c msgid "not in a git directory" msgstr "no és en un directori git" -#: builtin/config.c:625 +#: builtin/config.c msgid "writing to stdin is not supported" msgstr "no s'admet escriure a stdin" -#: builtin/config.c:628 +#: builtin/config.c msgid "writing config blobs is not supported" msgstr "no s'admet l'escriptura de blobs de configuració" -#: builtin/config.c:723 +#: builtin/config.c #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6804,27 +6695,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:743 +#: builtin/config.c msgid "only one config file at a time" msgstr "només un fitxer de configuració cada cop" -#: builtin/config.c:749 +#: builtin/config.c msgid "--local can only be used inside a git repository" msgstr "--local només es pot usar dins d'un repositori git" -#: builtin/config.c:751 +#: builtin/config.c msgid "--blob can only be used inside a git repository" msgstr "--blob només es pot usar dins d'un repositori git" -#: builtin/config.c:753 +#: builtin/config.c msgid "--worktree can only be used inside a git repository" msgstr "--worktree només es pot usar dins d'un repositori git" -#: builtin/config.c:772 builtin/gc.c:1670 builtin/gc.c:1738 +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME no està establerta" -#: builtin/config.c:786 +#: builtin/config.c msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -6834,105 +6725,102 @@ msgstr "" "l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la " "secció «CONFIGURATION FILE» a «git help worktree» per a més detalls" -#: builtin/config.c:836 builtin/config.c:880 builtin/config.c:931 -#: builtin/config.c:1165 +#: builtin/config.c msgid "Other" msgstr "Altre" -#: builtin/config.c:838 builtin/config.c:882 builtin/config.c:1171 +#: builtin/config.c msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:854 builtin/config.c:1272 +#: builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "no s'ha pogut llegir el fitxer de configuració «%s»" -#: builtin/config.c:857 builtin/config.c:1275 +#: builtin/config.c msgid "error processing config file(s)" msgstr "s'ha produït un error en processar els fitxers de configuració" -#: builtin/config.c:873 +#: builtin/config.c msgid "Filter options" msgstr "Opcions de filtre" # multi-valued → multivalor? -#: builtin/config.c:874 +#: builtin/config.c msgid "return all values for multi-valued config options" msgstr "retorna tots els valors per a les opcions de configuració multivalor" -#: builtin/config.c:875 +#: builtin/config.c msgid "interpret the name as a regular expression" msgstr "interpreta el nom com una expressió regular" -#: builtin/config.c:876 builtin/config.c:929 builtin/config.c:985 +#: builtin/config.c msgid "show config with values matching the pattern" msgstr "mostra la configuració amb els valors coincidents amb el patró" -#: builtin/config.c:877 builtin/config.c:930 builtin/config.c:986 -#: builtin/config.c:1169 +#: builtin/config.c msgid "use string equality when comparing values to value pattern" msgstr "" "usa la igualtat de cadenes quan es comparen els valors amb el patró de valor" -#: builtin/config.c:878 +#: builtin/config.c msgid "URL" msgstr "URL" -#: builtin/config.c:878 +#: builtin/config.c msgid "show config matching the given URL" msgstr "mostra la configuració coincident amb l'URL indicat" -#: builtin/config.c:884 builtin/config.c:932 builtin/config.c:1167 -#: builtin/config.c:1168 +#: builtin/config.c msgid "value" msgstr "valor" -#: builtin/config.c:884 +#: builtin/config.c msgid "use default value when missing entry" msgstr "utilitza el valor per defecte quan falti una entrada" -#: builtin/config.c:894 builtin/config.c:996 builtin/config.c:1252 +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value només s'aplica amb «value-pattern»" -#: builtin/config.c:897 +#: builtin/config.c msgid "--default= cannot be used with --all or --url=" msgstr "--default= no es pot utilitzar amb --all o --url=" -#: builtin/config.c:901 +#: builtin/config.c msgid "--url= cannot be used with --all, --regexp or --value" msgstr "--url= no es pot usar amb --all, --regexp o --value" -#: builtin/config.c:927 builtin/config.c:983 +#: builtin/config.c msgid "Filter" msgstr "Filtra" # multi-valued → multivalor? -#: builtin/config.c:928 builtin/config.c:984 +#: builtin/config.c msgid "replace multi-valued config option with new value" msgstr "reemplaça l'opció de configuració multivalor amb el valor nou" -#: builtin/config.c:932 builtin/config.c:1168 +#: builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "" "cadena de comentari llegible per humans (es farà que comence per\n" "# si cal)" -#: builtin/config.c:933 +#: builtin/config.c msgid "add a new line without altering any existing values" msgstr "afegeix una línia nova sense alterar cap dels valors existents" # only applies → només funciona? -#: builtin/config.c:945 +#: builtin/config.c msgid "--fixed-value only applies with --value=" msgstr "--fixed-value només s'aplica amb --value=" -#: builtin/config.c:947 +#: builtin/config.c msgid "--append cannot be used with --value=" msgstr "no es pot utilitzar --append amb --value=" -#: builtin/config.c:966 builtin/config.c:1287 +#: builtin/config.c #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -6941,129 +6829,128 @@ 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/config.c:1034 builtin/config.c:1063 builtin/config.c:1361 -#: builtin/config.c:1373 +#: builtin/config.c #, c-format msgid "no such section: %s" msgstr "no existeix la secció: %s" -#: builtin/config.c:1078 +#: builtin/config.c msgid "editing stdin is not supported" msgstr "no hi ha compatibilitat per a l'edició a stdin" -#: builtin/config.c:1080 +#: builtin/config.c msgid "editing blobs is not supported" msgstr "no hi ha compatibilitat per l'edició de blobs" -#: builtin/config.c:1094 +#: builtin/config.c #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració %s" -#: builtin/config.c:1149 +#: builtin/config.c msgid "Action" msgstr "Acció" -#: builtin/config.c:1150 +#: builtin/config.c msgid "get value: name []" msgstr "get value: nom []" -#: builtin/config.c:1151 +#: builtin/config.c msgid "get all values: key []" msgstr "obté tots els valors: clau []" # he traduit el nom del paràmetre -#: builtin/config.c:1152 +#: builtin/config.c msgid "get values for regexp: name-regex []" msgstr "" "obté els valors per a l'expressió regular: expressio-regular-nom []" -#: builtin/config.c:1153 +#: builtin/config.c msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" # he traduït els noms dels paràmetres -#: builtin/config.c:1154 +#: builtin/config.c msgid "replace all matching variables: name value []" msgstr "" "reemplaça totes les variables que coincideixin: nom valor []" -#: builtin/config.c:1155 +#: builtin/config.c msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" # cal traduir name? -#: builtin/config.c:1156 +#: builtin/config.c msgid "remove a variable: name []" msgstr "elimina una variable: nom []" -#: builtin/config.c:1157 +#: builtin/config.c msgid "remove all matches: name []" msgstr "elimina totes les coincidències: nom []" -#: builtin/config.c:1158 +#: builtin/config.c msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:1159 +#: builtin/config.c msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:1160 +#: builtin/config.c msgid "list all" msgstr "llista'ls tots" -#: builtin/config.c:1161 +#: builtin/config.c msgid "open an editor" msgstr "obre un editor" # slot → ??? ; → ??? -#: builtin/config.c:1162 +#: builtin/config.c msgid "find the color configured: slot []" msgstr "troba el color configurat: slot []" -#: builtin/config.c:1163 +#: builtin/config.c msgid "find the color setting: slot []" msgstr "troba la configuració de color: slot []" -#: builtin/config.c:1167 +#: builtin/config.c msgid "with --get, use default value when missing entry" msgstr "amb --get utilitza el valor per defecte quan falti una entrada" -#: builtin/config.c:1186 +#: builtin/config.c msgid "--get-color and variable type are incoherent" msgstr "--get-color i el tipus de variable són incoherents" -#: builtin/config.c:1196 +#: builtin/config.c msgid "no action specified" msgstr "no s'ha especificat cap acció" -#: builtin/config.c:1201 +#: builtin/config.c msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only només és aplicable a --list o --get-regexp" -#: builtin/config.c:1207 +#: builtin/config.c msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list" -#: builtin/config.c:1213 +#: builtin/config.c msgid "--default is only applicable to --get" msgstr "--default només és aplicable a --get" # add/set/replace sense traduir, entenc -#: builtin/config.c:1219 +#: builtin/config.c msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment només es pot aplicar a operacions add/set/replace" -#: builtin/count-objects.c:105 +#: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/credential-cache--daemon.c:254 +#: builtin/credential-cache--daemon.c #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -7077,84 +6964,83 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:306 +#: builtin/credential-cache--daemon.c msgid "print debugging messages to stderr" msgstr "imprimeix els missatges de depuració a stderr" -#: builtin/credential-cache--daemon.c:316 -#: builtin/credential-cache--daemon.c:351 +#: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" "credential-cache--daemon no disponible; no hi ha compatibilitat amb sòcols " "d'unix" -#: builtin/credential-cache.c:167 builtin/credential-cache.c:203 +#: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "" "credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix" -#: builtin/credential-store.c:71 +#: builtin/credential-store.c #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "" "no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d ms" -#: builtin/describe.c:31 +#: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" -#: builtin/describe.c:32 +#: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" -#: builtin/describe.c:33 +#: builtin/describe.c msgid "git describe " msgstr "git describe " -#: builtin/describe.c:73 +#: builtin/describe.c msgid "head" msgstr "davant per" -#: builtin/describe.c:73 +#: builtin/describe.c msgid "lightweight" msgstr "lleuger" -#: builtin/describe.c:73 +#: builtin/describe.c msgid "annotated" msgstr "anotat" -#: builtin/describe.c:288 +#: builtin/describe.c #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:292 +#: builtin/describe.c #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "l'etiqueta «%s» es coneix externament com a «%s»" -#: builtin/describe.c:340 +#: builtin/describe.c #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb «%s»" -#: builtin/describe.c:342 +#: builtin/describe.c #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "No hi ha cap coincidència exacta en la cerca de referències o etiquetes per " "a descriure\n" -#: builtin/describe.c:409 +#: builtin/describe.c #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:436 +#: builtin/describe.c #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7163,7 +7049,7 @@ msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" "No obstant això, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:440 +#: builtin/describe.c #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7172,12 +7058,12 @@ msgstr "" "Cap etiqueta pot descriure «%s».\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:470 +#: builtin/describe.c #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions recorregudes\n" -#: builtin/describe.c:473 +#: builtin/describe.c #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7186,87 +7072,87 @@ 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:543 +#: builtin/describe.c #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:546 +#: builtin/describe.c #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:554 +#: builtin/describe.c #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no és una comissió o un blob" -#: builtin/describe.c:582 +#: builtin/describe.c msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:583 +#: builtin/describe.c msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:584 +#: builtin/describe.c msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:585 +#: builtin/describe.c msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:586 +#: builtin/describe.c msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:587 +#: builtin/describe.c msgid "only follow first parent" msgstr "només segueix el primer pare" -#: builtin/describe.c:590 +#: builtin/describe.c msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:593 +#: builtin/describe.c msgid "consider most recent tags (default: 10)" msgstr "considera les etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:595 +#: builtin/describe.c msgid "only consider tags matching " msgstr "només considera les etiquetes que coincideixen amb " -#: builtin/describe.c:597 +#: builtin/describe.c msgid "do not consider tags matching " msgstr "no consideris les etiquetes que no coincideixen amb " -#: builtin/describe.c:599 builtin/name-rev.c:587 +#: builtin/describe.c builtin/name-rev.c msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:600 builtin/describe.c:603 +#: builtin/describe.c msgid "mark" msgstr "marca" -#: builtin/describe.c:601 +#: builtin/describe.c msgid "append on dirty working tree (default: \"-dirty\")" msgstr "annexa en l'arbre de treball brut (per defecte: «-dirty»)" -#: builtin/describe.c:604 +#: builtin/describe.c msgid "append on broken working tree (default: \"-broken\")" msgstr "annexa en l'arbre de treball brut (per defecte: «-broken»)" -#: builtin/describe.c:668 +#: builtin/describe.c msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:731 builtin/describe.c:733 +#: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "opció «%s» i les de comissió no es poden usar juntes" -#: builtin/diagnose.c:9 +#: builtin/diagnose.c msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" @@ -7274,85 +7160,85 @@ msgstr "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" -#: builtin/diagnose.c:29 +#: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" msgstr "especifiqueu una destinació per a l'arxiu de diagnòstic" -#: builtin/diagnose.c:31 +#: builtin/diagnose.c msgid "specify a strftime format suffix for the filename" msgstr "especifiqueu un sufix en format strftime per al nom de fitxer" -#: builtin/diagnose.c:33 +#: builtin/diagnose.c msgid "specify the content of the diagnostic archive" msgstr "especifica el contingut de l'arxiu de diagnòstic" -#: builtin/diff-tree.c:169 +#: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base només funciona amb dues comissions" -#: builtin/diff.c:95 +#: builtin/diff.c #, c-format msgid "'%s': not a regular file or symlink" msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic" -#: builtin/diff.c:220 +#: builtin/diff.c msgid "no merge given, only parents." msgstr "no s'ha donat cap fusió, només els pares." -#: builtin/diff.c:265 +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "opció no vàlida: %s" -#: builtin/diff.c:384 +#: builtin/diff.c #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: sense una base de fusió" -#: builtin/diff.c:516 +#: builtin/diff.c msgid "Not a git repository" msgstr "No és un repositori de git" -#: builtin/diff.c:562 builtin/grep.c:749 +#: builtin/diff.c builtin/grep.c #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no vàlid «%s»." -#: builtin/diff.c:578 +#: builtin/diff.c #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat més de dos blobs: «%s»" -#: builtin/diff.c:583 +#: builtin/diff.c #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat «%s»." -#: builtin/diff.c:617 +#: builtin/diff.c #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: múltiples bases de fusió, utilitzant %s" -#: builtin/difftool.c:40 +#: builtin/difftool.c msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [] [ []] [--] [...]" -#: builtin/difftool.c:300 +#: builtin/difftool.c #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/difftool.c:302 +#: builtin/difftool.c #, 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 #, 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:433 +#: builtin/difftool.c msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -7360,64 +7246,64 @@ msgstr "" "els formats de diff combinats («-c» i «--cc») no s'admeten\n" "en el mode diff de directoris («-d» i «--dir-diff»)." -#: builtin/difftool.c:639 +#: builtin/difftool.c #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: «%s» i «%s»." -#: builtin/difftool.c:641 +#: builtin/difftool.c msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:646 sequencer.c:2411 sequencer.c:3787 sequencer.c:3791 +#: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: builtin/difftool.c:652 +#: builtin/difftool.c #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a «%s»." -#: builtin/difftool.c:653 +#: builtin/difftool.c msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:658 +#: builtin/difftool.c #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:711 +#: builtin/difftool.c msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa «diff.guitool» en lloc de «diff.tool»" -#: builtin/difftool.c:713 +#: builtin/difftool.c msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:715 +#: builtin/difftool.c msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:720 +#: builtin/difftool.c msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:721 +#: builtin/difftool.c msgid "tool" msgstr "eina" -#: builtin/difftool.c:722 +#: builtin/difftool.c msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:724 +#: builtin/difftool.c msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimeix una llista de totes les eines diff que podeu usar amb «--tool»" -#: builtin/difftool.c:727 +#: builtin/difftool.c msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" @@ -7425,243 +7311,241 @@ msgstr "" "fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:730 +#: builtin/difftool.c msgid "specify a custom command for viewing diffs" msgstr "especifiqueu una ordre personalitzada per a veure diffs" -#: builtin/difftool.c:731 +#: builtin/difftool.c msgid "passed to `diff`" msgstr "passa-ho a «diff»" -#: builtin/difftool.c:747 +#: builtin/difftool.c msgid "difftool requires worktree or --no-index" msgstr "difftool requereix worktree o --no-index" -#: builtin/difftool.c:774 +#: builtin/difftool.c msgid "no given for --tool=" msgstr "no s'ha proporcionat l' per a --tool=" -#: builtin/difftool.c:781 +#: builtin/difftool.c msgid "no given for --extcmd=" msgstr "no s'ha proporcionat l' per a --extcmd=" -#: builtin/fast-export.c:31 +#: builtin/fast-export.c msgid "git fast-export []" msgstr "git fast-export []" -#: builtin/fast-export.c:864 +#: builtin/fast-export.c msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Error: no es poden exportar les etiquetes imbricades a menys que " "s'especifiqui --mark-tags." -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" msgstr "el testimoni de --anonymize-map no pot estar buit" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c msgid "show progress after objects" msgstr "mostra el progrés després de objectes" -#: builtin/fast-export.c:1201 +#: builtin/fast-export.c msgid "select handling of signed tags" msgstr "selecciona la gestió de les etiquetes signades" -#: builtin/fast-export.c:1204 +#: builtin/fast-export.c msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1207 +#: builtin/fast-export.c msgid "select handling of commit messages in an alternate encoding" msgstr "" "selecciona la gestió dels missatges de comissió en una codificació " "alternativa" -#: builtin/fast-export.c:1210 +#: builtin/fast-export.c msgid "dump marks to this file" msgstr "bolca les marques a aquest fitxer" -#: builtin/fast-export.c:1212 +#: builtin/fast-export.c msgid "import marks from this file" msgstr "importa les marques d'aquest fitxer" -#: builtin/fast-export.c:1216 +#: builtin/fast-export.c msgid "import marks from this file if it exists" msgstr "importa marques d'aquest fitxer si existeix" -#: builtin/fast-export.c:1218 +#: builtin/fast-export.c msgid "fake a tagger when tags lack one" msgstr "fingeix un etiquetador quan en falti un a les etiquetes" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c msgid "output full tree for each commit" msgstr "imprimeix l'arbre complet de per a cada comissió" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c msgid "use the done feature to terminate the stream" msgstr "usa la característica fet per a acabar el flux" -#: builtin/fast-export.c:1223 +#: builtin/fast-export.c msgid "skip output of blob data" msgstr "omet la sortida de dades de blob" -#: builtin/fast-export.c:1224 builtin/log.c:2124 +#: builtin/fast-export.c builtin/log.c msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c msgid "apply refspec to exported refs" msgstr "aplica l'especificació de referència a les referències exportades" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c msgid "from:to" msgstr "des de:a" -#: builtin/fast-export.c:1228 +#: builtin/fast-export.c msgid "convert to in anonymized output" msgstr "converteix a en una sortida anònima" -#: builtin/fast-export.c:1231 +#: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" msgstr "" "referència els pares que no estan en flux d'exportació ràpida per " "identificador d'objecte" -#: builtin/fast-export.c:1233 +#: builtin/fast-export.c msgid "show original object ids of blobs/commits" msgstr "mostra els ID dels objectes originals dels blobs i comissions" -#: builtin/fast-export.c:1235 +#: builtin/fast-export.c msgid "label tags with mark ids" msgstr "marca les etiquetes amb els identificadors de marca" -#: builtin/fast-import.c:3117 +#: builtin/fast-import.c #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Falten les marques «from» per al submòdul «%s»" -#: builtin/fast-import.c:3119 +#: builtin/fast-import.c #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Falten les marques per al submòdul «%s»" -#: builtin/fast-import.c:3247 +#: builtin/fast-import.c #, c-format msgid "Expected 'mark' command, got %s" msgstr "S'esperava l'ordre «mark», s'ha rebut %s" -#: builtin/fast-import.c:3252 +#: builtin/fast-import.c #, c-format msgid "Expected 'to' command, got %s" msgstr "S'esperava l'ordre «to», s'ha rebut «%s»" -#: builtin/fast-import.c:3348 +#: builtin/fast-import.c msgid "Expected format name:filename for submodule rewrite option" msgstr "" "S'esperava el format «nom:nom de fitxer» per a l'opció de reescriptura de " "submòdul" -#: builtin/fast-import.c:3407 +#: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" "característica «%s» prohibida a l'entrada sense --allow-unsafe-features" -#: builtin/fetch-pack.c:263 +#: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" msgstr "S'ha creat el fitxer de bloqueig però no s'ha informat: %s" -#: builtin/fetch.c:45 +#: builtin/fetch.c msgid "git fetch [] [ [...]]" msgstr "git fetch [] [ [...]]" -#: builtin/fetch.c:46 +#: builtin/fetch.c msgid "git fetch [] " msgstr "git fetch [] " -#: builtin/fetch.c:47 +#: builtin/fetch.c msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [] [( | )...]" -#: builtin/fetch.c:48 +#: builtin/fetch.c msgid "git fetch --all []" msgstr "git fetch --all []" -#: builtin/fetch.c:155 +#: builtin/fetch.c msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no pot ser negatiu" -#: builtin/fetch.c:580 +#: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "no s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:871 +#: builtin/fetch.c #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:916 +#: builtin/fetch.c #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:920 +#: builtin/fetch.c msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:933 builtin/fetch.c:951 builtin/fetch.c:1030 +#: builtin/fetch.c msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:934 +#: builtin/fetch.c msgid "can't fetch into checked-out branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:945 +#: builtin/fetch.c msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:946 builtin/fetch.c:985 builtin/fetch.c:1011 -#: builtin/fetch.c:1024 +#: builtin/fetch.c msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:952 +#: builtin/fetch.c msgid "would clobber existing tag" msgstr "s'adjuntaria l'etiqueta existent" -#: builtin/fetch.c:974 +#: builtin/fetch.c msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:977 +#: builtin/fetch.c msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:980 +#: builtin/fetch.c msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:1024 +#: builtin/fetch.c msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:1030 +#: builtin/fetch.c msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:1062 builtin/fetch.c:1450 builtin/grep.c:829 -#: sequencer.c:3464 +#: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: builtin/fetch.c:1134 +#: builtin/fetch.c msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" @@ -7673,7 +7557,7 @@ msgstr "" "utilitzeu\n" "«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»" -#: builtin/fetch.c:1138 +#: builtin/fetch.c #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -7685,18 +7569,18 @@ msgstr "" "utilitzar «--no-show-forced-updates» o executar «git config \n" "fetch.showForcedUpdates false» per a evitar aquesta comprovació.\n" -#: builtin/fetch.c:1165 +#: builtin/fetch.c #, c-format msgid "%s did not send all necessary objects" msgstr "%s no ha enviat tot els objectes necessaris" -#: builtin/fetch.c:1184 +#: builtin/fetch.c #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "" "s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials" -#: builtin/fetch.c:1282 +#: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7706,54 +7590,54 @@ msgstr "" " intenteu executar «git remote prune %s» per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:1389 +#: builtin/fetch.c #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà despenjat)" -#: builtin/fetch.c:1390 +#: builtin/fetch.c #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha quedat despenjat)" -#: builtin/fetch.c:1417 +#: builtin/fetch.c msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1418 builtin/remote.c:1215 +#: builtin/fetch.c builtin/remote.c msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1439 +#: builtin/fetch.c #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "s'ha rebutjat l'obtenció en la branca «%s» agafada a «%s»" -#: builtin/fetch.c:1459 +#: builtin/fetch.c #, 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:1462 +#: builtin/fetch.c #, c-format msgid "option \"%s\" is ignored for %s" msgstr "l'opció «%s» s'ignora per a «%s»" -#: builtin/fetch.c:1489 object-file.c:2841 +#: builtin/fetch.c object-file.c #, c-format msgid "%s is not a valid object" msgstr "%s no és un objecte vàlid" -#: builtin/fetch.c:1491 +#: builtin/fetch.c #, c-format msgid "the object %s does not exist" msgstr "l'objecte %s no existeix" -#: builtin/fetch.c:1759 +#: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream" -#: builtin/fetch.c:1771 +#: builtin/fetch.c #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -7762,20 +7646,20 @@ msgstr "" "no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no assenyala " "cap branca." -#: builtin/fetch.c:1784 +#: builtin/fetch.c msgid "not setting upstream for a remote remote-tracking branch" msgstr "" "no s'està configurant la font per a una branca remota amb seguiment remot" -#: builtin/fetch.c:1786 +#: builtin/fetch.c msgid "not setting upstream for a remote tag" msgstr "no s'està configurant la font d'una etiqueta remota" -#: builtin/fetch.c:1788 +#: builtin/fetch.c msgid "unknown branch type" msgstr "tipus de branca desconegut" -#: builtin/fetch.c:1790 +#: builtin/fetch.c msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -7783,22 +7667,22 @@ msgstr "" "no s'ha trobat cap branca d'origen.\n" "heu d'especificar exactament una branca amb l'opció --set-upstream" -#: builtin/fetch.c:1934 builtin/fetch.c:2012 +#: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1945 builtin/fetch.c:2015 +#: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "no s'ha pogut obtenir %s" -#: builtin/fetch.c:1957 +#: builtin/fetch.c #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "no s'ha pogut obtenir «%s» (codi de sortida: %d)\n" -#: builtin/fetch.c:2076 +#: builtin/fetch.c msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -7806,108 +7690,107 @@ msgstr "" "no s'ha especificat cap repositori remot. Especifiqueu un URL o\n" "un nom remot del qual s'han d'obtenir les revisions noves" -#: builtin/fetch.c:2112 +#: builtin/fetch.c msgid "you need to specify a tag name" msgstr "necessiteu especificar un nom d'etiqueta" -#: builtin/fetch.c:2177 builtin/pull.c:192 +#: builtin/fetch.c builtin/pull.c msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:2179 builtin/pull.c:252 +#: builtin/fetch.c builtin/pull.c msgid "set upstream for git pull/fetch" msgstr "estableix la font per a git pull/fetch" -#: builtin/fetch.c:2181 builtin/pull.c:195 +#: builtin/fetch.c builtin/pull.c msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure'l" -#: builtin/fetch.c:2183 +#: builtin/fetch.c msgid "use atomic transaction to update references" msgstr "usa una transacció atòmica per a actualitzar les referències" -#: builtin/fetch.c:2185 builtin/pull.c:198 +#: builtin/fetch.c builtin/pull.c msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:2186 +#: builtin/fetch.c msgid "force overwrite of local reference" msgstr "força la sobreescriptura de la referència local" -#: builtin/fetch.c:2188 +#: builtin/fetch.c msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:2190 builtin/pull.c:202 +#: builtin/fetch.c builtin/pull.c msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:2192 +#: builtin/fetch.c msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:2194 +#: builtin/fetch.c msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:2196 +#: builtin/fetch.c msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" "modifica l'especificació de referència per a col·locar totes les referències " "dins de refs/prefetch/" -#: builtin/fetch.c:2198 builtin/pull.c:205 +#: builtin/fetch.c builtin/pull.c 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:2200 +#: builtin/fetch.c msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "poda les etiquetes locals que ja no existeixen al remot i adjunta les " "etiquetes que han canviat" -#: builtin/fetch.c:2201 builtin/fetch.c:2230 builtin/pull.c:126 +#: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:2202 +#: builtin/fetch.c msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:2208 +#: builtin/fetch.c msgid "write fetched references to the FETCH_HEAD file" msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD" -#: builtin/fetch.c:2209 builtin/pull.c:213 +#: builtin/fetch.c builtin/pull.c msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:2211 +#: builtin/fetch.c msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:2214 builtin/fetch.c:2220 builtin/pull.c:216 -#: builtin/pull.c:225 +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:2216 builtin/pull.c:219 +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en una data" -#: builtin/fetch.c:2222 builtin/pull.c:228 +#: builtin/fetch.c builtin/pull.c msgid "convert to a complete repository" msgstr "converteix en un repositori complet" -#: builtin/fetch.c:2225 +#: builtin/fetch.c msgid "re-fetch without negotiating common commits" msgstr "tornar a obtenir sense negociar comissions comunes" -#: builtin/fetch.c:2228 +#: builtin/fetch.c msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:2231 +#: builtin/fetch.c msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -7915,88 +7798,88 @@ msgstr "" "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " "els fitxers de configuració)" -#: builtin/fetch.c:2235 builtin/pull.c:231 +#: builtin/fetch.c builtin/pull.c msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:2236 builtin/pull.c:233 +#: builtin/fetch.c builtin/pull.c msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:2237 builtin/pull.c:234 +#: builtin/fetch.c builtin/pull.c msgid "specify fetch refmap" msgstr "específica l'obtenció del mapa de referències" -#: builtin/fetch.c:2241 builtin/pull.c:247 +#: builtin/fetch.c builtin/pull.c msgid "report that we have only objects reachable from this object" msgstr "informa que només hi ha objectes abastables des d'aquest objecte" -#: builtin/fetch.c:2243 +#: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels " "consells de negociació" -#: builtin/fetch.c:2246 builtin/fetch.c:2248 +#: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "executa «maintenance --auto» després d'obtenir" -#: builtin/fetch.c:2250 builtin/pull.c:250 +#: builtin/fetch.c builtin/pull.c msgid "check for forced-updates on all updated branches" msgstr "" "comprova si hi ha actualitzacions forçades a totes les branques actualitzades" -#: builtin/fetch.c:2252 +#: builtin/fetch.c msgid "write the commit-graph after fetching" msgstr "escriu el graf de comissions després de recollir" -#: builtin/fetch.c:2254 +#: builtin/fetch.c msgid "accept refspecs from stdin" msgstr "llegeix les especificacions de referència des de stdin" -#: builtin/fetch.c:2330 +#: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only necessita un o més --negotiation-tip=*" -#: builtin/fetch.c:2334 +#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "no s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:2343 +#: builtin/fetch.c msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un repositori complet no té sentit" -#: builtin/fetch.c:2363 +#: builtin/fetch.c #, c-format msgid "failed to fetch bundles from '%s'" msgstr "no s'han pogut obtenir els paquets de «%s»" -#: builtin/fetch.c:2375 +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un argument de repositori" -#: builtin/fetch.c:2377 +#: builtin/fetch.c msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:2391 +#: builtin/fetch.c #, c-format msgid "no such remote or remote group: %s" msgstr "no existeix un remot ni un grup remot: %s" -#: builtin/fetch.c:2399 +#: builtin/fetch.c msgid "fetching a group and specifying refspecs does not make sense" msgstr "obtenir un grup i especificar referències no té sentit" -#: builtin/fetch.c:2417 +#: builtin/fetch.c msgid "must supply remote when using --negotiate-only" msgstr "s'ha de subministrar el remot en usar --negotiate-only" -#: builtin/fetch.c:2422 +#: builtin/fetch.c msgid "protocol does not support --negotiate-only, exiting" msgstr "el protocol no admet --negotiate-only, se surt" -#: builtin/fetch.c:2450 +#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -8004,170 +7887,170 @@ msgstr "" "--filter només es pot utilitzar amb el remot configurat en extensions." "partialclone" -#: builtin/fetch.c:2454 +#: builtin/fetch.c msgid "--atomic can only be used when fetching from one remote" msgstr "l'opció --atomic només es pot usar quan s'obté des d'un remot" -#: builtin/fetch.c:2458 +#: builtin/fetch.c msgid "--stdin can only be used when fetching from one remote" msgstr "l'opció --stdin només es pot usar quan s'obté des d'un remot" -#: builtin/fmt-merge-msg.c:9 +#: builtin/fmt-merge-msg.c msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c msgid "populate log with at most entries from shortlog" msgstr "emplena el registre amb entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:27 +#: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" msgstr "àlies per a --log (en desús)" -#: builtin/fmt-merge-msg.c:30 +#: builtin/fmt-merge-msg.c msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:31 +#: builtin/fmt-merge-msg.c msgid "use as start of message" msgstr "usa com a inici de missatge" -#: builtin/fmt-merge-msg.c:33 +#: builtin/fmt-merge-msg.c msgid "use instead of the real target branch" msgstr "usa en lloc de la branca de destí real" -#: builtin/fmt-merge-msg.c:34 +#: builtin/fmt-merge-msg.c msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:13 +#: builtin/for-each-ref.c msgid "git for-each-ref [] []" msgstr "git for-each-ref [] []" -#: builtin/for-each-ref.c:14 +#: builtin/for-each-ref.c msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at ]" -#: builtin/for-each-ref.c:15 +#: builtin/for-each-ref.c msgid "git for-each-ref [--merged []] [--no-merged []]" msgstr "git for-each-ref [--merged []] [--no-merged []]" -#: builtin/for-each-ref.c:16 +#: builtin/for-each-ref.c msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "" "git for-each-ref [--contains []] [--no-contains []]" -#: builtin/for-each-ref.c:35 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per a intèrprets " "d'ordres" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per al perl" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per al python" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" msgstr "posa els marcadors de posició entre cometes adequades per al Tcl" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c msgid "show only matched refs" msgstr "mostra només referències coincidents" -#: builtin/for-each-ref.c:48 builtin/tag.c:530 +#: builtin/for-each-ref.c builtin/tag.c msgid "respect format colors" msgstr "respecta els colors del format" -#: builtin/for-each-ref.c:52 +#: builtin/for-each-ref.c msgid "print only refs which points at the given object" msgstr "imprimeix només les referències que assenyalin l'objecte donat" -#: builtin/for-each-ref.c:54 +#: builtin/for-each-ref.c msgid "print only refs that are merged" msgstr "imprimeix només les referències que s'han fusionat" -#: builtin/for-each-ref.c:55 +#: builtin/for-each-ref.c msgid "print only refs that are not merged" msgstr "imprimeix només les referències que no s'han fusionat" -#: builtin/for-each-ref.c:56 +#: builtin/for-each-ref.c msgid "print only refs which contain the commit" msgstr "imprimeix només les referències que continguin la comissió" -#: builtin/for-each-ref.c:57 +#: builtin/for-each-ref.c msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" -#: builtin/for-each-ref.c:59 +#: builtin/for-each-ref.c msgid "read reference patterns from stdin" msgstr "llegeix els patrons de referència de l'entrada estàndard" -#: builtin/for-each-ref.c:60 +#: builtin/for-each-ref.c msgid "also include HEAD ref and pseudorefs" msgstr "inclou també la referència HEAD i les pseudoreferències" -#: builtin/for-each-ref.c:91 +#: builtin/for-each-ref.c msgid "unknown arguments supplied with --stdin" msgstr "s'han proporcionat arguments desconeguts amb --stdin" -#: builtin/for-each-repo.c:11 +#: builtin/for-each-repo.c msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config= [--] " -#: builtin/for-each-repo.c:44 +#: builtin/for-each-repo.c msgid "config" msgstr "config" -#: builtin/for-each-repo.c:45 +#: builtin/for-each-repo.c msgid "config key storing a list of repository paths" msgstr "clau de configuració emmagatzemant una llista de camins de repositori" -#: builtin/for-each-repo.c:47 +#: builtin/for-each-repo.c msgid "keep going even if command fails in a repository" msgstr "continua fins i tot si l'ordre falla en un repositori" -#: builtin/for-each-repo.c:55 +#: builtin/for-each-repo.c msgid "missing --config=" msgstr "falta --config=" -#: builtin/for-each-repo.c:59 +#: builtin/for-each-repo.c #, c-format msgid "got bad config --config=%s" msgstr "s'ha obtingut una configuració incorrecta --config=%s" -#: builtin/fsck.c:77 builtin/fsck.c:139 builtin/fsck.c:140 +#: builtin/fsck.c msgid "unknown" msgstr "desconegut" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c:86 builtin/fsck.c:111 +#: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c:105 +#: builtin/fsck.c #, c-format msgid "warning in %s %s: %s" msgstr "avís en %s %s: %s" -#: builtin/fsck.c:135 builtin/fsck.c:138 +#: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "enllaç trencat de %7s %s" -#: builtin/fsck.c:147 +#: builtin/fsck.c msgid "wrong object type in link" msgstr "tipus d'objecte incorrecte en l'enllaç" -#: builtin/fsck.c:163 +#: builtin/fsck.c #, c-format msgid "" "broken link from %7s %s\n" @@ -8176,187 +8059,186 @@ msgstr "" "enllaç trencat des de %7s %s\n" " fins a %7s %s" -#: builtin/fsck.c:200 builtin/prune.c:65 connected.c:117 +#: builtin/fsck.c builtin/prune.c connected.c msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" -#: builtin/fsck.c:277 +#: builtin/fsck.c #, c-format msgid "missing %s %s" msgstr "%s %s manca" -#: builtin/fsck.c:304 +#: builtin/fsck.c #, c-format msgid "unreachable %s %s" msgstr "%s %s inabastable" -#: builtin/fsck.c:324 +#: builtin/fsck.c #, c-format msgid "dangling %s %s" msgstr "%s %s sense assignació" -#: builtin/fsck.c:334 +#: builtin/fsck.c msgid "could not create lost-found" msgstr "no s'ha pogut crear el trobat-perdut" -#: builtin/fsck.c:341 builtin/gc.c:2092 builtin/rebase.c:226 -#: rebase-interactive.c:127 rerere.c:481 rerere.c:689 sequencer.c:4224 -#: sequencer.c:6539 +#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c +#: sequencer.c #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure «%s»" -#: builtin/fsck.c:345 +#: builtin/fsck.c #, c-format msgid "could not finish '%s'" msgstr "no s'ha pogut finalitzar «%s»" -#: builtin/fsck.c:362 +#: builtin/fsck.c #, c-format msgid "Checking %s" msgstr "S'està comprovant %s" -#: builtin/fsck.c:400 +#: builtin/fsck.c #, c-format msgid "Checking connectivity (%d objects)" msgstr "S'està comprovant la connectivitat (%d objectes)" -#: builtin/fsck.c:419 +#: builtin/fsck.c #, c-format msgid "Checking %s %s" msgstr "S'està comprovant %s %s" -#: builtin/fsck.c:424 +#: builtin/fsck.c msgid "broken links" msgstr "enllaços trencats" -#: builtin/fsck.c:433 +#: builtin/fsck.c #, c-format msgid "root %s" msgstr "arrel %s" -#: builtin/fsck.c:441 +#: builtin/fsck.c #, c-format msgid "tagged %s %s (%s) in %s" msgstr "marcat %s %s (%s) a %s" -#: builtin/fsck.c:467 +#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecte corrupte o no trobat" -#: builtin/fsck.c:492 +#: builtin/fsck.c #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: entrada de registre de referències no vàlida %s" -#: builtin/fsck.c:507 +#: builtin/fsck.c #, c-format msgid "Checking reflog %s->%s" msgstr "S'està comprovant el registre de referències %s->%s" -#: builtin/fsck.c:542 +#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: punter %s sha1 no vàlid" -#: builtin/fsck.c:549 +#: builtin/fsck.c #, c-format msgid "%s: not a commit" msgstr "%s: no és una comissió" -#: builtin/fsck.c:604 +#: builtin/fsck.c msgid "notice: No default references" msgstr "avís: no hi ha referències per defecte" -#: builtin/fsck.c:634 +#: builtin/fsck.c #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s: el resum del camí no coincideix, trobat a: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objecte corrupte o no trobat: %s" -#: builtin/fsck.c:641 +#: builtin/fsck.c #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s: l'objecte és de tipus desconegut «%s»: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no s'ha pogut analitzar l'objecte: %s" -#: builtin/fsck.c:679 +#: builtin/fsck.c #, c-format msgid "bad sha1 file: %s" msgstr "fitxer sha1 malmès: %s" -#: builtin/fsck.c:700 +#: builtin/fsck.c msgid "Checking object directory" msgstr "S'està comprovant el directori d'objecte" -#: builtin/fsck.c:703 +#: builtin/fsck.c msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:719 +#: builtin/fsck.c #, c-format msgid "Checking %s link" msgstr "S'està comprovant l'enllaç %s" -#: builtin/fsck.c:726 builtin/index-pack.c:874 +#: builtin/fsck.c builtin/index-pack.c #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/fsck.c:733 +#: builtin/fsck.c #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a una cosa estranya (%s)" -#: builtin/fsck.c:739 +#: builtin/fsck.c #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: la HEAD separada no apunta a res" -#: builtin/fsck.c:743 +#: builtin/fsck.c #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "avís: %s apunta a una branca no nascuda (%s)" -#: builtin/fsck.c:755 +#: builtin/fsck.c #, c-format msgid "Checking cache tree of %s" msgstr "S'està comprovant l'arbre de la memòria cau %s" -#: builtin/fsck.c:760 +#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "%s: punter sha1 no vàlid a l'arbre de la memòria cau %s" -#: builtin/fsck.c:769 +#: builtin/fsck.c msgid "non-tree in cache-tree" msgstr "un no arbre en l'arbre de la memòria cau" -#: builtin/fsck.c:800 +#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in resolve-undo of %s" msgstr "%s: punter sha1 no vàlid a «resolve-undo» de %s" -#: builtin/fsck.c:887 +#: builtin/fsck.c #, c-format msgid "unable to load rev-index for pack '%s'" msgstr "no s'ha pogut carregar l'índex de reversió per al paquet «%s»" -#: builtin/fsck.c:892 +#: builtin/fsck.c #, c-format msgid "invalid rev-index for pack '%s'" msgstr "rev-index no vàlid per al paquet «%s»" -#: builtin/fsck.c:903 +#: builtin/fsck.c msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" @@ -8368,205 +8250,205 @@ msgstr "" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [...]" -#: builtin/fsck.c:912 +#: builtin/fsck.c msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:913 +#: builtin/fsck.c msgid "show dangling objects" msgstr "mostra els objectes despenjats" -#: builtin/fsck.c:914 +#: builtin/fsck.c msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:915 +#: builtin/fsck.c msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:916 +#: builtin/fsck.c msgid "make index objects head nodes" msgstr "fes dels objectes d'índex nodes HEAD" -#: builtin/fsck.c:917 +#: builtin/fsck.c msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes HEAD (per defecte)" -#: builtin/fsck.c:918 +#: builtin/fsck.c msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:919 +#: builtin/fsck.c msgid "check only connectivity" msgstr "comprova només la connectivitat" -#: builtin/fsck.c:920 builtin/mktag.c:82 +#: builtin/fsck.c builtin/mktag.c msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:922 +#: builtin/fsck.c msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes despenjats a .git/lost-found" -#: builtin/fsck.c:923 builtin/prune.c:161 +#: builtin/fsck.c builtin/prune.c msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:924 +#: builtin/fsck.c msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:988 builtin/index-pack.c:270 +#: builtin/fsck.c builtin/index-pack.c msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/fsck.c:1016 +#: builtin/fsck.c #, c-format msgid "%s: object missing" msgstr "%s: falta l'objecte" -#: builtin/fsck.c:1027 +#: builtin/fsck.c #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»" -#: builtin/fsmonitor--daemon.c:22 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start []" -#: builtin/fsmonitor--daemon.c:23 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" -#: builtin/fsmonitor--daemon.c:48 builtin/fsmonitor--daemon.c:57 +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "el valor de «%s» està fora de rang: %d" -#: builtin/fsmonitor--daemon.c:67 +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' not bool or int: %d" msgstr "valor de «%s» no és booleà ni enter: %d" -#: builtin/fsmonitor--daemon.c:109 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon està veient «%s»\n" -#: builtin/fsmonitor--daemon.c:114 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon no està vigilant «%s»\n" -#: builtin/fsmonitor--daemon.c:181 +#: builtin/fsmonitor--daemon.c #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "no s'ha pogut crear la galeta fsmonitor «%s»" -#: builtin/fsmonitor--daemon.c:766 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor: cookie_result «%d» != SEEN" -#: builtin/fsmonitor--daemon.c:1215 +#: builtin/fsmonitor--daemon.c #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "no s'ha pogut iniciar el grup de fils IPC a «%s»" -#: builtin/fsmonitor--daemon.c:1225 +#: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor listener thread" msgstr "no s'ha pogut iniciar el fil receptor del fsmonitor" -#: builtin/fsmonitor--daemon.c:1236 +#: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor health thread" msgstr "no s'ha pogut iniciar el fil de salut del fsmonitor" -#: builtin/fsmonitor--daemon.c:1374 +#: builtin/fsmonitor--daemon.c msgid "could not initialize listener thread" msgstr "no s'ha pogut inicialitzar el fil receptor" -#: builtin/fsmonitor--daemon.c:1379 +#: builtin/fsmonitor--daemon.c msgid "could not initialize health thread" msgstr "no s'ha pogut inicialitzar el fil de salut" -#: builtin/fsmonitor--daemon.c:1398 +#: builtin/fsmonitor--daemon.c #, c-format msgid "could not cd home '%s'" msgstr "no s'ha pogut fer cd home «%s»" -#: builtin/fsmonitor--daemon.c:1431 builtin/fsmonitor--daemon.c:1487 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon is already running «%s»" -#: builtin/fsmonitor--daemon.c:1435 +#: builtin/fsmonitor--daemon.c #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "s'està executant fsmonitor-daemon en «%s»\n" -#: builtin/fsmonitor--daemon.c:1491 +#: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "s'està iniciant fsmonitor-daemon a «%s»\n" -#: builtin/fsmonitor--daemon.c:1517 +#: builtin/fsmonitor--daemon.c msgid "daemon failed to start" msgstr "el dimoni ha fallat en iniciar" -#: builtin/fsmonitor--daemon.c:1520 +#: builtin/fsmonitor--daemon.c msgid "daemon not online yet" msgstr "el dimoni encara no està en línia" -#: builtin/fsmonitor--daemon.c:1523 +#: builtin/fsmonitor--daemon.c msgid "daemon terminated" msgstr "s'ha finalitzat el dimoni" -#: builtin/fsmonitor--daemon.c:1537 +#: builtin/fsmonitor--daemon.c msgid "detach from console" msgstr "separat de la consola" -#: builtin/fsmonitor--daemon.c:1540 +#: builtin/fsmonitor--daemon.c msgid "use ipc worker threads" msgstr "usa fils de treball ipc" -#: builtin/fsmonitor--daemon.c:1543 +#: builtin/fsmonitor--daemon.c msgid "max seconds to wait for background daemon startup" msgstr "màxim de segons a esperar a l'inici del dimoni en segon pla" -#: builtin/fsmonitor--daemon.c:1557 +#: builtin/fsmonitor--daemon.c #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "valor «ipc-threads» no vàlid (%d)" -#: builtin/fsmonitor--daemon.c:1589 t/helper/test-cache-tree.c:67 +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "Subordre no gestionada «%s»" -#: builtin/fsmonitor--daemon.c:1602 +#: builtin/fsmonitor--daemon.c msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon no és compatible amb aquesta plataforma" -#: builtin/gc.c:47 +#: builtin/gc.c msgid "git gc []" msgstr "git gc []" -#: builtin/gc.c:89 +#: builtin/gc.c #, c-format msgid "Failed to fstat %s: %s" msgstr "S'ha produït un error en fer fstat %s: %s" -#: builtin/gc.c:118 +#: builtin/gc.c #, c-format msgid "failed to parse '%s' value '%s'" msgstr "no s'ha pogut analitzar «%s» valor «%s»" -#: builtin/gc.c:603 setup.c:2097 +#: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en «%s»" -#: builtin/gc.c:619 +#: builtin/gc.c #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8581,323 +8463,322 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:682 +#: builtin/gc.c msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:684 +#: builtin/gc.c msgid "pack unreferenced objects separately" msgstr "empaqueta els objectes no referenciats de forma separada" -#: builtin/gc.c:686 builtin/repack.c:1199 +#: builtin/gc.c builtin/repack.c msgid "with --cruft, limit the size of new cruft packs" msgstr "amb --cruft, limiteu la mida dels paquets cruft nous" -#: builtin/gc.c:687 +#: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:688 +#: builtin/gc.c msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:691 +#: builtin/gc.c msgid "perform garbage collection in the background" msgstr "fes la recollida de memòria brossa en segon pla" -#: builtin/gc.c:693 +#: builtin/gc.c 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-se" -#: builtin/gc.c:696 +#: builtin/gc.c msgid "repack all other packs except the largest pack" msgstr "reempaqueta tots els altres paquets excepte el paquet més gran" -#: builtin/gc.c:712 +#: builtin/gc.c #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "no s'ha pogut analitzar el valor %s de gc.logExpiry" -#: builtin/gc.c:727 +#: builtin/gc.c #, c-format msgid "failed to parse prune expiry value %s" msgstr "no s'ha pogut analitzar el valor de venciment de la poda %s" -#: builtin/gc.c:753 +#: builtin/gc.c #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "S'està empaquetant el repositori automàticament en el rerefons per a un " "rendiment òptim.\n" -#: builtin/gc.c:755 +#: builtin/gc.c #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "S'està empaquetant automàticament el repositori per a un rendiment òptim.\n" -#: builtin/gc.c:756 +#: builtin/gc.c #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu «git help gc» per a neteja manual.\n" -#: builtin/gc.c:806 +#: builtin/gc.c #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "gc ja s'està executant en la màquina «%s» pid % (useu --force si no)" -#: builtin/gc.c:874 +#: builtin/gc.c 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/gc.c:886 +#: builtin/gc.c msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" -#: builtin/gc.c:896 +#: builtin/gc.c msgid "--no-schedule is not allowed" msgstr "--no-schedule no està permès" -#: builtin/gc.c:901 +#: builtin/gc.c #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argument --schedule no reconegut, «%s»" -#: builtin/gc.c:1017 +#: builtin/gc.c msgid "failed to write commit-graph" msgstr "s'ha produït un error en escriure el graf de comissions" -#: builtin/gc.c:1048 +#: builtin/gc.c msgid "failed to prefetch remotes" msgstr "s'ha produït un error en preobtenir els remots" -#: builtin/gc.c:1172 +#: builtin/gc.c msgid "failed to start 'git pack-objects' process" msgstr "no s'ha pogut iniciar el procés «git pack-objects»" -#: builtin/gc.c:1189 +#: builtin/gc.c msgid "failed to finish 'git pack-objects' process" msgstr "no s'ha pogut finalitzar el procés «git pack-objects»" -#: builtin/gc.c:1241 +#: builtin/gc.c msgid "failed to write multi-pack-index" msgstr "no s'ha pogut escriure l'índex del multipaquet" -#: builtin/gc.c:1257 +#: builtin/gc.c msgid "'git multi-pack-index expire' failed" msgstr "ha fallat el venciment de «git multi-pack-index expire»" -#: builtin/gc.c:1316 +#: builtin/gc.c msgid "'git multi-pack-index repack' failed" msgstr "ha fallat l'execució de «git multi-pack-index repack»" -#: builtin/gc.c:1326 +#: builtin/gc.c msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "s'està ometent la tasca incremental-repack perquè core.multiPackIndex està " "desactivat" -#: builtin/gc.c:1432 +#: builtin/gc.c #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "el fitxer de bloqueig «%s» existeix, s'omet el manteniment" -#: builtin/gc.c:1469 +#: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "la tasca «%s» ha fallat" -#: builtin/gc.c:1550 +#: builtin/gc.c #, c-format msgid "'%s' is not a valid task" msgstr "«%s» no és una tasca vàlida" -#: builtin/gc.c:1555 +#: builtin/gc.c #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "la tasca «%s» no es pot seleccionar múltiples vegades" -#: builtin/gc.c:1571 +#: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "executa les tasques basades en l'estat del repositori" -#: builtin/gc.c:1573 +#: builtin/gc.c msgid "perform maintenance in the background" msgstr "fes el manteniment en segon pla" -#: builtin/gc.c:1574 +#: builtin/gc.c msgid "frequency" msgstr "freqüència" -#: builtin/gc.c:1575 +#: builtin/gc.c msgid "run tasks based on frequency" msgstr "executa les tasques basant-se en freqüència" -#: builtin/gc.c:1578 +#: builtin/gc.c msgid "do not report progress or other information over stderr" msgstr "no informeu sobre el progrés o altra informació a stderr" -#: builtin/gc.c:1579 +#: builtin/gc.c msgid "task" msgstr "tasca" -#: builtin/gc.c:1580 +#: builtin/gc.c msgid "run a specific task" msgstr "executa una tasca específica" -#: builtin/gc.c:1597 +#: builtin/gc.c msgid "use at most one of --auto and --schedule=" msgstr "usa com a màxim un entre --auto i --schedule=" -#: builtin/gc.c:1677 +#: builtin/gc.c #, c-format msgid "unable to add '%s' value of '%s'" msgstr "no es pot afegir el valor «%s» de «%s»" -#: builtin/gc.c:1697 +#: builtin/gc.c msgid "return success even if repository was not registered" msgstr "retorna èxit encara que el repositori no estigui registrat" -#: builtin/gc.c:1746 +#: builtin/gc.c #, c-format msgid "unable to unset '%s' value of '%s'" msgstr "no es pot desassignar el valor «%s» de «%s»" -#: builtin/gc.c:1749 +#: builtin/gc.c #, c-format msgid "repository '%s' is not registered" msgstr "el repositori «%s» no està registrat" -#: builtin/gc.c:1924 +#: builtin/gc.c #, c-format msgid "failed to expand path '%s'" msgstr "s'ha produït un error en expandir el camí «%s»" -#: builtin/gc.c:1951 builtin/gc.c:1990 +#: builtin/gc.c msgid "failed to start launchctl" msgstr "s'ha produït un error en iniciar launchctl" -#: builtin/gc.c:2070 builtin/gc.c:2536 builtin/gc.c:2609 +#: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "s'ha produït un error en crear els directoris per a «%s»" -#: builtin/gc.c:2097 +#: builtin/gc.c #, c-format msgid "failed to bootstrap service %s" msgstr "s'ha produït un error en arrencar el servei %s" -#: builtin/gc.c:2188 +#: builtin/gc.c msgid "failed to create temp xml file" msgstr "no s'han pogut crear un fitxer xml temporal" -#: builtin/gc.c:2282 +#: builtin/gc.c msgid "failed to start schtasks" msgstr "s'ha produït un error en iniciar schtasks" -#: builtin/gc.c:2376 +#: builtin/gc.c msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre " "«cron»" -#: builtin/gc.c:2385 +#: builtin/gc.c msgid "failed to create crontab temporary file" msgstr "no s'ha pogut crear un fitxer temporal crontab" -#: builtin/gc.c:2390 +#: builtin/gc.c msgid "failed to open temporary file" msgstr "no s'ha pogut obrir el fitxer temporal" -#: builtin/gc.c:2440 +#: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»" -#: builtin/gc.c:2445 +#: builtin/gc.c msgid "'crontab' died" msgstr "«crontab» ha mort" -#: builtin/gc.c:2497 builtin/gc.c:2510 builtin/gc.c:2720 builtin/worktree.c:152 -#: builtin/worktree.c:1306 +#: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "s'ha produït un error en suprimir «%s»" -#: builtin/gc.c:2579 builtin/gc.c:2641 rerere.c:494 +#: builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "no s'ha pogut buidar «%s»" -#: builtin/gc.c:2685 +#: builtin/gc.c msgid "failed to start systemctl" msgstr "s'ha produït un error en iniciar systemctl" -#: builtin/gc.c:2698 +#: builtin/gc.c msgid "failed to run systemctl" msgstr "s'ha produït un error en executar systemctl" -#: builtin/gc.c:2837 +#: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "l'argument --scheduler no reconegut «%s»" -#: builtin/gc.c:2862 +#: builtin/gc.c msgid "neither systemd timers nor crontab are available" msgstr "ni els temporitzadors de systemd ni de crontab estan disponibles" -#: builtin/gc.c:2877 +#: builtin/gc.c #, c-format msgid "%s scheduler is not available" msgstr "el planificador %s no està disponible" -#: builtin/gc.c:2891 +#: builtin/gc.c msgid "another process is scheduling background maintenance" msgstr "un altre procés està planificant un manteniment en segon pla" -#: builtin/gc.c:2913 +#: builtin/gc.c msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=]" -#: builtin/gc.c:2922 +#: builtin/gc.c msgid "scheduler" msgstr "planificador" -#: builtin/gc.c:2923 +#: builtin/gc.c msgid "scheduler to trigger git maintenance run" msgstr "planificador per a activar l'execució de manteniment del git" -#: builtin/gc.c:2938 +#: builtin/gc.c msgid "failed to set up maintenance schedule" msgstr "no s'ha pogut configurar la planificació del manteniment" -#: builtin/gc.c:2941 +#: builtin/gc.c msgid "failed to add repo to global config" msgstr "no s'ha pogut afegir un repositori a la configuració global" -#: builtin/gc.c:2963 +#: builtin/gc.c msgid "git maintenance []" msgstr "git maintenance []" -#: builtin/grep.c:36 +#: builtin/grep.c msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [] [-e] [...] [[--] ...]" -#: builtin/grep.c:245 +#: builtin/grep.c #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: s'ha produït un error en crear fil: %s" -#: builtin/grep.c:303 +#: builtin/grep.c #, 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" @@ -8907,262 +8788,261 @@ 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:311 builtin/index-pack.c:1595 builtin/index-pack.c:1804 -#: builtin/pack-objects.c:3309 +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "no s'admeten fils, s'ignorarà %s" -#: builtin/grep.c:575 +#: builtin/grep.c #, c-format msgid "unable to read tree %s" msgstr "no s'ha pogut llegir l'arbre %s" -#: builtin/grep.c:723 +#: builtin/grep.c #, 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:803 +#: builtin/grep.c #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:912 +#: builtin/grep.c 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:914 +#: builtin/grep.c msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:916 +#: builtin/grep.c msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:918 +#: builtin/grep.c msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant «.gitignore»" -#: builtin/grep.c:920 +#: builtin/grep.c msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:923 +#: builtin/grep.c msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:925 +#: builtin/grep.c msgid "case insensitive matching" msgstr "coincidència no distingeix entre majúscules i minúscules" -#: builtin/grep.c:927 +#: builtin/grep.c msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:929 +#: builtin/grep.c msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:931 +#: builtin/grep.c msgid "don't match patterns in binary files" msgstr "no cerquis els patrons en els fitxers binaris" -#: builtin/grep.c:934 +#: builtin/grep.c msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:936 +#: builtin/grep.c msgid "search in subdirectories (default)" msgstr "cerca als subdirectoris (per defecte)" -#: builtin/grep.c:938 +#: builtin/grep.c msgid "descend at most levels" msgstr "descendeix com a màxim nivells" -#: builtin/grep.c:941 +#: builtin/grep.c msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:944 +#: builtin/grep.c msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:947 +#: builtin/grep.c msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:950 +#: builtin/grep.c msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:953 +#: builtin/grep.c msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:954 +#: builtin/grep.c msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidència" -#: builtin/grep.c:955 +#: builtin/grep.c msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:956 +#: builtin/grep.c msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:958 +#: builtin/grep.c msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:960 +#: builtin/grep.c 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:962 +#: builtin/grep.c msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:965 +#: builtin/grep.c msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:967 +#: builtin/grep.c msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:970 +#: builtin/grep.c msgid "show only matching parts of a line" msgstr "mostra només les parts de coincidents de la línia" -#: builtin/grep.c:972 +#: builtin/grep.c 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:973 +#: builtin/grep.c msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:975 +#: builtin/grep.c msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:977 +#: builtin/grep.c 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:980 +#: builtin/grep.c msgid "show context lines before and after matches" msgstr "mostra línies de context abans i després d'una coincidència" -#: builtin/grep.c:983 +#: builtin/grep.c msgid "show context lines before matches" msgstr "mostra línies de context abans d'una coincidència" -#: builtin/grep.c:985 +#: builtin/grep.c msgid "show context lines after matches" msgstr "mostra línies de context després d'una coincidència" -#: builtin/grep.c:987 +#: builtin/grep.c msgid "use worker threads" msgstr "usa fils de treball" -#: builtin/grep.c:988 +#: builtin/grep.c msgid "shortcut for -C NUM" msgstr "drecera per a -C NUM" -#: builtin/grep.c:991 +#: builtin/grep.c 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:993 +#: builtin/grep.c msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:996 +#: builtin/grep.c msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:998 +#: builtin/grep.c msgid "match " msgstr "coincideix amb " -#: builtin/grep.c:1000 +#: builtin/grep.c msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:1012 +#: builtin/grep.c msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:1014 +#: builtin/grep.c 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:1017 +#: builtin/grep.c msgid "pager" msgstr "paginador" -#: builtin/grep.c:1017 +#: builtin/grep.c msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:1021 +#: builtin/grep.c msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:1024 +#: builtin/grep.c msgid "maximum number of results per file" msgstr "nombre màxim de resultats per fitxer" -#: builtin/grep.c:1094 +#: builtin/grep.c msgid "no pattern given" msgstr "no s'ha donat cap patró" -#: builtin/grep.c:1130 +#: builtin/grep.c msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1138 +#: builtin/grep.c #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1169 +#: builtin/grep.c msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no s'admet amb --recurse-submodules" -#: builtin/grep.c:1180 +#: builtin/grep.c msgid "invalid option combination, ignoring --threads" msgstr "combinació d'opcions no vàlida, s'està ignorant --threads" -#: builtin/grep.c:1183 builtin/pack-objects.c:4526 +#: builtin/grep.c builtin/pack-objects.c msgid "no threads support, ignoring --threads" msgstr "no s'admeten fils, s'ignorarà --threads" -#: builtin/grep.c:1186 builtin/index-pack.c:1592 builtin/pack-objects.c:3306 +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1220 +#: builtin/grep.c 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:1253 +#: builtin/grep.c msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits" -#: builtin/grep.c:1261 +#: builtin/grep.c msgid "both --cached and trees are given" msgstr "ambdós --cached i arbres venen donats" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." @@ -9170,117 +9050,117 @@ msgstr "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." -#: builtin/hash-object.c:96 +#: builtin/hash-object.c msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" -#: builtin/hash-object.c:109 +#: builtin/hash-object.c msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:110 +#: builtin/hash-object.c msgid "write the object into the object database" msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:112 +#: builtin/hash-object.c msgid "read the object from stdin" msgstr "llegeix l'objecte des de stdin" -#: builtin/hash-object.c:114 +#: builtin/hash-object.c msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:115 +#: builtin/hash-object.c 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:116 +#: builtin/hash-object.c msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camí" -#: builtin/help.c:64 +#: builtin/help.c msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#: builtin/help.c:67 +#: builtin/help.c msgid "show external commands in --all" msgstr "mostra les ordres externes a --all" -#: builtin/help.c:68 +#: builtin/help.c msgid "show aliases in --all" msgstr "mostra els àlies a --all" -#: builtin/help.c:69 +#: builtin/help.c msgid "exclude guides" msgstr "exclou guies" -#: builtin/help.c:70 +#: builtin/help.c msgid "show man page" msgstr "mostra la pàgina de manual" -#: builtin/help.c:71 +#: builtin/help.c msgid "show manual in web browser" msgstr "mostra la pàgina de manual en el navegador web" -#: builtin/help.c:73 +#: builtin/help.c msgid "show info page" msgstr "mostra la pàgina d'informació" -#: builtin/help.c:75 +#: builtin/help.c msgid "print command description" msgstr "imprimeix la descripció de l'ordre" -#: builtin/help.c:77 +#: builtin/help.c msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" -#: builtin/help.c:80 +#: builtin/help.c msgid "print list of user-facing repository, command and file interfaces" msgstr "" "imprimeix la llista de repositoris, ordres i interfícies de fitxers que veu " "l'usuari" -#: builtin/help.c:83 +#: builtin/help.c msgid "print list of file formats, protocols and other developer interfaces" msgstr "" "mostra la llista de formats de fitxer, protocols i altres interfícies de " "desenvolupador" -#: builtin/help.c:85 +#: builtin/help.c msgid "print all configuration variable names" msgstr "imprimeix tots els noms de les variables de configuració" -#: builtin/help.c:97 +#: builtin/help.c msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" -#: builtin/help.c:216 +#: builtin/help.c #, c-format msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut «%s»" -#: builtin/help.c:242 +#: builtin/help.c msgid "Failed to start emacsclient." msgstr "S'ha produït un error en iniciar emacsclient." -#: builtin/help.c:255 +#: builtin/help.c msgid "Failed to parse emacsclient version." msgstr "S'ha produït un error en analitzar la versió d'emacsclient." -#: builtin/help.c:263 +#: builtin/help.c #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versió d'emacsclient «%d» és massa vella (< 22)." -#: builtin/help.c:281 builtin/help.c:303 builtin/help.c:313 builtin/help.c:321 +#: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "s'ha produït un error en executar «%s»" -#: builtin/help.c:359 +#: builtin/help.c #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9289,7 +9169,7 @@ msgstr "" "«%s»: camí a un visualitzador de manuals no compatible.\n" "Considereu usar «man..cmd» en lloc d'això." -#: builtin/help.c:371 +#: builtin/help.c #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9298,51 +9178,51 @@ msgstr "" "«%s»: ordre per a un visualitzador de manuals compatible.\n" "Considereu usar «man..path» en lloc d'això." -#: builtin/help.c:490 +#: builtin/help.c #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: visualitzador de manuals desconegut." -#: builtin/help.c:506 +#: builtin/help.c msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la sol·licitud" -#: builtin/help.c:513 +#: builtin/help.c msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha gestionat la sol·licitud" -#: builtin/help.c:575 builtin/help.c:586 git.c:377 +#: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "«%s» és un àlies de «%s»" -#: builtin/help.c:589 git.c:407 +#: builtin/help.c git.c #, c-format msgid "bad alias.%s string: %s" msgstr "cadena «alias.%s» incorrecte: %s" -#: builtin/help.c:631 +#: builtin/help.c #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "l'opció «%s» no pren cap argument que no sigui una opció" -#: builtin/help.c:654 +#: builtin/help.c msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" "les opcions «--no-[external-commands|aliases]» només es poden utilitzar amb " "«--all»" -#: builtin/help.c:666 builtin/help.c:702 +#: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "ús: %s%s" -#: builtin/help.c:697 +#: builtin/help.c msgid "'git help config' for more information" msgstr "«git help config» per a més informació" -#: builtin/hook.c:10 +#: builtin/hook.c msgid "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" @@ -9350,95 +9230,95 @@ msgstr "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" -#: builtin/hook.c:30 +#: builtin/hook.c msgid "silently ignore missing requested " msgstr "ignora silenciosament la sol·licitud perduda" -#: builtin/hook.c:32 +#: builtin/hook.c msgid "file to read into hooks' stdin" msgstr "fitxer per a llegir a l'entrada estàndard dels lligams" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:253 +#: builtin/index-pack.c #, 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:303 +#: builtin/index-pack.c #, 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 poden omplir %d octets" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:333 builtin/pack-objects.c:769 +#: builtin/index-pack.c builtin/pack-objects.c 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:338 +#: builtin/index-pack.c #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "el paquet supera la mida màxima permesa (%s)" -#: builtin/index-pack.c:371 +#: builtin/index-pack.c msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:373 +#: builtin/index-pack.c #, c-format msgid "pack version % unsupported" msgstr "la versió de paquet % no és compatible" -#: builtin/index-pack.c:389 +#: builtin/index-pack.c #, c-format msgid "pack has bad object at offset %: %s" msgstr "el paquet té un objecte incorrecte a la posició %: %s" -#: builtin/index-pack.c:494 +#: builtin/index-pack.c #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c 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:552 +#: builtin/index-pack.c 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:560 +#: builtin/index-pack.c #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:591 +#: builtin/index-pack.c msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer empaquetat" -#: builtin/index-pack.c:593 +#: builtin/index-pack.c #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" @@ -9446,191 +9326,189 @@ msgstr[0] "el final del fitxer empaquetat és prematur, manca % octet" msgstr[1] "" "el final del fitxer empaquetat és prematur, manquen % octets" -#: builtin/index-pack.c:619 +#: builtin/index-pack.c msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:764 builtin/index-pack.c:770 builtin/index-pack.c:794 -#: builtin/index-pack.c:834 builtin/index-pack.c:844 +#: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informació d'objecte existent %s" -#: builtin/index-pack.c:841 +#: builtin/index-pack.c #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:858 builtin/index-pack.c:877 +#: builtin/index-pack.c msgid "fsck error in packed object" msgstr "fsck error en un objecte empaquetat" -#: builtin/index-pack.c:879 +#: builtin/index-pack.c #, 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:940 builtin/index-pack.c:987 +#: builtin/index-pack.c msgid "failed to apply delta" msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1230 +#: builtin/index-pack.c msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1265 builtin/pack-objects.c:3050 +#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c #, 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:1317 +#: builtin/index-pack.c #, 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:1321 +#: builtin/index-pack.c #, 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:1345 +#: builtin/index-pack.c #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»" -#: builtin/index-pack.c:1487 +#: builtin/index-pack.c #, c-format msgid "cannot write %s file '%s'" msgstr "no es pot escriure «%s» al fitxer «%s»" -#: builtin/index-pack.c:1495 +#: builtin/index-pack.c #, c-format msgid "cannot close written %s file '%s'" msgstr "no s'ha pogut tancar el fitxer %s escrit «%s»" -#: builtin/index-pack.c:1512 +#: builtin/index-pack.c #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "no s'ha pogut canviar el nom del fitxer temporal «*.%s» a «%s»" -#: builtin/index-pack.c:1535 +#: builtin/index-pack.c msgid "error while closing pack file" msgstr "error en tancar el fitxer empaquetat" -#: builtin/index-pack.c:1586 builtin/pack-objects.c:3317 +#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "bad pack.indexVersion=%" msgstr "bad pack.indexVersion=%" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer empaquetat existent «%s»" -#: builtin/index-pack.c:1658 +#: builtin/index-pack.c #, 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:1706 +#: builtin/index-pack.c #, 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:1713 +#: builtin/index-pack.c #, 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:1760 +#: builtin/index-pack.c msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1815 builtin/index-pack.c:1818 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "%s incorrecte" -#: builtin/index-pack.c:1848 builtin/init-db.c:167 setup.c:2448 setup.c:2497 +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "algorisme de resum desconegut «%s»" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c msgid "--stdin requires a git repository" msgstr "--stdin requereix un repositori git" -#: builtin/index-pack.c:1895 +#: builtin/index-pack.c msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/index-pack.c:1961 builtin/unpack-objects.c:679 +#: builtin/index-pack.c builtin/unpack-objects.c msgid "fsck error in pack objects" msgstr "error fsck als objectes del paquet" -#: builtin/init-db.c:59 +#: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -9644,38 +9522,38 @@ msgstr "" " [-b | --initial-branch=]\n" " [--shared[=]] []" -#: builtin/init-db.c:95 +#: builtin/init-db.c msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:96 +#: builtin/init-db.c msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositori de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:102 +#: builtin/init-db.c msgid "override the name of the initial branch" msgstr "sobreescriu el nom de la branca inicial" -#: builtin/init-db.c:103 builtin/verify-pack.c:79 +#: builtin/init-db.c builtin/verify-pack.c msgid "hash" msgstr "resum" -#: builtin/init-db.c:104 builtin/show-index.c:28 builtin/verify-pack.c:80 +#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c msgid "specify the hash algorithm to use" msgstr "especifiqueu l'algorisme de resum a usar" -#: builtin/init-db.c:144 builtin/init-db.c:149 +#: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:153 builtin/init-db.c:214 +#: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "no es pot canviar de directori a %s" -#: builtin/init-db.c:186 +#: builtin/init-db.c #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -9684,16 +9562,16 @@ msgstr "" "no es permet %s (o --work-tree=) sense especificar %s (o --git-" "dir=)" -#: builtin/init-db.c:238 +#: builtin/init-db.c #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball «%s»" -#: builtin/init-db.c:243 +#: builtin/init-db.c msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir és incompatible amb un repositori nu" -#: builtin/interpret-trailers.c:17 +#: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer (|)[(=|:)])...]\n" @@ -9703,134 +9581,134 @@ msgstr "" " [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]" -#: builtin/interpret-trailers.c:105 wrapper.c:728 +#: builtin/interpret-trailers.c wrapper.c #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c #, c-format msgid "file %s is not a regular file" msgstr "el fitxer %s no és un fitxer regular" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c #, c-format msgid "file %s is not writable by user" msgstr "el fitxer %s no és gravable per l'usuari" -#: builtin/interpret-trailers.c:121 +#: builtin/interpret-trailers.c msgid "could not open temporary file" msgstr "no s'ha pogut obrir el fitxer temporal" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»" -#: builtin/interpret-trailers.c:133 builtin/mktag.c:95 imap-send.c:1555 +#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c msgid "could not read from stdin" msgstr "no s'ha pogut llegir des de stdin" -#: builtin/interpret-trailers.c:187 +#: builtin/interpret-trailers.c #, c-format msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" -#: builtin/interpret-trailers.c:201 +#: builtin/interpret-trailers.c msgid "edit files in place" msgstr "edita els fitxers in situ" -#: builtin/interpret-trailers.c:202 +#: builtin/interpret-trailers.c msgid "trim empty trailers" msgstr "escurça els remolcs buits" -#: builtin/interpret-trailers.c:204 +#: builtin/interpret-trailers.c msgid "placement" msgstr "posicionament" -#: builtin/interpret-trailers.c:205 +#: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "on ubicar el «trailer» nou" -#: builtin/interpret-trailers.c:207 +#: builtin/interpret-trailers.c msgid "action if trailer already exists" msgstr "acció si el «trailer» ja existeix" -#: builtin/interpret-trailers.c:209 +#: builtin/interpret-trailers.c msgid "action if trailer is missing" msgstr "acció si el «trailer» falta" -#: builtin/interpret-trailers.c:211 +#: builtin/interpret-trailers.c msgid "output only the trailers" msgstr "mostra només els «trailer»" -#: builtin/interpret-trailers.c:212 +#: builtin/interpret-trailers.c msgid "do not apply trailer.* configuration variables" msgstr "no apliquis les variables de configuració trailer.*" -#: builtin/interpret-trailers.c:213 +#: builtin/interpret-trailers.c msgid "reformat multiline trailer values as single-line values" msgstr "" "reformata els valors del tràiler multilínia com a valors de línia única" -#: builtin/interpret-trailers.c:214 +#: builtin/interpret-trailers.c msgid "alias for --only-trailers --only-input --unfold" msgstr "àlies per a --only-trailers --only-input --unfold" -#: builtin/interpret-trailers.c:216 +#: builtin/interpret-trailers.c msgid "do not treat \"---\" as the end of input" msgstr "no tractis «---» com el final de l'entrada" -#: builtin/interpret-trailers.c:218 +#: builtin/interpret-trailers.c msgid "trailer(s) to add" msgstr "remolcs a afegir" -#: builtin/interpret-trailers.c:229 +#: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" msgstr "--trailer amb --only-input no té sentit" -#: builtin/interpret-trailers.c:239 +#: builtin/interpret-trailers.c 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:57 +#: builtin/log.c msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" -#: builtin/log.c:58 +#: builtin/log.c msgid "git show [] ..." msgstr "git show [] ..." -#: builtin/log.c:163 +#: builtin/log.c #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:266 diff.c:5634 +#: builtin/log.c diff.c msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: builtin/log.c:267 +#: builtin/log.c msgid "show source" msgstr "mostra la font" -#: builtin/log.c:271 +#: builtin/log.c msgid "clear all previously-defined decoration filters" msgstr "neteja tots els filtres de decoració prèviament definits" -#: builtin/log.c:275 +#: builtin/log.c msgid "only decorate refs that match " msgstr "només decora les referències que coincideixin amb " -#: builtin/log.c:277 +#: builtin/log.c msgid "do not decorate refs that match " msgstr "no decoris les referències que coincideixen amb " -#: builtin/log.c:278 +#: builtin/log.c msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:281 +#: builtin/log.c msgid "" "trace the evolution of line range , or function : in " "" @@ -9838,100 +9716,98 @@ msgstr "" "traça l'evolució del rang de línia , o funcions : " "a " -#: builtin/log.c:301 builtin/log.c:2253 builtin/replay.c:347 -#: builtin/shortlog.c:442 bundle.c:536 +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "argument no reconegut: %s" -#: builtin/log.c:304 +#: builtin/log.c msgid "-L: cannot be used with pathspec" msgstr "-L: no es pot usar amb una especificació de camí" -#: builtin/log.c:405 +#: builtin/log.c #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:700 +#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:716 builtin/log.c:821 +#: builtin/log.c #, c-format msgid "could not read object %s" msgstr "no s'ha pogut llegir l'objecte %s" -#: builtin/log.c:859 +#: builtin/log.c #, c-format msgid "unknown type: %d" msgstr "tipus desconegut: %d" -#: builtin/log.c:1047 +#: builtin/log.c #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: cobertura no vàlida des del mode descripció" -#: builtin/log.c:1077 +#: builtin/log.c msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:1238 +#: builtin/log.c #, c-format msgid "cannot open patch file %s" msgstr "no s'ha pogut obrir el fitxer de pedaç %s" -#: builtin/log.c:1255 +#: builtin/log.c msgid "need exactly one range" msgstr "necessita exactament un interval" -#: builtin/log.c:1265 +#: builtin/log.c msgid "not a range" msgstr "no és un interval" -#: builtin/log.c:1360 +#: builtin/log.c #, c-format msgid "unable to read branch description file '%s'" msgstr "no es pot llegir el fitxer de descripció de la branca «%s»" -#: builtin/log.c:1444 +#: builtin/log.c msgid "cover letter needs email format" msgstr "la carta de presentació necessita un format de correu electrònic" -#: builtin/log.c:1450 +#: builtin/log.c msgid "failed to create cover-letter file" msgstr "s'ha produït un error en crear el fitxer de carta de presentació" -#: builtin/log.c:1542 +#: builtin/log.c #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1569 +#: builtin/log.c msgid "git format-patch [] [ | ]" msgstr "git format-patch [] [ | ]" -#: builtin/log.c:1637 +#: builtin/log.c msgid "two output directories?" msgstr "dos directoris de sortida?" -#: builtin/log.c:1774 builtin/log.c:2676 builtin/log.c:2678 builtin/log.c:2690 +#: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "comissió desconeguda %s" -#: builtin/log.c:1785 builtin/replace.c:66 builtin/replace.c:221 -#: builtin/replace.c:224 +#: builtin/log.c builtin/replace.c #, 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:1797 +#: builtin/log.c msgid "could not find exact merge base" msgstr "no s'ha pogut trobar la base exacta de la fusió" -#: builtin/log.c:1807 +#: builtin/log.c 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" @@ -9942,303 +9818,302 @@ msgstr "" "branca remota. També podeu especificar la comissió base amb --base= manualment" -#: builtin/log.c:1832 +#: builtin/log.c msgid "failed to find exact merge base" msgstr "no s'ha pogut trobar la base exacta de la fusió" -#: builtin/log.c:1854 +#: builtin/log.c 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:1864 +#: builtin/log.c 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:1922 +#: builtin/log.c msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1985 +#: builtin/log.c msgid "failed to infer range-diff origin of current series" msgstr "" "no s'ha pogut inferir el rang de diferències d'origen de les sèries actuals" -#: builtin/log.c:1987 +#: builtin/log.c #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "utilitzant «%s» com a origen de rang de diferències de la sèrie actual" -#: builtin/log.c:2045 +#: builtin/log.c 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:2048 +#: builtin/log.c msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:2052 +#: builtin/log.c msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:2054 +#: builtin/log.c msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:2056 +#: builtin/log.c 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:2057 +#: builtin/log.c msgid "sfx" msgstr "sufix" -#: builtin/log.c:2058 +#: builtin/log.c msgid "use instead of '.patch'" msgstr "usa en lloc de «.patch»" -#: builtin/log.c:2060 +#: builtin/log.c msgid "start numbering patches at instead of 1" msgstr "comença numerant els pedaços a en lloc d'1" -#: builtin/log.c:2061 +#: builtin/log.c msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:2062 +#: builtin/log.c msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:2064 +#: builtin/log.c msgid "max length of output filename" msgstr "mida màxima del nom del fitxer de sortida" -#: builtin/log.c:2065 +#: builtin/log.c msgid "rfc" msgstr "rfc" -#: builtin/log.c:2066 +#: builtin/log.c msgid "add (default 'RFC') before 'PATCH'" msgstr "afig (per defecte «RFC») abans de «PATCH»" -#: builtin/log.c:2069 +#: builtin/log.c msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:2070 +#: builtin/log.c msgid "generate parts of a cover letter based on a branch's description" msgstr "" "genera parts d'una carta de presentació basant-se en la descripció d'una " "branca" -#: builtin/log.c:2072 +#: builtin/log.c msgid "use branch description from file" msgstr "utilitza la descripció de la branca des del fitxer" -#: builtin/log.c:2074 +#: builtin/log.c msgid "use [] instead of [PATCH]" msgstr "useu [] en comptes de [PATCH]" -#: builtin/log.c:2077 +#: builtin/log.c msgid "store resulting files in " msgstr "emmagatzema els fitxers resultants a " -#: builtin/log.c:2080 +#: builtin/log.c msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:2083 +#: builtin/log.c msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:2085 +#: builtin/log.c msgid "output all-zero hash in From header" msgstr "emet un resum de tots zeros en la capçalera From" -#: builtin/log.c:2087 +#: builtin/log.c 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:2089 +#: builtin/log.c 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:2091 +#: builtin/log.c msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:2092 +#: builtin/log.c msgid "header" msgstr "capçalera" -#: builtin/log.c:2093 +#: builtin/log.c msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:2094 builtin/log.c:2095 +#: builtin/log.c msgid "email" msgstr "correu electrònic" -#: builtin/log.c:2094 +#: builtin/log.c msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:2095 +#: builtin/log.c msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:2096 +#: builtin/log.c msgid "ident" msgstr "identitat" -#: builtin/log.c:2097 +#: builtin/log.c msgid "set From address to (or committer ident if absent)" msgstr "" "estableix l'adreça From a (o la identitat del comitent si manca)" -#: builtin/log.c:2099 +#: builtin/log.c msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:2100 +#: builtin/log.c msgid "make first mail a reply to " msgstr "fes que el primer missatge sigui una resposta a " -#: builtin/log.c:2101 builtin/log.c:2104 +#: builtin/log.c msgid "boundary" msgstr "límit" -#: builtin/log.c:2102 +#: builtin/log.c msgid "attach the patch" msgstr "adjunta el pedaç" -#: builtin/log.c:2105 +#: builtin/log.c msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:2109 +#: builtin/log.c msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:2111 +#: builtin/log.c msgid "signature" msgstr "signatura" -#: builtin/log.c:2112 +#: builtin/log.c msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:2113 +#: builtin/log.c msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:2114 +#: builtin/log.c msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços" -#: builtin/log.c:2117 +#: builtin/log.c msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:2118 +#: builtin/log.c msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:2120 +#: builtin/log.c msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" -#: builtin/log.c:2122 +#: builtin/log.c msgid "show changes against in cover letter or single patch" msgstr "" "mostra els canvis contra a la carta de presentació o a un sol pedaç" -#: builtin/log.c:2125 +#: builtin/log.c msgid "show changes against in cover letter or single patch" msgstr "" "mostra els canvis contra a la carta de presentació o a un sol pedaç" -#: builtin/log.c:2127 builtin/range-diff.c:33 +#: builtin/log.c builtin/range-diff.c msgid "percentage by which creation is weighted" msgstr "percentatge pel qual la creació és ponderada" -#: builtin/log.c:2129 +#: builtin/log.c msgid "show in-body From: even if identical to the e-mail header" msgstr "" "mostra en el cos el remitent: encara que sigui idèntic a la capçalera del " "correu electrònic" -#: builtin/log.c:2231 +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/log.c:2256 +#: builtin/log.c msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:2258 +#: builtin/log.c msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:2260 +#: builtin/log.c msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:2262 +#: builtin/log.c msgid "--remerge-diff does not make sense" msgstr "--remerge-diff no té sentit" -#: builtin/log.c:2318 builtin/submodule--helper.c:1736 -#: builtin/submodule--helper.c:1797 rerere.c:880 submodule.c:2386 +#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" -#: builtin/log.c:2409 +#: builtin/log.c msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requereix --cover-letter o un sol pedaç" -#: builtin/log.c:2413 +#: builtin/log.c msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2414 +#: builtin/log.c #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:2424 +#: builtin/log.c msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requereix --cover-letter o un sol pedaç" -#: builtin/log.c:2432 +#: builtin/log.c msgid "Range-diff:" msgstr "Diferència de l'interval:" -#: builtin/log.c:2433 +#: builtin/log.c #, c-format msgid "Range-diff against v%d:" msgstr "Diferència de l'interval contra el v%d:" -#: builtin/log.c:2455 +#: builtin/log.c #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" -#: builtin/log.c:2495 +#: builtin/log.c msgid "Generating patches" msgstr "S'estan generant els pedaços" -#: builtin/log.c:2539 +#: builtin/log.c msgid "failed to create output files" msgstr "no s'han pogut crear els fitxers de sortida" -#: builtin/log.c:2608 +#: builtin/log.c msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" -#: builtin/log.c:2665 +#: builtin/log.c #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -10246,126 +10121,126 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu " "manualment.\n" -#: builtin/ls-files.c:251 builtin/ls-tree.c:31 +#: builtin/ls-files.c builtin/ls-tree.c #, c-format msgid "could not get object info about '%s'" msgstr "no s'ha pogut obtenir la informació sobre l'objecte «%s»" -#: builtin/ls-files.c:520 +#: builtin/ls-files.c msgid "git ls-files [] [...]" msgstr "git ls-files [] [...]" -#: builtin/ls-files.c:577 builtin/merge-tree.c:555 +#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "separa els camins amb el caràcter NUL" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:581 +#: builtin/ls-files.c msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers «assume unchanged»" -#: builtin/ls-files.c:583 +#: builtin/ls-files.c msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»" -#: builtin/ls-files.c:585 +#: builtin/ls-files.c 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:587 +#: builtin/ls-files.c msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:596 +#: builtin/ls-files.c 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:598 +#: builtin/ls-files.c 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:600 +#: builtin/ls-files.c msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris «other»" -#: builtin/ls-files.c:602 +#: builtin/ls-files.c msgid "show line endings of files" msgstr "mostra els terminadors de línia dels fitxers" -#: builtin/ls-files.c:604 +#: builtin/ls-files.c msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:607 +#: builtin/ls-files.c msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:609 +#: builtin/ls-files.c msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:611 +#: builtin/ls-files.c msgid "skip files matching pattern" msgstr "omet els fitxers coincidents amb el patró" -#: builtin/ls-files.c:614 +#: builtin/ls-files.c msgid "read exclude patterns from " msgstr "llegeix els patrons des de " -#: builtin/ls-files.c:617 +#: builtin/ls-files.c msgid "read additional per-directory exclude patterns in " msgstr "llegeix els patrons addicionals d'exclusió per directori en " -#: builtin/ls-files.c:619 +#: builtin/ls-files.c msgid "add the standard git exclusions" msgstr "afegeix les exclusions estàndards de git" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c 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:628 +#: builtin/ls-files.c msgid "if any is not in the index, treat this as an error" msgstr "si qualsevol no és en l'índex, tracta-ho com a error" -#: builtin/ls-files.c:629 builtin/merge-tree.c:570 +#: builtin/ls-files.c builtin/merge-tree.c msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:630 +#: builtin/ls-files.c msgid "pretend that paths removed since are still present" msgstr "" "pretén que els camins eliminats després de encara siguin presents" -#: builtin/ls-files.c:632 +#: builtin/ls-files.c msgid "show debugging data" msgstr "mostra les dades de depuració" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c msgid "suppress duplicate entries" msgstr "suprimeix les entrades duplicades" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c msgid "show sparse directories in the presence of a sparse index" msgstr "mostra els directoris dispersos en presència d'un índex dispers" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" @@ -10373,7 +10248,7 @@ msgstr "" "--format no es pot usar amb -s, -o, -k, -t, --resolve-undo, --deduplicate, --" "eol" -#: builtin/ls-remote.c:13 +#: builtin/ls-remote.c msgid "" "git ls-remote [--branches] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" @@ -10383,192 +10258,192 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:68 builtin/ls-remote.c:70 builtin/rebase.c:1194 +#: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "executable" -#: builtin/ls-remote.c:69 builtin/ls-remote.c:71 +#: builtin/ls-remote.c 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:73 +#: builtin/ls-remote.c msgid "limit to tags" msgstr "limita a etiquetes" # limita-ho? -#: builtin/ls-remote.c:74 +#: builtin/ls-remote.c msgid "limit to branches" msgstr "limita a les branques" -#: builtin/ls-remote.c:76 builtin/show-ref.c:304 +#: builtin/ls-remote.c builtin/show-ref.c msgid "deprecated synonym for --branches" msgstr "sinònim de «--branches» en desús" -#: builtin/ls-remote.c:78 +#: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "no mostris les etiquetes pelades" -#: builtin/ls-remote.c:80 +#: builtin/ls-remote.c msgid "take url..insteadOf into account" msgstr "tingues en compte url..insteadOf" -#: builtin/ls-remote.c:83 +#: builtin/ls-remote.c 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:86 +#: builtin/ls-remote.c 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 assenyali" -#: builtin/ls-tree.c:21 +#: builtin/ls-tree.c msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" -#: builtin/ls-tree.c:348 +#: builtin/ls-tree.c msgid "only show trees" msgstr "mostra només els arbres" -#: builtin/ls-tree.c:350 +#: builtin/ls-tree.c msgid "recurse into subtrees" msgstr "inclou recursivament als subarbres" -#: builtin/ls-tree.c:352 +#: builtin/ls-tree.c msgid "show trees when recursing" msgstr "mostra els arbres quan es treballa recursivament" -#: builtin/ls-tree.c:355 +#: builtin/ls-tree.c msgid "terminate entries with NUL byte" msgstr "acaba les entrades amb un octet NUL" -#: builtin/ls-tree.c:356 +#: builtin/ls-tree.c msgid "include object size" msgstr "mida de l'objecte d'inclusió" -#: builtin/ls-tree.c:358 builtin/ls-tree.c:360 +#: builtin/ls-tree.c msgid "list only filenames" msgstr "llista només els noms de fitxer" -#: builtin/ls-tree.c:362 +#: builtin/ls-tree.c msgid "list only objects" msgstr "llista només els objectes" -#: builtin/ls-tree.c:364 +#: builtin/ls-tree.c msgid "use full path names" msgstr "usa els noms de camí complets" -#: builtin/ls-tree.c:366 +#: builtin/ls-tree.c 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)" -#: builtin/ls-tree.c:403 +#: builtin/ls-tree.c msgid "--format can't be combined with other format-altering options" msgstr "--format no es pot combinar amb altres opcions d'alteració de format" #. TRANSLATORS: keep <> in "<" mail ">" info. -#: builtin/mailinfo.c:16 +#: builtin/mailinfo.c msgid "git mailinfo [] < mail >info" msgstr "git mailinfo [] < mail >info" -#: builtin/mailinfo.c:63 +#: builtin/mailinfo.c msgid "keep subject" msgstr "mantén l'assumpte" -#: builtin/mailinfo.c:65 +#: builtin/mailinfo.c msgid "keep non patch brackets in subject" msgstr "mantén els parèntesis que no són del pedaç en l'assumpte" -#: builtin/mailinfo.c:67 +#: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" msgstr "copia el Message-ID al final del missatge de comissió" -#: builtin/mailinfo.c:69 +#: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" msgstr "torna a codificar les metadades a i18n.commitEncoding" -#: builtin/mailinfo.c:72 +#: builtin/mailinfo.c msgid "disable charset re-coding of metadata" msgstr "inhabilita la recodificació del joc de caràcters de les metadades" -#: builtin/mailinfo.c:74 +#: builtin/mailinfo.c msgid "encoding" msgstr "codificació" -#: builtin/mailinfo.c:75 +#: builtin/mailinfo.c msgid "re-code metadata to this encoding" msgstr "recodifica les metadades en aquesta codificació" -#: builtin/mailinfo.c:77 +#: builtin/mailinfo.c msgid "use scissors" msgstr "usa les tisores" -#: builtin/mailinfo.c:78 +#: builtin/mailinfo.c msgid "" msgstr "" -#: builtin/mailinfo.c:79 +#: builtin/mailinfo.c msgid "action when quoted CR is found" msgstr "acció quan es troba un CR entre cometes" -#: builtin/mailinfo.c:82 +#: builtin/mailinfo.c msgid "use headers in message's body" msgstr "utilitza les capçaleres en el cos del missatge" -#: builtin/mailsplit.c:227 +#: builtin/mailsplit.c msgid "reading patches from stdin/tty..." msgstr "s'estan llegint pedaços de stdin/tty..." -#: builtin/mailsplit.c:242 +#: builtin/mailsplit.c #, c-format msgid "empty mbox: '%s'" msgstr "mbox buit: «%s»" -#: builtin/merge-base.c:35 +#: builtin/merge-base.c msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] ..." -#: builtin/merge-base.c:36 +#: builtin/merge-base.c msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus ..." -#: builtin/merge-base.c:37 +#: builtin/merge-base.c msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor " -#: builtin/merge-base.c:38 +#: builtin/merge-base.c msgid "git merge-base --independent ..." msgstr "git merge-base --independent ..." -#: builtin/merge-base.c:39 +#: builtin/merge-base.c msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point []" -#: builtin/merge-base.c:158 +#: builtin/merge-base.c msgid "output all common ancestors" msgstr "emet tots els avantpassats comuns" -#: builtin/merge-base.c:160 +#: builtin/merge-base.c 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:162 +#: builtin/merge-base.c msgid "list revs not reachable from others" msgstr "llista les revisions no abastables d'altres" -#: builtin/merge-base.c:164 +#: builtin/merge-base.c msgid "is the first one ancestor of the other?" msgstr "és la primera un avantpassat de l'altre?" -#: builtin/merge-base.c:166 +#: builtin/merge-base.c msgid "find where forked from reflog of " msgstr "" "troba on s'ha bifurcat del registre de referències de " -#: builtin/merge-file.c:16 +#: builtin/merge-file.c msgid "" "git merge-file [] [-L [-L [-L ]]] " " " @@ -10576,342 +10451,342 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " -#: builtin/merge-file.c:51 diff.c:5291 +#: builtin/merge-file.c diff.c msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" -#: builtin/merge-file.c:69 +#: builtin/merge-file.c msgid "send results to standard output" msgstr "envia els resultats a la sortida estàndard" -#: builtin/merge-file.c:70 +#: builtin/merge-file.c msgid "use object IDs instead of filenames" msgstr "utilitza els ID dels objectes en comptes dels noms de fitxer" -#: builtin/merge-file.c:71 +#: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "usa una fusió basada en diff3" -#: builtin/merge-file.c:72 +#: builtin/merge-file.c msgid "use a zealous diff3 based merge" msgstr "usa una fusió basada en zealous diff3" -#: builtin/merge-file.c:80 diff.c:5813 +#: builtin/merge-file.c diff.c msgid "" msgstr "" -#: builtin/merge-file.c:81 diff.c:5814 +#: builtin/merge-file.c diff.c msgid "choose a diff algorithm" msgstr "trieu un algorisme per al diff" -#: builtin/merge-file.c:84 +#: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "en conflictes, usa aquesta mida de marcador" -#: builtin/merge-file.c:85 +#: builtin/merge-file.c msgid "do not warn about conflicts" msgstr "no avisis de conflictes" -#: builtin/merge-file.c:87 +#: builtin/merge-file.c msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" -#: builtin/merge-file.c:125 +#: builtin/merge-file.c #, c-format msgid "object '%s' does not exist" msgstr "l'objecte «%s» no existeix" -#: builtin/merge-file.c:156 +#: builtin/merge-file.c msgid "Could not write object file" msgstr "No s'ha pogut escriure el fitxer de l'objecte" -#: builtin/merge-recursive.c:51 +#: builtin/merge-recursive.c #, c-format msgid "unknown option %s" msgstr "opció desconeguda %s" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: builtin/merge-recursive.c:59 +#: builtin/merge-recursive.c #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s." msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s." -#: builtin/merge-recursive.c:67 +#: builtin/merge-recursive.c 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-recursive.c:76 builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "no s'ha pogut resoldre la referència «%s»" -#: builtin/merge-recursive.c:84 +#: builtin/merge-recursive.c #, c-format msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" -#: builtin/merge-tree.c:446 builtin/merge-tree.c:451 builtin/merge-tree.c:456 +#: builtin/merge-tree.c #, c-format msgid "could not parse as tree '%s'" msgstr "no s'ha pogut analitzar com a arbre «%s»" -#: builtin/merge-tree.c:467 builtin/merge-tree.c:472 builtin/merge.c:1227 +#: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge-tree.c:482 builtin/merge.c:1570 +#: builtin/merge-tree.c builtin/merge.c msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge-tree.c:489 +#: builtin/merge-tree.c msgid "failure to merge" msgstr "s'ha produït un error en fusionar" -#: builtin/merge-tree.c:542 +#: builtin/merge-tree.c msgid "git merge-tree [--write-tree] [] " msgstr "git merge-tree [--write-tree] [] " -#: builtin/merge-tree.c:543 +#: builtin/merge-tree.c msgid "git merge-tree [--trivial-merge] " msgstr "git merge-tree [--trivial-merge] " -#: builtin/merge-tree.c:548 +#: builtin/merge-tree.c msgid "do a real merge instead of a trivial merge" msgstr "fes una fusió real en lloc d'una fusió trivial" -#: builtin/merge-tree.c:551 +#: builtin/merge-tree.c msgid "do a trivial merge only" msgstr "fes només una fusió trivial" -#: builtin/merge-tree.c:553 +#: builtin/merge-tree.c msgid "also show informational/conflict messages" msgstr "també mostra missatges informatius i de conflictes" -#: builtin/merge-tree.c:558 +#: builtin/merge-tree.c msgid "list filenames without modes/oids/stages" msgstr "llista els noms de fitxer sense modes/oids/stages" -#: builtin/merge-tree.c:562 builtin/merge.c:287 builtin/pull.c:187 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge-tree.c:566 +#: builtin/merge-tree.c msgid "perform multiple merges, one per line of input" msgstr "realitza múltiples fusions, una per línia d'entrada" -#: builtin/merge-tree.c:571 +#: builtin/merge-tree.c msgid "specify a merge-base for the merge" msgstr "cal especificar una referència base per a la fusió" -#: builtin/merge-tree.c:572 builtin/merge.c:269 builtin/pull.c:179 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option=value" msgstr "opció=valor" -#: builtin/merge-tree.c:573 builtin/merge.c:270 builtin/pull.c:180 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge-tree.c:586 builtin/merge-tree.c:596 builtin/merge-tree.c:664 +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge és incompatible amb totes les altres opcions" -#: builtin/merge-tree.c:589 builtin/merge.c:740 +#: builtin/merge-tree.c builtin/merge.c #, c-format msgid "unknown strategy option: -X%s" msgstr "opció d'estratègia desconeguda: -X%s" -#: builtin/merge-tree.c:608 builtin/merge-tree.c:624 builtin/notes.c:382 +#: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "línia d'entrada mal formada: «%s»." -#: builtin/merge-tree.c:628 +#: builtin/merge-tree.c #, c-format msgid "merging cannot continue; got unclean result of %d" msgstr "la fusió no pot continuar; s'ha obtingut un resultat no net de %d" -#: builtin/merge.c:64 +#: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [] [...]" -#: builtin/merge.c:129 +#: builtin/merge.c msgid "switch `m' requires a value" msgstr "l'opció «m» requereix un valor" -#: builtin/merge.c:152 +#: builtin/merge.c #, c-format msgid "option `%s' requires a value" msgstr "l'opció «%s» requereix un valor" -#: builtin/merge.c:205 +#: builtin/merge.c #, 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:206 +#: builtin/merge.c #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:211 +#: builtin/merge.c #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:246 builtin/pull.c:137 +#: builtin/merge.c builtin/pull.c 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:248 builtin/pull.c:140 +#: builtin/merge.c builtin/pull.c 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:249 builtin/pull.c:143 +#: builtin/merge.c builtin/pull.c msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:251 builtin/pull.c:146 +#: builtin/merge.c builtin/pull.c msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim ) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:254 builtin/pull.c:152 +#: builtin/merge.c builtin/pull.c msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:256 builtin/pull.c:155 +#: builtin/merge.c builtin/pull.c msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:258 builtin/pull.c:158 +#: builtin/merge.c builtin/pull.c msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:260 +#: builtin/merge.c msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:262 builtin/pull.c:165 +#: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:266 builtin/pull.c:171 +#: builtin/merge.c builtin/pull.c 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:267 builtin/notes.c:887 builtin/pull.c:175 -#: builtin/rebase.c:1207 builtin/revert.c:128 +#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c +#: builtin/revert.c msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:268 builtin/pull.c:176 +#: builtin/merge.c builtin/pull.c msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:272 +#: builtin/merge.c 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:278 +#: builtin/merge.c msgid "use instead of the real target" msgstr "usa en lloc de destí real" -#: builtin/merge.c:281 +#: builtin/merge.c msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:283 +#: builtin/merge.c msgid "--abort but leave index and working tree alone" msgstr "--abort però deixa l'índex i l'arbre de treball intactes" -#: builtin/merge.c:285 +#: builtin/merge.c msgid "continue the current in-progress merge" msgstr "continua la fusió actual en curs" -#: builtin/merge.c:294 +#: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "evita els lligams pre-merge-commit i commit-msg" -#: builtin/merge.c:318 +#: builtin/merge.c msgid "could not run stash." msgstr "no s'ha pogut executar «stash»." -#: builtin/merge.c:323 +#: builtin/merge.c msgid "stash failed" msgstr "l'«stash» ha fallat" -#: builtin/merge.c:328 +#: builtin/merge.c #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:345 builtin/merge.c:357 +#: builtin/merge.c msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:391 +#: builtin/merge.c msgid "Already up to date. (nothing to squash)" msgstr "Ja està actualitzat. (res a fer «squash»)" -#: builtin/merge.c:393 merge-ort-wrappers.c:37 merge-recursive.c:3547 +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:405 +#: builtin/merge.c #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:507 +#: builtin/merge.c #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» no assenyala una comissió" -#: builtin/merge.c:595 +#: builtin/merge.c #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:715 builtin/merge.c:917 merge-recursive.c:3919 +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." -#: builtin/merge.c:727 +#: builtin/merge.c 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:764 builtin/sparse-checkout.c:357 +#: builtin/merge.c builtin/sparse-checkout.c #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:816 +#: builtin/merge.c #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:825 +#: builtin/merge.c #, 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:831 +#: builtin/merge.c msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -10921,12 +10796,12 @@ msgstr "" "necessària, especialment si es fusiona una branca amb funcionalitat nova.\n" "\n" -#: builtin/merge.c:836 +#: builtin/merge.c msgid "An empty message aborts the commit.\n" msgstr "Un missatge buit interromp la comissió.\n" # will be ignored → es descartaran? -#: builtin/merge.c:839 +#: builtin/merge.c #, c-format msgid "" "Lines starting with '%s' will be ignored, and an empty message aborts\n" @@ -10935,75 +10810,75 @@ msgstr "" "Les línies que comencin amb «%s» s'ignoraran, i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:903 +#: builtin/merge.c msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:920 +#: builtin/merge.c #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:985 +#: builtin/merge.c #, 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:1025 +#: builtin/merge.c msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:1027 +#: builtin/merge.c msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:1029 +#: builtin/merge.c 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:1034 +#: builtin/merge.c #, 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:1091 +#: builtin/merge.c #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1166 editor.c:157 read-cache.c:3102 wrapper.c:685 +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: builtin/merge.c:1193 +#: builtin/merge.c #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1346 +#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort no espera cap argument" -#: builtin/merge.c:1350 +#: builtin/merge.c msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1370 +#: builtin/merge.c msgid "--quit expects no arguments" msgstr "--quit no espera cap argument" -#: builtin/merge.c:1383 +#: builtin/merge.c msgid "--continue expects no arguments" msgstr "--continue no espera cap argument" -#: builtin/merge.c:1387 +#: builtin/merge.c msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1403 +#: builtin/merge.c msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11011,7 +10886,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1410 +#: builtin/merge.c msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11019,39 +10894,39 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1413 +#: builtin/merge.c 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:1445 +#: builtin/merge.c 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:1462 +#: builtin/merge.c msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a una HEAD buida encara no es permet" -#: builtin/merge.c:1464 +#: builtin/merge.c 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 una HEAD buida" -#: builtin/merge.c:1469 +#: builtin/merge.c #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1471 +#: builtin/merge.c msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a una HEAD buida" -#: builtin/merge.c:1591 +#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1640 merge-ort-wrappers.c:17 merge-recursive.c:3797 +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -11060,103 +10935,103 @@ msgstr "" "Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" " %s" -#: builtin/merge.c:1649 +#: builtin/merge.c #, 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:1656 +#: builtin/merge.c #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1719 builtin/merge.c:1787 +#: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1723 +#: builtin/merge.c #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1777 +#: builtin/merge.c #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1779 +#: builtin/merge.c #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1789 +#: builtin/merge.c #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "S'està usant l'estratègia %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1803 +#: builtin/merge.c #, 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.c:1808 +#: builtin/merge.c #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "Quan acabi, aplica els canvis «stashed» amb «git stash pop»\n" -#: builtin/mktag.c:30 +#: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "avís: l'entrada d'etiqueta no passa fsck: %s" -#: builtin/mktag.c:41 +#: builtin/mktag.c #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "error: l'entrada d'etiqueta no passa fsck: %s" -#: builtin/mktag.c:44 +#: builtin/mktag.c #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn" -#: builtin/mktag.c:60 +#: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" msgstr "no s'ha pogut llegir l'objecte etiquetat «%s»" -#: builtin/mktag.c:63 +#: builtin/mktag.c #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "l'objecte «%s» s'ha etiquetat com a «%s», però és del tipus «%s»" -#: builtin/mktag.c:104 +#: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "l'etiqueta a stdin no ha passat la comprovació estricta del fsck" -#: builtin/mktag.c:107 +#: builtin/mktag.c msgid "tag on stdin did not refer to a valid object" msgstr "l'etiqueta a stdin no apunta a un objecte vàlid" -#: builtin/mktag.c:110 builtin/tag.c:272 +#: builtin/mktag.c builtin/tag.c msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" -#: builtin/mktree.c:168 +#: builtin/mktree.c msgid "input is NUL terminated" msgstr "l'entrada és acabada amb NUL" -#: builtin/mktree.c:169 builtin/write-tree.c:30 +#: builtin/mktree.c builtin/write-tree.c msgid "allow missing objects" msgstr "permet els objectes absents" -#: builtin/mktree.c:170 +#: builtin/mktree.c msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" -#: builtin/multi-pack-index.c:15 +#: builtin/multi-pack-index.c msgid "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" @@ -11164,55 +11039,55 @@ msgstr "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" -#: builtin/multi-pack-index.c:19 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [] verify" msgstr "git multi-pack-index [] verify" -#: builtin/multi-pack-index.c:22 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [] expire" msgstr "git multi-pack-index [] expire" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "git multi-pack-index [] repack [--batch-size=]" -#: builtin/multi-pack-index.c:75 +#: builtin/multi-pack-index.c msgid "directory" msgstr "directori" -#: builtin/multi-pack-index.c:76 +#: builtin/multi-pack-index.c msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "directori de l'objecte que conté el conjunt de parells de fitxers i índexs " "de paquets" -#: builtin/multi-pack-index.c:127 +#: builtin/multi-pack-index.c msgid "preferred-pack" msgstr "paquet preferit" -#: builtin/multi-pack-index.c:128 +#: builtin/multi-pack-index.c msgid "pack for reuse when computing a multi-pack bitmap" msgstr "" "empaqueta per a reutilitzar quan es calcula un mapa de bits multipaquet" -#: builtin/multi-pack-index.c:129 +#: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "escriu un map de bits multipaquet" -#: builtin/multi-pack-index.c:134 +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "escriu un nou MIDX incremental" -#: builtin/multi-pack-index.c:136 +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "escriu un índex multipaquet que contingui només els índexs donats" -#: builtin/multi-pack-index.c:138 +#: builtin/multi-pack-index.c msgid "refs snapshot for selecting bitmap commits" msgstr "" "instantània de referències per a seleccionar les comissions de mapa de bits" -#: builtin/multi-pack-index.c:245 +#: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -11220,161 +11095,161 @@ msgstr "" "durant el reempaquetament, recull els fitxers de paquets de mida més petita " "en un lot que és més gran que aquesta mida" -#: builtin/mv.c:29 +#: builtin/mv.c msgid "git mv [] ... " msgstr "git mv [] ... " -#: builtin/mv.c:92 +#: builtin/mv.c #, 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:94 +#: builtin/mv.c 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:113 +#: builtin/mv.c #, c-format msgid "%.*s is in index" msgstr "%.*s és en l'índex" -#: builtin/mv.c:192 +#: builtin/mv.c msgid "force move/rename even if target exists" msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/mv.c:194 +#: builtin/mv.c msgid "skip move/rename errors" msgstr "omet els errors de moviment / canvi de nom" -#: builtin/mv.c:250 +#: builtin/mv.c #, c-format msgid "destination '%s' is not a directory" msgstr "el destí «%s» no és un directori" -#: builtin/mv.c:274 +#: builtin/mv.c #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" -#: builtin/mv.c:293 builtin/mv.c:298 +#: builtin/mv.c msgid "bad source" msgstr "origen incorrecte" -#: builtin/mv.c:311 builtin/mv.c:388 +#: builtin/mv.c msgid "destination exists" msgstr "el destí existeix" -#: builtin/mv.c:319 +#: builtin/mv.c msgid "can not move directory into itself" msgstr "no es pot moure un directori a dins d'ell mateix" -#: builtin/mv.c:324 +#: builtin/mv.c msgid "destination already exists" msgstr "la destinació ja existeix" -#: builtin/mv.c:343 +#: builtin/mv.c msgid "source directory is empty" msgstr "el directori d'origen està buit" -#: builtin/mv.c:379 +#: builtin/mv.c msgid "not under version control" msgstr "no està sota control de versions" -#: builtin/mv.c:383 +#: builtin/mv.c msgid "conflicted" msgstr "en conflicte" -#: builtin/mv.c:396 builtin/mv.c:418 +#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "s'està sobreescrivint «%s»" -#: builtin/mv.c:399 +#: builtin/mv.c msgid "Cannot overwrite" msgstr "No es pot sobreescriure" -#: builtin/mv.c:404 +#: builtin/mv.c msgid "multiple sources for the same target" msgstr "múltiples orígens per al mateix destí" -#: builtin/mv.c:408 +#: builtin/mv.c msgid "destination directory does not exist" msgstr "el directori destí no existeix" -#: builtin/mv.c:415 +#: builtin/mv.c msgid "destination exists in the index" msgstr "el destí existeix a l'índex" -#: builtin/mv.c:450 +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destí=%s" -#: builtin/mv.c:483 +#: builtin/mv.c #, c-format msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:491 builtin/remote.c:848 +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" -#: builtin/name-rev.c:508 +#: builtin/name-rev.c msgid "git name-rev [] ..." msgstr "git name-rev [] ..." -#: builtin/name-rev.c:509 +#: builtin/name-rev.c msgid "git name-rev [] --all" msgstr "git name-rev [] --all" -#: builtin/name-rev.c:510 +#: builtin/name-rev.c msgid "git name-rev [] --annotate-stdin" msgstr "git name-rev [] --annotate-stdin" -#: builtin/name-rev.c:571 +#: builtin/name-rev.c msgid "print only ref-based names (no object names)" msgstr "imprimeix només els noms basats en referències (no els noms d'objecte)" -#: builtin/name-rev.c:572 +#: builtin/name-rev.c msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:574 +#: builtin/name-rev.c msgid "only use refs matching " msgstr "només usa les referències que coincideixin amb " -#: builtin/name-rev.c:576 +#: builtin/name-rev.c msgid "ignore refs matching " msgstr "ignora les referències que coincideixin amb " -#: builtin/name-rev.c:578 +#: builtin/name-rev.c msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:582 +#: builtin/name-rev.c msgid "deprecated: use --annotate-stdin instead" msgstr "obsolet: useu en comptes --annotate-stdin" -#: builtin/name-rev.c:584 +#: builtin/name-rev.c msgid "annotate text from stdin" msgstr "anota el text de stdin" -#: builtin/name-rev.c:585 +#: builtin/name-rev.c msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms «undefined» (per defecte)" -#: builtin/name-rev.c:589 +#: builtin/name-rev.c msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" -#: builtin/notes.c:34 +#: builtin/notes.c msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref ] [llista []]" -#: builtin/notes.c:35 +#: builtin/notes.c msgid "" "git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -11384,12 +11259,12 @@ msgstr "" "separator=] [--[no-]stripspace] [-m | -F | (-" "c | -C) ] []" -#: builtin/notes.c:36 +#: builtin/notes.c msgid "git notes [--ref ] copy [-f] " msgstr "" "git notes [--ref ] copy [-f] " -#: builtin/notes.c:37 +#: builtin/notes.c msgid "" "git notes [--ref ] append [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -11399,132 +11274,130 @@ msgstr "" "separator=] [--[no-]stripspace] [-m | -F | (-" "c | -C) ] []" -#: builtin/notes.c:38 +#: builtin/notes.c msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "" "git notes [--ref ] edit [--allow-empty] []" -#: builtin/notes.c:39 +#: builtin/notes.c msgid "git notes [--ref ] show []" msgstr "git notes [--ref ] show []" -#: builtin/notes.c:40 +#: builtin/notes.c msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" "git notes [--ref ] merge [-v | -q] [-s ] " "" -#: builtin/notes.c:43 +#: builtin/notes.c msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref ] remove [...]" -#: builtin/notes.c:44 +#: builtin/notes.c msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref ] prune [-n] [-v]" -#: builtin/notes.c:45 +#: builtin/notes.c msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref ] get-ref" -#: builtin/notes.c:50 +#: builtin/notes.c msgid "git notes [list []]" msgstr "git notes [llista []]" -#: builtin/notes.c:55 +#: builtin/notes.c msgid "git notes add [] []" msgstr "git notes add [] []" -#: builtin/notes.c:60 +#: builtin/notes.c msgid "git notes copy [] " msgstr "git notes copy [] " -#: builtin/notes.c:61 +#: builtin/notes.c msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [ ]..." -#: builtin/notes.c:66 +#: builtin/notes.c msgid "git notes append [] []" msgstr "git notes append [] []" -#: builtin/notes.c:71 +#: builtin/notes.c msgid "git notes edit []" msgstr "git notes edit []" -#: builtin/notes.c:76 +#: builtin/notes.c msgid "git notes show []" msgstr "git notes show []" -#: builtin/notes.c:81 +#: builtin/notes.c msgid "git notes merge [] " msgstr "git notes merge [] " -#: builtin/notes.c:82 +#: builtin/notes.c msgid "git notes merge --commit []" msgstr "git notes merge --commit []" -#: builtin/notes.c:83 +#: builtin/notes.c msgid "git notes merge --abort []" msgstr "git notes merge --abort []" -#: builtin/notes.c:88 +#: builtin/notes.c msgid "git notes remove []" msgstr "git notes remove []" -#: builtin/notes.c:93 +#: builtin/notes.c msgid "git notes prune []" msgstr "git notes prune []" -#: builtin/notes.c:103 +#: builtin/notes.c msgid "Write/edit the notes for the following object:" msgstr "Escriviu/editeu les notes per l'objecte següent:" -#: builtin/notes.c:180 +#: builtin/notes.c msgid "could not read 'show' output" msgstr "no s'ha pogut llegir la sortida de «show»" -#: builtin/notes.c:188 +#: builtin/notes.c #, 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:222 +#: builtin/notes.c 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:232 +#: builtin/notes.c msgid "unable to write note object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/notes.c:235 +#: builtin/notes.c #, 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:299 builtin/tag.c:638 +#: builtin/notes.c builtin/tag.c #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir «%s»" -#: builtin/notes.c:320 builtin/notes.c:386 builtin/notes.c:388 -#: builtin/notes.c:456 builtin/notes.c:521 builtin/notes.c:609 -#: builtin/notes.c:614 builtin/notes.c:703 builtin/notes.c:770 +#: builtin/notes.c #, 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:322 +#: builtin/notes.c #, c-format msgid "failed to read object '%s'." msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: builtin/notes.c:327 +#: builtin/notes.c #, 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:397 +#: builtin/notes.c #, 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»" @@ -11532,53 +11405,53 @@ 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:429 +#: builtin/notes.c #, 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:462 builtin/notes.c:776 +#: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "no s'ha trobat cap nota per a l'objecte %s." -#: builtin/notes.c:484 builtin/notes.c:659 +#: builtin/notes.c msgid "note contents as a string" msgstr "anota els continguts com a cadena" -#: builtin/notes.c:487 builtin/notes.c:662 +#: builtin/notes.c msgid "note contents in a file" msgstr "anota els continguts en un fitxer" -#: builtin/notes.c:490 builtin/notes.c:665 +#: builtin/notes.c msgid "reuse and edit specified note object" msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:493 builtin/notes.c:668 +#: builtin/notes.c msgid "reuse specified note object" msgstr "reusa l'objecte de nota especificat" -#: builtin/notes.c:496 builtin/notes.c:671 +#: builtin/notes.c msgid "allow storing empty note" msgstr "permet l'emmagatzematge d'una nota buida" -#: builtin/notes.c:497 builtin/notes.c:579 +#: builtin/notes.c msgid "replace existing notes" msgstr "reemplaça les notes existents" -#: builtin/notes.c:499 builtin/notes.c:673 +#: builtin/notes.c msgid "" msgstr "" -#: builtin/notes.c:500 builtin/notes.c:674 +#: builtin/notes.c msgid "insert between paragraphs" msgstr "insereix entre paràgrafs" -#: builtin/notes.c:503 builtin/notes.c:677 +#: builtin/notes.c msgid "remove unnecessary whitespace" msgstr "elimina l'espai en blanc innecessari" -#: builtin/notes.c:531 +#: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11587,30 +11460,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:546 builtin/notes.c:627 +#: builtin/notes.c #, 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:558 builtin/notes.c:735 builtin/notes.c:1011 +#: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "S'està eliminant la nota de l'objecte %s\n" -#: builtin/notes.c:580 +#: builtin/notes.c msgid "read objects from stdin" msgstr "llegeix els objectes des de stdin" -#: builtin/notes.c:582 +#: builtin/notes.c msgid "load rewriting config for (implies --stdin)" msgstr "" "carrega la configuració de reescriptura per a (implica --stdin)" -#: builtin/notes.c:600 +#: builtin/notes.c msgid "too few arguments" msgstr "massa pocs arguments" -#: builtin/notes.c:621 +#: builtin/notes.c #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11619,12 +11492,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:633 +#: builtin/notes.c #, 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:694 +#: builtin/notes.c #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11633,53 +11506,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:796 +#: builtin/notes.c 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:798 +#: builtin/notes.c 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:800 +#: builtin/notes.c 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:820 +#: builtin/notes.c 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:822 +#: builtin/notes.c msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:824 +#: builtin/notes.c msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:837 +#: builtin/notes.c msgid "failed to resolve NOTES_MERGE_REF" msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF" -#: builtin/notes.c:840 +#: builtin/notes.c msgid "failed to finalize notes merge" msgstr "s'ha produït un error en finalitzar la fusió de notes" -#: builtin/notes.c:868 +#: builtin/notes.c #, c-format msgid "unknown notes merge strategy %s" msgstr "estratègia de fusió de notes desconeguda %s" -#: builtin/notes.c:884 +#: builtin/notes.c msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:886 +#: builtin/notes.c msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:888 +#: builtin/notes.c msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11687,48 +11560,48 @@ msgstr "" "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:890 +#: builtin/notes.c msgid "Committing unmerged notes" msgstr "S'estan cometent les notes sense fusionar" -#: builtin/notes.c:892 +#: builtin/notes.c msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:894 +#: builtin/notes.c msgid "Aborting notes merge resolution" msgstr "S'està avortant la resolució de fusió de notes" -#: builtin/notes.c:896 +#: builtin/notes.c msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:908 +#: builtin/notes.c msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no es pot combinar --commit, --abort i -s/--strategy" -#: builtin/notes.c:913 +#: builtin/notes.c msgid "must specify a notes ref to merge" msgstr "cal especificar una referència de notes a fusionar" -#: builtin/notes.c:938 +#: builtin/notes.c #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconeguda: %s" -#: builtin/notes.c:980 +#: builtin/notes.c #, 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:984 +#: builtin/notes.c #, 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:986 +#: builtin/notes.c #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11739,56 +11612,56 @@ msgstr "" "cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb " "«git notes merge --abort».\n" -#: builtin/notes.c:1006 builtin/tag.c:651 +#: builtin/notes.c builtin/tag.c #, 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:1009 +#: builtin/notes.c #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:1021 +#: builtin/notes.c 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:1024 +#: builtin/notes.c msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:1063 builtin/prune.c:159 builtin/worktree.c:237 +#: builtin/notes.c builtin/prune.c builtin/worktree.c msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/notes.c:1064 +#: builtin/notes.c msgid "report pruned notes" msgstr "informa de notes podades" -#: builtin/notes.c:1113 +#: builtin/notes.c msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:1114 +#: builtin/notes.c msgid "use notes from " msgstr "usa les notes de " -#: builtin/notes.c:1133 builtin/remote.c:1794 parse-options.c:873 +#: builtin/notes.c builtin/remote.c parse-options.c #, c-format msgid "unknown subcommand: `%s'" msgstr "subordre desconeguda: «%s»" -#: builtin/pack-objects.c:185 +#: builtin/pack-objects.c msgid "git pack-objects --stdout [] [< | < ]" msgstr "git pack-objects --stdout [] [< | < ]" -#: builtin/pack-objects.c:186 +#: builtin/pack-objects.c msgid "" "git pack-objects [] [< | < ]" msgstr "" "git pack-objects [] [< | < ]" -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -11797,136 +11670,135 @@ msgstr "" "write_reuse_object: no s'ha pogut localitzar %s, s'esperava a la posició " "% al paquet %s" -#: builtin/pack-objects.c:593 +#: builtin/pack-objects.c #, c-format msgid "bad packed object CRC for %s" msgstr "CRC de l'objecte empaquetat malmès per a %s" -#: builtin/pack-objects.c:604 +#: builtin/pack-objects.c #, c-format msgid "corrupt packed object for %s" msgstr "objecte empaquetat corrupte per a %s" -#: builtin/pack-objects.c:735 +#: builtin/pack-objects.c #, c-format msgid "recursive delta detected for object %s" msgstr "diferència recursiva detectada per a l'objecte %s" -#: builtin/pack-objects.c:957 +#: builtin/pack-objects.c #, c-format msgid "ordered %u objects, expected %" msgstr "ordenats %u objectes, s'esperaven %" -#: builtin/pack-objects.c:1055 +#: builtin/pack-objects.c #, c-format msgid "expected object at offset % in pack %s" msgstr "objecte esperat a la posició % al paquet %s" -#: builtin/pack-objects.c:1266 +#: builtin/pack-objects.c 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:1279 +#: builtin/pack-objects.c msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1357 builtin/update-index.c:108 +#: builtin/pack-objects.c builtin/update-index.c #, c-format msgid "failed to stat %s" msgstr "s'ha produït un error en fer stat a %s" -#: builtin/pack-objects.c:1365 object-file.c:2329 +#: builtin/pack-objects.c object-file.c #, c-format msgid "failed utime() on %s" msgstr "ha fallat utime() a %s" -#: builtin/pack-objects.c:1399 +#: builtin/pack-objects.c msgid "failed to write bitmap index" msgstr "s'ha produït un error en escriure l'índex de mapa de bits" -#: builtin/pack-objects.c:1427 +#: builtin/pack-objects.c #, c-format msgid "wrote % objects while expecting %" msgstr "escrits % objectes mentre s'esperaven %" -#: builtin/pack-objects.c:1677 builtin/repack.c:1286 +#: builtin/pack-objects.c builtin/repack.c 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:2125 +#: builtin/pack-objects.c #, c-format msgid "delta base offset overflow in pack for %s" msgstr "desbordament del desplaçament base de diferències en paquet per a %s" -#: builtin/pack-objects.c:2134 +#: builtin/pack-objects.c #, c-format msgid "delta base offset out of bound for %s" msgstr "desplaçament base de diferències fora dels límits per a %s" -#: builtin/pack-objects.c:2415 +#: builtin/pack-objects.c msgid "Counting objects" msgstr "S'estan comptant els objectes" -#: builtin/pack-objects.c:2565 pack-bitmap.c:1725 pack-bitmap.c:1731 +#: builtin/pack-objects.c pack-bitmap.c #, c-format msgid "unable to get size of %s" msgstr "no s'ha pogut obtenir la mida de %s" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c #, c-format msgid "unable to parse object header of %s" msgstr "no s'ha pogut analitzar la capçalera de l'objecte de %s" -#: builtin/pack-objects.c:2652 builtin/pack-objects.c:2670 -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "no es pot llegir l'objecte %s" -#: builtin/pack-objects.c:2655 builtin/pack-objects.c:2684 +#: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" "l'objecte %s té una longitud d'objecte inconsistent (% vs " "%)" -#: builtin/pack-objects.c:2694 +#: builtin/pack-objects.c msgid "suboptimal pack - out of memory" msgstr "paquet subòptim - sense memòria" -#: builtin/pack-objects.c:3009 +#: builtin/pack-objects.c #, c-format msgid "Delta compression using up to %d threads" msgstr "Compressió de diferències usant fins a %d fils" -#: builtin/pack-objects.c:3148 +#: builtin/pack-objects.c #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s" -#: builtin/pack-objects.c:3216 commit-graph.c:1505 +#: builtin/pack-objects.c commit-graph.c #, c-format msgid "unable to get type of object %s" msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s" -#: builtin/pack-objects.c:3235 +#: builtin/pack-objects.c msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:3241 +#: builtin/pack-objects.c msgid "inconsistency with delta count" msgstr "inconsistència amb el comptador de diferències" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c #, c-format msgid "invalid pack.allowPackReuse value: '%s'" msgstr "valor pack.allowPackReuse value no vàlid: «%s»" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' " " » (s'ha rebut «%s»)" -#: builtin/pack-objects.c:3348 +#: builtin/pack-objects.c #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -11943,35 +11815,34 @@ msgstr "" "l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (s'ha " "rebut «%s»)" -#: builtin/pack-objects.c:3385 +#: builtin/pack-objects.c #, c-format msgid "could not get type of object %s in pack %s" msgstr "no s'ha pogut obtenir el tipus de l'objecte %s al paquet %s" -#: builtin/pack-objects.c:3515 builtin/pack-objects.c:3528 -#: builtin/pack-objects.c:3652 +#: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "no s'ha pogut trobar el paquet «%s»" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c #, c-format msgid "packfile %s cannot be accessed" msgstr "no es pot accedir al fitxer de paquet %s" -#: builtin/pack-objects.c:3663 builtin/pack-objects.c:3689 +#: builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "S'estan enumerant els objectes superflus" -#: builtin/pack-objects.c:3695 +#: builtin/pack-objects.c msgid "unable to add cruft objects" msgstr "no s'han pogut afegir els objectes superflus" -#: builtin/pack-objects.c:3708 +#: builtin/pack-objects.c msgid "Traversing cruft objects" msgstr "S'estan recorrent els objectes superflus" -#: builtin/pack-objects.c:3793 +#: builtin/pack-objects.c #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -11980,7 +11851,7 @@ msgstr "" "s'esperava un identificador vora de l'objecte, s'ha rebut brossa:\n" " %s" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c #, c-format msgid "" "expected object ID, got garbage:\n" @@ -11989,280 +11860,280 @@ msgstr "" "s'esperava un identificador d'objecte, s'ha rebut brossa:\n" " %s" -#: builtin/pack-objects.c:3913 reachable.c:294 +#: builtin/pack-objects.c reachable.c msgid "could not load cruft pack .mtimes" msgstr "no s'ha pogut carregar superflus del paquet superflu" -#: builtin/pack-objects.c:3935 builtin/pack-objects.c:4034 +#: builtin/pack-objects.c msgid "cannot open pack index" msgstr "no s'ha pogut obrir l'índex del paquet" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c #, c-format msgid "loose object at %s could not be examined" msgstr "no s'ha pogut examinar l'objecte solt a %s" -#: builtin/pack-objects.c:4042 +#: builtin/pack-objects.c msgid "unable to force loose object" msgstr "no s'ha pogut forçar l'objecte solt" -#: builtin/pack-objects.c:4179 +#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "«%s» no és una revisió" -#: builtin/pack-objects.c:4182 builtin/rev-parse.c:1155 +#: builtin/pack-objects.c builtin/rev-parse.c #, c-format msgid "bad revision '%s'" msgstr "revisió incorrecta «%s»" -#: builtin/pack-objects.c:4210 +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" -#: builtin/pack-objects.c:4278 +#: builtin/pack-objects.c #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:4282 +#: builtin/pack-objects.c #, c-format msgid "bad index version '%s'" msgstr "versió d'índex incorrecta «%s»" -#: builtin/pack-objects.c:4338 +#: builtin/pack-objects.c 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:4341 +#: builtin/pack-objects.c 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:4342 +#: builtin/pack-objects.c msgid "[,]" msgstr "[,]" -#: builtin/pack-objects.c:4343 +#: builtin/pack-objects.c 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:4346 +#: builtin/pack-objects.c msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer empaquetat de sortida" -#: builtin/pack-objects.c:4348 +#: builtin/pack-objects.c msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes manllevats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:4350 +#: builtin/pack-objects.c msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:4352 +#: builtin/pack-objects.c msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:4354 +#: builtin/pack-objects.c 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:4356 +#: builtin/pack-objects.c 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:4358 +#: builtin/pack-objects.c msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:4360 +#: builtin/pack-objects.c msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:4362 +#: builtin/pack-objects.c msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:4364 +#: builtin/pack-objects.c msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millors coincidències de diferències" -#: builtin/pack-objects.c:4366 +#: builtin/pack-objects.c msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buit" -#: builtin/pack-objects.c:4368 +#: builtin/pack-objects.c msgid "read revision arguments from standard input" msgstr "llegeix els arguments de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:4370 +#: builtin/pack-objects.c msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes a aquells que encara no estan empaquetats" -#: builtin/pack-objects.c:4373 +#: builtin/pack-objects.c msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:4376 +#: builtin/pack-objects.c 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:4379 +#: builtin/pack-objects.c msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:4382 +#: builtin/pack-objects.c msgid "read packs from stdin" msgstr "llegeix els paquets des de stdin" -#: builtin/pack-objects.c:4384 +#: builtin/pack-objects.c msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:4386 +#: builtin/pack-objects.c 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:4388 +#: builtin/pack-objects.c msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:4390 +#: builtin/pack-objects.c msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:4392 +#: builtin/pack-objects.c msgid "unpack unreachable objects newer than