diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2020-05-18 01:26:05 (GMT) |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2020-05-18 01:26:24 (GMT) |
| commit | 3d5545ce167912107bd8a0f55884f43602f22d19 (patch) | |
| tree | 7f8309fac0520eda2a530abb4dbde4a66d963b27 | |
| parent | 0b214881c4341472d9be1e46362a5afa258008c5 (diff) | |
| parent | db7bfba9ad6e8ad9524027cd59898bd68b4b8321 (diff) | |
| download | git-3d5545ce167912107bd8a0f55884f43602f22d19.zip git-3d5545ce167912107bd8a0f55884f43602f22d19.tar.gz git-3d5545ce167912107bd8a0f55884f43602f22d19.tar.bz2 | |
Merge branch 'master' of github.com:Softcatala/git-po
* 'master' of github.com:Softcatala/git-po:
l10n: Update Catalan translation
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| -rw-r--r-- | po/ca.po | 5530 |
1 files changed, 2977 insertions, 2553 deletions
@@ -49,8 +49,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-12-30 08:48+0800\n" -"PO-Revision-Date: 2020-01-09 10:10+0100\n" +"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"PO-Revision-Date: 2020-05-10 10:46+0200\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -58,252 +58,530 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" -#: add-interactive.c:347 +#: add-interactive.c:368 #, c-format msgid "Huh (%s)?" msgstr "Perdó (%s)?" -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 -#: builtin/rebase.c:2019 builtin/rebase.c:2063 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 msgid "could not read index" msgstr "no s'ha pogut llegir l'índex" -#: add-interactive.c:555 git-add--interactive.perl:269 +#: add-interactive.c:576 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binari" -#: add-interactive.c:613 git-add--interactive.perl:278 +#: add-interactive.c:634 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "res" -#: add-interactive.c:614 git-add--interactive.perl:314 +#: add-interactive.c:635 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sense canvis" -#: add-interactive.c:651 git-add--interactive.perl:643 +#: add-interactive.c:672 git-add--interactive.perl:643 msgid "Update" msgstr "Actualitza" -#: add-interactive.c:668 add-interactive.c:856 +#: add-interactive.c:689 add-interactive.c:877 #, c-format msgid "could not stage '%s'" msgstr "no s'ha pogut fer «stage» «%s»" -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 -#: builtin/rebase.c:895 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 msgid "could not write index" msgstr "no s'ha pogut escriure l'índex" -#: add-interactive.c:677 git-add--interactive.perl:628 +#: add-interactive.c:698 git-add--interactive.perl:628 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: add-interactive.c:695 git-add--interactive.perl:678 +#: add-interactive.c:716 git-add--interactive.perl:678 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 #: builtin/reset.c:144 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí «%s»" -#: add-interactive.c:730 git-add--interactive.perl:655 +#: add-interactive.c:751 git-add--interactive.perl:655 msgid "Revert" msgstr "Reverteix" -#: add-interactive.c:746 +#: add-interactive.c:767 msgid "Could not parse HEAD^{tree}" msgstr "No s'ha pogut analitzar HEAD^{tree}" -#: add-interactive.c:784 git-add--interactive.perl:631 +#: add-interactive.c:805 git-add--interactive.perl:631 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camí\n" msgstr[1] "revertits %d camins\n" -#: add-interactive.c:835 git-add--interactive.perl:695 +#: add-interactive.c:856 git-add--interactive.perl:695 #, c-format msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: add-interactive.c:839 git-add--interactive.perl:689 +#: add-interactive.c:860 git-add--interactive.perl:689 msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: add-interactive.c:866 git-add--interactive.perl:625 +#: add-interactive.c:887 git-add--interactive.perl:625 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camí\n" msgstr[1] "afegits %d camins\n" -#: add-interactive.c:896 -#, c-format +#: add-interactive.c:917 +#, c-format msgid "ignoring unmerged: %s" msgstr "s'està ignorant allò no fusionat: %s" -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 #, c-format msgid "Only binary files changed.\n" msgstr "Només s'han canviat els fitxers binaris.\n" -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 #, c-format msgid "No changes.\n" msgstr "Sense canvis.\n" -#: add-interactive.c:914 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1376 msgid "Patch update" msgstr "Actualització del pedaç" -#: add-interactive.c:953 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1754 msgid "Review diff" msgstr "Reviseu les diferències" -#: add-interactive.c:981 +#: add-interactive.c:1002 msgid "show paths with changes" msgstr "mostra els camins amb canvis" -#: add-interactive.c:983 +#: add-interactive.c:1004 msgid "add working tree state to the staged set of changes" msgstr "" -#: add-interactive.c:985 +#: add-interactive.c:1006 msgid "revert staged set of changes back to the HEAD version" msgstr "" -#: add-interactive.c:987 +#: add-interactive.c:1008 msgid "pick hunks and update selectively" msgstr "selecciona els trossos i actualitza selectivament" -#: add-interactive.c:989 +#: add-interactive.c:1010 msgid "view diff between HEAD and index" msgstr "visualitza les diferències entre HEAD i l'índex" -#: add-interactive.c:991 +#: add-interactive.c:1012 msgid "add contents of untracked files to the staged set of changes" msgstr "" -#: add-interactive.c:999 add-interactive.c:1048 +#: add-interactive.c:1020 add-interactive.c:1069 msgid "Prompt help:" msgstr "Mostra ajuda:" -#: add-interactive.c:1001 +#: add-interactive.c:1022 msgid "select a single item" msgstr "seleccioneu un únic ítem" -#: add-interactive.c:1003 +#: add-interactive.c:1024 msgid "select a range of items" msgstr "seleccioneu un rang d'ítems" -#: add-interactive.c:1005 +#: add-interactive.c:1026 msgid "select multiple ranges" msgstr "seleccioneu rangs múltiples" -#: add-interactive.c:1007 add-interactive.c:1052 +#: add-interactive.c:1028 add-interactive.c:1073 msgid "select item based on unique prefix" msgstr "seleccioneu un ítem basant-se en un prefix únic" -#: add-interactive.c:1009 +#: add-interactive.c:1030 msgid "unselect specified items" msgstr "desselecciona els ítems especificats" -#: add-interactive.c:1011 +#: add-interactive.c:1032 msgid "choose all items" msgstr "escolliu tots els ítems" -#: add-interactive.c:1013 +#: add-interactive.c:1034 msgid "(empty) finish selecting" msgstr "(buit) finalitza la selecció" -#: add-interactive.c:1050 +#: add-interactive.c:1071 msgid "select a numbered item" msgstr "seleccioneu un ítem numerat" -#: add-interactive.c:1054 +#: add-interactive.c:1075 msgid "(empty) select nothing" msgstr "(buit) no seleccionis res" -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 msgid "What now" msgstr "I ara què" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "staged" msgstr "staged" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "unstaged" msgstr "unstaged" -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 msgid "path" msgstr "camí" -#: add-interactive.c:1122 +#: add-interactive.c:1143 msgid "could not refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "Adéu.\n" -#: add-patch.c:15 -#, c-format -msgid "Stage mode change [y,n,a,q,d%s,?]? " -msgstr "Canvia el mode de «stage» [y,n,a,q,d%s,?]? " +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-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:16 -#, c-format -msgid "Stage deletion [y,n,a,q,d%s,?]? " -msgstr "Suprimeix «stage» [y,n,a,q,d%s,?]? " +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:17 -#, c-format -msgid "Stage this hunk [y,n,a,q,d%s,?]? " -msgstr "Fer un «stage» d'aquest tros [y,n,a,q,d%s,?]? " +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «staging»." + +#: add-patch.c:40 +#, fuzzy +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - fes «stage» d'aquest tros\n" +"n - no facis «stage» d'aquest tros\n" +"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" +"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" +"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-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:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «stashing»." + +#: add-patch.c:61 +#, fuzzy +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - fes «stash» d'aquest tros\n" +"n - no facis «stash» d'aquest tros\n" +"q - surt; no facis «stash» d'aquest tros o de cap altre restant\n" +"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" +"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-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:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «unstaging»." + +#: add-patch.c:84 +#, fuzzy +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - fes «unstage» d'aquest tros\n" +"n - no facis «unstage» d'aquest tros\n" +"q - surt; no facis «unstage» d'aquest tros o de cap altre restant\n" +"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" +"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per aplicar-se." + +#: add-patch.c:106 +#, fuzzy +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplica aquest tros a l'índex\n" +"n - no apliquis aquest tros a l'índex\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per descartar-se." + +#: add-patch.c:128 add-patch.c:193 +#, fuzzy +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descarta aquest tros de l'arbre de treball\n" +"n - no descartis aquest tros des de l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +#, fuzzy +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descarta aquest tros de l'índex i de l'arbre de treball\n" +"n - no descartis aquest tros des de l'índex i de l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:171 +#, fuzzy +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplica aquest tros a l'índex i l'arbre de treball\n" +"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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" + +#: add-patch.c:214 +#, fuzzy +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplica aquest tros a l'arbre de treball\n" +"n - no apliquis aquest tros a l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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" -#: add-patch.c:111 +#: add-patch.c:318 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»" -#: add-patch.c:130 add-patch.c:134 +#: add-patch.c:337 add-patch.c:341 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" -#: add-patch.c:176 +#: add-patch.c:395 msgid "could not parse diff" msgstr "no s'ha pogut analitzar el diff" -#: add-patch.c:194 +#: add-patch.c:414 msgid "could not parse colored diff" msgstr "no s'ha pogut analitzar el diff acolorit" -#: add-patch.c:508 +#: add-patch.c:428 +#, fuzzy, c-format +msgid "failed to run '%s'" +msgstr "s'ha produït un error en desenllaçar «%s»" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:761 #, c-format msgid "" "expected context line #%d in\n" @@ -312,8 +590,7 @@ msgstr "" "s'esperava la línia amb contingut #%d a\n" "%.*s" - -#: add-patch.c:523 +#: add-patch.c:776 #, c-format msgid "" "hunks do not overlap:\n" @@ -322,12 +599,12 @@ msgid "" "%.*s" msgstr "" -#: add-patch.c:799 git-add--interactive.perl:1112 +#: add-patch.c:1052 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" -#: add-patch.c:803 +#: add-patch.c:1056 #, c-format msgid "" "---\n" @@ -340,16 +617,8 @@ msgstr "" "Per suprimir «%c» línies, suprimiu-les.\n" "Les línies que comencin per %c seran suprimides.\n" -#: add-patch.c:810 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging.\n" -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per «staging».\n" - #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:818 git-add--interactive.perl:1126 +#: add-patch.c:1070 git-add--interactive.perl:1126 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" @@ -360,11 +629,11 @@ msgstr "" "s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: add-patch.c:851 +#: add-patch.c:1103 msgid "could not parse hunk header" msgstr "no s'ha pogut analitzar la capçalera del tros" -#: add-patch.c:895 add-patch.c:1294 +#: add-patch.c:1148 msgid "'git apply --cached' failed" msgstr "" @@ -380,28 +649,27 @@ msgstr "" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:952 git-add--interactive.perl:1239 +#: add-patch.c:1218 git-add--interactive.perl:1239 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:1009 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this and all the remaining hunks\n" -"d - do not stage this hunk nor any of the remaining hunks\n" -msgstr "" -"y - fes «stage» d'aquest tros\n" -"n - no facis «stage» d'aquest tros\n" -"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" -"a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" -"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer\n" +#: add-patch.c:1261 +#, fuzzy +msgid "The selected hunks do not apply to the index!" +msgstr "Els trossos seleccionats no apliquen a l'índex\n" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "Voleu aplicar-los igualment a l'arbre de treball? " -#: add-patch.c:1016 +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "No s'ha aplicat res.\n" + +#: add-patch.c:1326 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -423,99 +691,104 @@ msgstr "" "e - edita manualment el tros actual\n" "? - mostra l'ajuda\n" -#: add-patch.c:1137 add-patch.c:1147 +#: add-patch.c:1447 add-patch.c:1457 msgid "No previous hunk" msgstr "Sense tros previ" -#: add-patch.c:1142 add-patch.c:1152 +#: add-patch.c:1452 add-patch.c:1462 msgid "No next hunk" msgstr "No hi ha tros següent" -#: add-patch.c:1158 +#: add-patch.c:1468 msgid "No other hunks to goto" msgstr "No hi ha altres trossos on anar-hi" -#: add-patch.c:1169 git-add--interactive.perl:1577 +#: add-patch.c:1479 git-add--interactive.perl:1577 msgid "go to which hunk (<ret> to see more)? " msgstr "vés a quin tros (<ret> per veure'n més)? " -#: add-patch.c:1170 git-add--interactive.perl:1579 +#: add-patch.c:1480 git-add--interactive.perl:1579 msgid "go to which hunk? " msgstr "vés a quin tros? " -#: add-patch.c:1181 +#: add-patch.c:1491 #, c-format msgid "Invalid number: '%s'" msgstr "Número no vàlid: «%s»" -#: add-patch.c:1186 +#: add-patch.c:1496 #, 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:1195 +#: add-patch.c:1505 msgid "No other hunks to search" msgstr "No hi ha cap altre tros a cercar" -#: add-patch.c:1201 git-add--interactive.perl:1623 +#: add-patch.c:1511 git-add--interactive.perl:1623 msgid "search for regex? " msgstr "cerca per expressió regular? " -#: add-patch.c:1216 +#: add-patch.c:1526 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Expressió regular de cerca mal formada %s: %s" -#: add-patch.c:1233 +#: add-patch.c:1543 msgid "No hunk matches the given pattern" msgstr "No hi ha trossos que coincideixin amb el patró donat" -#: add-patch.c:1240 +#: add-patch.c:1550 msgid "Sorry, cannot split this hunk" msgstr "No es pot dividir aquest tros" -#: add-patch.c:1244 +#: add-patch.c:1554 #, c-format msgid "Split into %d hunks." msgstr "Divideix en %d trossos." -#: add-patch.c:1248 +#: add-patch.c:1558 msgid "Sorry, cannot edit this hunk" msgstr "No es pot editar aquest tros" -#: advice.c:111 +#: add-patch.c:1609 +#, fuzzy +msgid "'git apply' failed" +msgstr "l'«stash» ha fallat" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%spista: %.*s%s\n" -#: advice.c:164 +#: advice.c:168 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:166 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:168 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:170 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:172 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:174 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No és possible %s perquè teniu fitxers sense fusionar." -#: advice.c:182 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -524,23 +797,23 @@ msgstr "" "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:190 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:195 builtin/merge.c:1332 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:197 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:198 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:204 +#: advice.c:208 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -789,7 +1062,7 @@ 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:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -797,284 +1070,284 @@ msgstr "" "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3170 +#: apply.c:3171 #, 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:3188 +#: apply.c:3189 #, 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:3201 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a «%s»" -#: apply.c:3207 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha " "rebut %s)" -#: apply.c:3228 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3351 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3411 +#: apply.c:3413 #, 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:3440 apply.c:3683 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3526 apply.c:3698 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: apply.c:3535 apply.c:3706 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: apply.c:3570 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." -#: apply.c:3573 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: apply.c:3589 apply.c:3593 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de «%s»" -#: apply.c:3605 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" -#: apply.c:3619 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" -#: apply.c:3624 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a «%s» netament.\n" -#: apply.c:3650 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3723 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1320 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: «%s»" -#: apply.c:3934 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: apply.c:3937 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3957 +#: apply.c:3959 #, 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:3962 +#: apply.c:3964 #, 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:3982 +#: apply.c:3984 #, 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:3986 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:4001 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4093 +#: apply.c:4095 #, 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:4100 +#: apply.c:4102 #, 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:4103 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4112 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'índex temporal" -#: apply.c:4122 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: apply.c:4260 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: apply.c:4294 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4300 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" -#: apply.c:4308 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: apply.c:4314 apply.c:4459 +#: apply.c:4316 apply.c:4461 #, 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:4357 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: apply.c:4361 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer «%s»" -#: apply.c:4431 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer «%s» mode %o" -#: apply.c:4529 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4537 +#: apply.c:4539 msgid "internal error" msgstr "error intern" -#: apply.c:4540 +#: apply.c:4542 #, 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:4551 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4573 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4577 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4696 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4704 +#: apply.c:4706 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4724 +#: apply.c:4726 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4881 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:4908 +#: apply.c:4910 #, 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:4914 apply.c:4929 +#: apply.c:4916 apply.c:4931 #, 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:4922 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1083,135 +1356,135 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4966 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4969 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4971 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "número" -#: apply.c:4972 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4975 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4977 +#: apply.c:4979 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:4981 +#: apply.c:4983 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:4983 +#: apply.c:4985 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:4985 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4987 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:4989 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4991 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4993 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:4996 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4998 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:5000 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:5005 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "acció" -#: apply.c:5007 +#: apply.c:5009 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:5010 apply.c:5013 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:5016 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:5018 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:5020 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5022 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:5025 +#: apply.c:5027 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:5028 +#: apply.c:5030 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:5030 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "arrel" -#: apply.c:5031 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" @@ -1234,7 +1507,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer" @@ -1275,8 +1548,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 @@ -1312,7 +1585,7 @@ msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "dipòsit" @@ -1351,17 +1624,17 @@ msgstr "Format d'arxiu desconegut «%s»" msgid "Argument not supported for format '%s': -%d" msgstr "Paràmetre no admès per al format «%s»: -%d" -#: archive-tar.c:125 archive-zip.c:350 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "no es pot transmetre el blob %s" -#: archive-tar.c:266 archive-zip.c:368 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:358 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "no es pot llegir «%s»" @@ -1390,12 +1663,12 @@ msgstr "el camí no és vàlid en UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s" -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: archive-zip.c:614 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>" @@ -1428,12 +1701,12 @@ msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió vàlid %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1442,7 +1715,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:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1451,7 +1724,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1460,7 +1733,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:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1471,7 +1744,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1483,36 +1756,36 @@ msgstr "" "%s.\n" "Continuem de totes maneres." -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1521,7 +1794,7 @@ msgstr "" "No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb paràmetres de camí incorrectes?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1531,7 +1804,7 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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" @@ -1552,10 +1825,10 @@ msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" @@ -1736,8 +2009,8 @@ msgstr "«%s» no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 -#: builtin/commit.c:811 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir «%s»" @@ -1807,13 +2080,13 @@ msgstr "no es pot crear «%s»" msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" @@ -1835,27 +2108,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1152 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: commit.c:1155 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s." -#: commit.c:1158 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: commit.c:1161 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: commit.c:1415 +#: commit.c:1417 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1866,113 +2139,113 @@ msgstr "" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" -#: commit-graph.c:130 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:195 +#: commit-graph.c:189 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" "la signatura del graf de comissions %X no coincideix amb la signatura %X" -#: commit-graph.c:202 +#: commit-graph.c:196 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la versió del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:209 +#: commit-graph.c:203 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "la versió del hash del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:232 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:243 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:286 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:350 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:360 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "la cadena del graf de comissions no coincideix" -#: commit-graph.c:407 +#: commit-graph.c:401 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:433 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "no es poden trobar tots els fitxers del graf de comissions" -#: commit-graph.c:564 commit-graph.c:624 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "posició de la comissió no vàlida. Probablement el graf de comissions està " "malmès" -#: commit-graph.c:585 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: commit-graph.c:858 builtin/am.c:1287 +#: commit-graph.c:852 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s" -#: commit-graph.c:1049 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "S'estan carregant comissions conegudes al graf de comissions" -#: commit-graph.c:1066 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "S'estan expandint les comissions abastables al graf de comissions" -#: commit-graph.c:1085 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "S'estan netejant les marques de comissions al graf de comissions" -#: commit-graph.c:1104 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "S'estan calculant els nombres de generació del graf de comissions" -#: commit-graph.c:1179 +#: commit-graph.c:1173 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet" msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets" -#: commit-graph.c:1192 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "error en afegir paquet %s" -#: commit-graph.c:1196 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "s'ha produït un error en obrir l'índex per «%s»" -#: commit-graph.c:1220 +#: commit-graph.c:1214 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" @@ -1981,151 +2254,151 @@ msgstr[0] "" msgstr[1] "" "S'estan cercant les comissions pel graf de comissions des de %d referències" -#: commit-graph.c:1240 +#: commit-graph.c:1234 #, c-format msgid "invalid commit object id: %s" msgstr "identificador d'objecte de comissió no vàlid: %s" -#: commit-graph.c:1255 +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "" "S'estan cercant les comissions pel graf de comissions entre els objectes " "empaquetats" -#: commit-graph.c:1270 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "S'estan comptant les comissions diferents al graf de comissions" -#: commit-graph.c:1300 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "S'estan cercant les vores addicionals al graf de comissions" -#: commit-graph.c:1346 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "" "s'ha produït un error en escriure el nombre correcte d'ids base del graf" -#: commit-graph.c:1379 midx.c:814 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear «%s»" -#: commit-graph.c:1451 +#: commit-graph.c:1445 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "S'està escrivint el graf de comissions en %d pas" msgstr[1] "S'està escrivint el graf de comissions en %d passos" -#: commit-graph.c:1492 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions" -#: commit-graph.c:1504 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions" -#: commit-graph.c:1524 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "" "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" -#: commit-graph.c:1635 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" -#: commit-graph.c:1646 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de comissió duplicat %s no esperat" -#: commit-graph.c:1670 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "S'està fusionant el graf de comissions" -#: commit-graph.c:1860 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "el format del graf de comissions no pot escriure %d comissions" -#: commit-graph.c:1871 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "massa comissions per escriure un graf" -#: commit-graph.c:1961 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el fitxer commit-graph (graf de comissions) té una suma de verificació " "incorrecta i probablement és corrupte" -#: commit-graph.c:1971 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1964 commit-graph.c:1979 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1988 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" "s'ha produït un error en analitzar la comissió %s del graf de comissions" -#: commit-graph.c:2006 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "S'estan verificant les comissions al graf de comissions" -#: commit-graph.c:2020 +#: commit-graph.c:2003 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2027 +#: commit-graph.c:2010 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2037 +#: commit-graph.c:2020 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2029 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2059 +#: commit-graph.c:2042 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2064 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2068 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2083 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2089 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2168,7 +2441,7 @@ msgstr "la clau no conté una secció: «%s»" msgid "key does not contain variable name: %s" msgstr "la clau no conté un nom de variable: «%s»" -#: config.c:406 sequencer.c:2530 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" @@ -2309,7 +2582,7 @@ msgstr "valor no vàlid per a %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" @@ -2334,105 +2607,105 @@ msgstr "no s'ha pogut resoldre el blob de configuració: «%s»" msgid "failed to parse %s" msgstr "s'ha produït un error en analitzar %s" -#: config.c:1745 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:2096 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:2266 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no vàlid: «%s»" -#: config.c:2311 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100" -#: config.c:2357 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres" -#: config.c:2359 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d" -#: config.c:2440 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "nom de secció no vàlid «%s»" -#: config.c:2472 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2501 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "no es pot escriure un nou fitxer de configuració %s" -#: config.c:2753 config.c:3077 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "no s'ha pogut blocar el fitxer de configuració %s" -#: config.c:2764 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "s'està obrint %s" -#: config.c:2799 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "patró no vàlid: %s" -#: config.c:2824 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "fitxer de configuració no vàlid %s" -#: config.c:2837 config.c:3090 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "ha fallat «fstat» a %s" -#: config.c:2848 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "no s'ha pogut fer «mmap» «%s»" -#: config.c:2857 config.c:3095 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "ha fallat chmod a %s" -#: config.c:2942 config.c:3192 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "no s'ha pogut escriure el fitxer de configuració «%s»" -#: config.c:2976 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: config.c:2978 builtin/remote.c:781 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar «%s»" -#: config.c:3068 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "nom de secció no vàlida: %s" -#: config.c:3235 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "falta el valor per «%s»" @@ -2599,19 +2872,19 @@ msgstr "s'ha bloquejat el nom de fitxer estrany «%s»" msgid "unable to fork" msgstr "no s'ha pogut bifurcar" -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" -#: connected.c:101 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "No s'ha pogut executar 'git rev-list'" -#: connected.c:121 +#: connected.c:130 msgid "failed write to rev-list" msgstr "escriptura fallada al rev-list" -#: connected.c:128 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" @@ -2925,7 +3198,7 @@ msgid "invalid --stat value: %s" msgstr "valor --stat no vàlid: %s" #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:199 parse-options.c:203 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numèric" @@ -3315,7 +3588,9 @@ msgstr "Altres opcions diff" #: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els camins relatius" +msgstr "" +"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els " +"camins relatius" #: diff.c:5462 msgid "treat all files as text" @@ -3438,61 +3713,61 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:554 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui" -#: dir.c:664 +#: dir.c:695 dir.c:724 dir.c:737 #, c-format msgid "unrecognized pattern: '%s'" msgstr "patró no reconegut: «%s»" -#: dir.c:682 dir.c:696 +#: dir.c:754 dir.c:768 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patró negatiu no reconegut: «%s»" -#: dir.c:714 +#: dir.c:786 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:724 +#: dir.c:796 msgid "disabling cone pattern matching" msgstr "inhabilita la coincidència de patrons «cone»" -#: dir.c:1101 +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "no es pot usar %s com a fitxer d'exclusió" -#: dir.c:2078 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "no s'ha pogut obrir el directori «%s»" -#: dir.c:2415 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:2539 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "" "la memòria cau no seguida està inhabilitada en aquest sistema o ubicació" -#: dir.c:3343 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "el fitxer d'índex al dipòsit %s és malmès" -#: dir.c:3388 dir.c:3393 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "no s'han pogut crear directoris per %s" -#: dir.c:3422 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" @@ -3738,7 +4013,7 @@ msgstr "s'ha produït un error en processar les referències desitjades: %d" msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1785 builtin/clone.c:688 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" @@ -3752,19 +4027,19 @@ msgstr "no existeix la referència remota %s" msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" -#: gpg-interface.c:223 +#: gpg-interface.c:408 +msgid "gpg failed to sign the data" +msgstr "gpg ha fallat en signar les dades" + +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:226 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produït un error en escriure la signatura separada a «%s»" -#: gpg-interface.c:390 -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" - #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -3776,18 +4051,18 @@ msgid "" "with -P under PCRE v2" msgstr "" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: no s'ha pogut llegir %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "«%s»: lectura curta" @@ -4009,7 +4284,7 @@ msgstr "nom d'identitat buit (per <%s>) no és permès" msgid "name consists only of disallowed characters: %s" msgstr "el nom conté només caràcters no permesos: %s" -#: ident.c:436 builtin/commit.c:631 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" @@ -4094,114 +4369,114 @@ msgstr "No s'ha pogut crear «%s.lock»: %s" msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 -#: builtin/stash.c:264 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(comissió errònia)\n" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió." -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha produït un error en crear el camí «%s»%s" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a «%s»" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s «%s»" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s «%s»" -#: merge-recursive.c:1199 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)" -#: merge-recursive.c:1206 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)" -#: merge-recursive.c:1213 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (les comissions no " "segueixen merge-base)" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avançament ràpid del submòdul %s a la següent comissió:" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avançament ràpid al submòdul %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1263 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)" -#: merge-recursive.c:1264 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4212,35 +4487,35 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1276 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples " "fusions)" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1410 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha " "escrit a %s." -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4249,7 +4524,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4258,7 +4533,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre." -#: merge-recursive.c:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4267,7 +4542,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4276,46 +4551,46 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "S'està refusant a perdre el fitxer brut a %s" -#: merge-recursive.c:1624 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig " "de l'operació." -#: merge-recursive.c:1682 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit " "%s a %s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1718 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -"s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint " +"S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint " "com a %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4324,18 +4599,18 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca " "«%s» canvi de nom «%s»->«%s» en «%s»%s" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1851 +#: merge-recursive.c:1793 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:2114 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4343,21 +4618,21 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2146 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2156 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2248 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4366,7 +4641,7 @@ msgstr "" "CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de " "nom de directori %s->%s en %s" -#: merge-recursive.c:2493 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4375,134 +4650,134 @@ msgstr "" "AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell " "mateix ja havia canviat de nom." -#: merge-recursive.c:3019 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:3022 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modify" msgstr "modificació" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modified" msgstr "modificat" -#: merge-recursive.c:3098 +#: merge-recursive.c:3040 msgid "content" msgstr "contingut" -#: merge-recursive.c:3102 +#: merge-recursive.c:3044 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:3125 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:3147 git-submodule.sh:993 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:3148 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:3261 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3264 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3268 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3271 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3385 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:3408 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:3413 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:3420 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " "%s" -#: merge-recursive.c:3429 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:3438 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Ja està al dia!" -#: merge-recursive.c:3491 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:3595 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "S'està fusionant:" -#: merge-recursive.c:3608 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:3658 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:3717 +#: merge-recursive.c:3659 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4511,12 +4786,12 @@ msgstr "" "Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" " %s" -#: merge-recursive.c:3814 +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte «%s»" -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -4748,27 +5023,32 @@ msgstr "l'objecte %s té un identificador de tipus %d desconegut" msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1888 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" -#: packfile.c:1892 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, fuzzy, c-format +msgid "unable to get size of %s" +msgstr "no s'ha pogut moure %s a %s" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4784,7 +5064,7 @@ msgstr "%s és incompatible amb %s" msgid "%s : incompatible with something else" msgstr "%s: és incompatible amb alguna altra cosa" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s no accepta cap valor" @@ -4794,41 +5074,41 @@ msgstr "%s no accepta cap valor" msgid "%s isn't available" msgstr "%s no és disponible" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:860 +#: parse-options.c:857 #, c-format msgid "unknown option `%s'" msgstr "opció desconeguda «%s»" -#: parse-options.c:862 +#: parse-options.c:859 #, c-format msgid "unknown switch `%c'" msgstr "«switch» «%c» desconegut" -#: parse-options.c:864 +#: parse-options.c:861 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opció no ascii desconeguda en la cadena: «%s»" -#: parse-options.c:888 +#: parse-options.c:885 msgid "..." msgstr "..." -#: parse-options.c:907 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "ús: %s" @@ -4836,21 +5116,21 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:916 +#: parse-options.c:913 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:952 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:969 +#: parse-options.c:966 #, c-format msgid "alias of --%s" msgstr "àlies de --%s" @@ -4938,27 +5218,27 @@ msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» i «glob» són incompatibles" #: pathspec.c:442 -#, c-format -msgid "%s: '%s' is outside repository" +#, fuzzy, c-format +msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: «%s» és fora del dipòsit" -#: pathspec.c:516 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (mnemònic: «%c»)" -#: pathspec.c:526 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" -#: pathspec.c:593 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic" -#: pathspec.c:638 +#: pathspec.c:639 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -5046,7 +5326,7 @@ msgstr "no s'ha pogut iniciar «log»" msgid "could not read `log` output" msgstr "no s'ha pogut llegir la sortida de «log»" -#: range-diff.c:96 sequencer.c:5163 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" @@ -5100,16 +5380,16 @@ msgstr "no s'ha pogut afegir «%s» a l'índex" msgid "unable to stat '%s'" msgstr "no s'ha pogut fer «stat» a «%s»" -#: read-cache.c:1325 +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "«%s» apareix com a fitxer i com a directori" -#: read-cache.c:1531 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Actualitza l'índex" -#: read-cache.c:1646 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5118,7 +5398,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1656 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5127,151 +5407,161 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1712 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "signatura malmesa 0x%08x" -#: read-cache.c:1715 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "versió d'índex incorrecta %d" -#: read-cache.c:1724 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "signatura sha1 malmesa al fitxer d'índex" -#: read-cache.c:1754 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'índex usa l'extensió %.4s, que no es pot entendre" -#: read-cache.c:1756 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "s'està ignorant l'extensió %.4s" -#: read-cache.c:1793 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrada d'índex desconeguda «0x%08x»" -#: read-cache.c:1809 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "camp del nom mal formatat l'index, camí a prop «%s»" -#: read-cache.c:1866 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1869 +#: read-cache.c:1874 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nom d'identitat buit (per <%s>) no és permès" -#: read-cache.c:1872 +#: read-cache.c:1877 #, fuzzy, c-format msgid "unordered stage entries for '%s'" msgstr "no s'han pogut crear directoris per %s" -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: read-cache.c:2119 +#: read-cache.c:2124 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2132 +#: read-cache.c:2137 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2165 +#: read-cache.c:2170 #, fuzzy, c-format msgid "%s: index file open failed" msgstr "%s: s'ha produït un error en actualitzar els fitxers" -#: read-cache.c:2169 +#: read-cache.c:2174 #, fuzzy, c-format msgid "%s: cannot stat the open index" msgstr "no es pot llegir l'índex" -#: read-cache.c:2173 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: fitxer d'índex més petit que s'esperava" -#: read-cache.c:2177 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: no es pot mapar el fitxer d'índex" -#: read-cache.c:2219 +#: read-cache.c:2224 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2246 +#: read-cache.c:2251 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2278 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "no s'ha pogut refrescar l'índex compartit «%s»" -#: read-cache.c:2325 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s" -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" -#: read-cache.c:3137 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:3149 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaçar: %s" -#: read-cache.c:3174 +#: read-cache.c:3179 #, fuzzy, c-format msgid "cannot fix permission bits on '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: read-cache.c:3323 +#: read-cache.c:3328 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" msgstr "no es pot canviar de directori a %s" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" +"continue'.\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està " +"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està " "ignorant." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 #, fuzzy msgid "" "\n" @@ -5307,14 +5597,14 @@ msgstr "" "\n" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, fuzzy, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5323,7 +5613,7 @@ msgstr "" "No elimineu cap línia. Useu «drop» explícitament per a eliminar una " "comissió.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5331,7 +5621,7 @@ msgstr "" "\n" "Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5345,7 +5635,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5355,22 +5645,19 @@ msgstr "" "No obstant, si elimineu tot, s'avortarà el «rebase».\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Tingueu en compte que les comissions buides estan comentades" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure «%s»" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "no s'ha pogut copiar «%s» a «%s»." +msgid "could not write '%s'." +msgstr "no s'ha pogut escriure a «%s»." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5380,7 +5667,7 @@ msgstr "" "accidentalment.\n" "Les comissions descartades (més nova a més vella):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5397,6 +5684,13 @@ msgstr "" "d'advertències.\n" "Els comportaments possibles són: ignore, warn, error.\n" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "no s'ha pogut llegir «%s»." + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5432,15 +5726,15 @@ msgstr "la referència «%s» ja existeix" msgid "unexpected object ID when writing '%s'" msgstr "ID d'objecte no esperat en escriure «%s»" -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 #: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1031 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" @@ -5494,18 +5788,18 @@ msgstr "«%s» existeix; no es pot crear «%s»" msgid "cannot process '%s' and '%s' at the same time" msgstr "no es poden processar «%s» i «%s» a la vegada" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "no s'han pogut suprimir les referències: %s" @@ -5769,45 +6063,45 @@ msgstr "l'opció «%s» ha d'apuntar a una comissió" msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:413 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:421 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:611 +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:615 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:619 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:687 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:697 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1003 +#: remote.c:1004 #, fuzzy, c-format msgid "src refspec %s does not match any" msgstr "%s: no coincideix amb l'índex" -#: remote.c:1008 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5816,7 +6110,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1023 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5830,7 +6124,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1043 +#: remote.c:1044 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5838,7 +6132,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1048 +#: remote.c:1049 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5846,7 +6140,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1053 +#: remote.c:1054 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5854,7 +6148,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1058 +#: remote.c:1059 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5862,115 +6156,115 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1094 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "«%s» no es pot resoldre a una branca" -#: remote.c:1105 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix" -#: remote.c:1117 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1124 +#: remote.c:1125 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1627 remote.c:1728 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1636 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "no existeix la branca: «%s»" -#: remote.c:1639 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca «%s»" -#: remote.c:1645 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1660 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot" -#: remote.c:1672 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca «%s» no té cap remot al qual pujar" -#: remote.c:1682 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de «%s» no inclouen «%s»" -#: remote.c:1695 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és «nothing)" -#: remote.c:1717 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destí" -#: remote.c:1843 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "no s'ha pogut trobar la referència remota %s" -#: remote.c:1856 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2019 +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en «%s», però la font no hi és.\n" -#: remote.c:2023 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2026 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca està al dia amb «%s».\n" -#: remote.c:2030 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n" -#: remote.c:2033 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2037 +#: remote.c:2038 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n" msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n" -#: remote.c:2043 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2046 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5982,11 +6276,11 @@ msgstr[1] "" "La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-" "se ràpidament.\n" -#: remote.c:2054 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n" -#: remote.c:2057 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6001,11 +6295,11 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2067 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n" -#: remote.c:2250 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no es pot analitzar el nom de l'objecte esperat «%s»" @@ -6020,7 +6314,7 @@ msgstr "nom de la referència reemplaçada incorrecte: %s" msgid "duplicate replace ref: %s" msgstr "duplica les referències reemplaçades: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s" @@ -6044,7 +6338,7 @@ msgid "failed to flush '%s'" msgstr "s'ha produït un error en fer stat a «%s»" #: rerere.c:503 rerere.c:1039 -#, c-format +#, c-format msgid "could not parse conflict hunks in '%s'" msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»" @@ -6083,8 +6377,8 @@ msgstr "no es pot fer symlink en «%s» «%s»" msgid "Recorded preimage for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" @@ -6135,16 +6429,16 @@ msgstr "--first-parent és incompatible amb --bisect" msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»" -#: run-command.c:762 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:1268 -#, c-format +#: run-command.c:1269 +#, c-format msgid "cannot create async thread: %s" msgstr "no s'ha pogut crear fil «async»: %s" -#: run-command.c:1332 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6191,39 +6485,40 @@ msgstr "el destí receptor no admet pujar --atomic" msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:189 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja «%s» no vàlid en la comissió del missatge" -#: sequencer.c:294 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: sequencer.c:323 +#: sequencer.c:325 msgid "revert" msgstr "revertir" -#: sequencer.c:325 +#: sequencer.c:327 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:327 -msgid "rebase -i" +#: sequencer.c:329 +#, fuzzy +msgid "rebase" msgstr "rebase -i" -#: sequencer.c:329 +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "acció desconeguda: %d" -#: sequencer.c:387 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6231,7 +6526,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add <camins>' o 'git rm <camins>'" -#: sequencer.c:390 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6241,114 +6536,110 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:403 sequencer.c:2993 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" -#: sequencer.c:410 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a «%s»" -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 -#: sequencer.c:3277 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "s'ha produït un error en finalitzar «%s»" -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 -#: builtin/rebase.c:589 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" -#: sequencer.c:464 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:468 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#: sequencer.c:500 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" -#: sequencer.c:539 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:633 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:650 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: sequencer.c:664 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: sequencer.c:744 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "no hi ha una clau a «%.*s»" -#: sequencer.c:755 +#: sequencer.c:757 #, fuzzy, c-format msgid "unable to dequote value of '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: sequencer.c:802 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»" -#: sequencer.c:807 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»" -#: sequencer.c:812 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»" -#: sequencer.c:816 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "variable «%s» desconeguda" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta «GIT_AUTHOR_NAME»" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta «GIT_AUTHOR_EMAIL»" -#: sequencer.c:825 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta «GIT_AUTHOR_DATE»" -#: sequencer.c:902 sequencer.c:1427 -msgid "malformed ident line" -msgstr "línia d'identitat mal formada" - -#: sequencer.c:925 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6378,11 +6669,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1218 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam «prepare-commit-msg» ha fallat" -#: sequencer.c:1224 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6409,7 +6700,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1237 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6435,350 +6726,345 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1279 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: sequencer.c:1281 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: sequencer.c:1327 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD després de crear la comissió" -#: sequencer.c:1329 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1333 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (comissió arrel)" -#: sequencer.c:1354 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1356 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no és una comissió!" -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: sequencer.c:1411 sequencer.c:2055 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissió" -#: sequencer.c:1431 -msgid "corrupted author without date information" -msgstr "autor malmès sense informació de data" - -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1480 sequencer.c:1550 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»" -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:1577 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: sequencer.c:1582 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissió pare %s" -#: sequencer.c:1656 sequencer.c:1767 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:1714 sequencer.c:1739 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:1724 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1726 sequencer.c:3304 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1728 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:1734 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure «%s»" -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:1749 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:1756 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:1762 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:1850 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:1857 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "no es pot arreglar la comissió arrel" -#: sequencer.c:1876 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:1884 sequencer.c:1892 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:1898 +#: sequencer.c:1804 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1917 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1982 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -#: sequencer.c:2037 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:2038 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:2105 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:2112 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:2189 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta paràmetres: «%s»" -#: sequencer.c:2198 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "falten els arguments per %s" -#: sequencer.c:2235 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" -msgstr "no s'ha pogut analitzar «%.*s»" +msgid "could not parse '%s'" +msgstr "no s'ha pogut analitzar «%s»" -#: sequencer.c:2289 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:2300 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no es pot «%s» sense una comissió prèvia" -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 -#: builtin/rebase.c:223 builtin/rebase.c:248 -#, c-format -msgid "could not read '%s'." -msgstr "no s'ha pogut llegir «%s»." - -#: sequencer.c:2384 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "s'està cancel·lant un «cherry pick» en curs" -#: sequencer.c:2391 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "s'està cancel·lant la reversió en curs" -#: sequencer.c:2435 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant «git rebase --edit-todo»." -#: sequencer.c:2437 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: «%s»" -#: sequencer.c:2442 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:2453 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:2455 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:2533 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:2630 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "«squash-onto» no usable" -#: sequencer.c:2646 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: «%s»" -#: sequencer.c:2736 sequencer.c:4463 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:2752 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "una reversió ja està en curs" -#: sequencer.c:2754 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenteu «git revert (--continue | %s--abort | --quit)»" -#: sequencer.c:2757 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "un «cherry pick» ja està en curs" -#: sequencer.c:2759 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»" -#: sequencer.c:2773 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -#: sequencer.c:2788 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2848 sequencer.c:4209 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2850 sequencer.c:2861 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2852 sequencer.c:2896 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:2882 builtin/grep.c:736 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: sequencer.c:2884 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir «%s»: %s" -#: sequencer.c:2885 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2891 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès" -#: sequencer.c:2902 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:2943 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "no hi ha cap reversió en curs" -#: sequencer.c:2951 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "ni hi ha cap «cherry pick» en curs" -#: sequencer.c:2961 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "s'ha produït un error en ometre la comissió" -#: sequencer.c:2968 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "no hi ha res a ometre" -#: sequencer.c:2971 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3095 sequencer.c:4121 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "no s'ha pogut actualitzar %s" -#: sequencer.c:3134 sequencer.c:4101 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "no es pot llegir HEAD" -#: sequencer.c:3151 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3159 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6797,22 +7083,22 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3169 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "No s'ha pogut aplicar %s... %.*s" -#: sequencer.c:3176 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "No s'ha pogut fusionar %.*s" -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3221 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -6827,11 +7113,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3227 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:3233 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -6847,72 +7133,72 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3294 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permès: «%.*s»" -#: sequencer.c:3348 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "s'està escrivint una comissió arrel falsa" -#: sequencer.c:3353 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "s'està escrivint «squash-onto»" -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "s'ha produït un error en cercar l'arbre de %s" -#: sequencer.c:3436 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: sequencer.c:3467 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "no es pot fusionar sense una revisió actual" -#: sequencer.c:3489 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:3498 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "no hi ha res per fusionar «%.*s»" -#: sequencer.c:3510 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3526 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "no s'ha pogut llegir el missatge de comissió de «%s»" -#: sequencer.c:3688 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no s'ha pogut fusionar «%.*s»" -#: sequencer.c:3704 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:3773 builtin/rebase.c:733 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el «stash» automàticament.\n" -#: sequencer.c:3785 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6923,31 +7209,26 @@ msgstr "" "Els vostres canvis estan segurs en el «stash».\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:3849 -#, c-format -msgid "could not checkout %s" -msgstr "no es pot agafar %s" - -#: sequencer.c:3863 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s: no és un OID vàlid" -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: sequencer.c:3883 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "Aturat a HEAD\n" -#: sequencer.c:3885 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "Aturat a %s\n" -#: sequencer.c:3893 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -6960,48 +7241,48 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3979 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:4109 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "no s'ha pogut llegir orig-head" -#: sequencer.c:4114 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:4128 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:4221 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:4230 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:4232 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: «%s»" -#: sequencer.c:4234 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: «%s»" -#: sequencer.c:4237 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7011,68 +7292,59 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Cometeu-los primer i després executeu «git rebase --continue» de nou." -#: sequencer.c:4273 sequencer.c:4312 -#, c-format +#: sequencer.c:4163 sequencer.c:4202 +#, c-format msgid "could not write file: '%s'" msgstr "no s'ha pogut escriure el fitxer: «%s»" -#: sequencer.c:4327 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4334 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "no s'han pogut cometre els canvis «staged»." -#: sequencer.c:4440 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:4444 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s: revisió incorrecta" -#: sequencer.c:4479 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: sequencer.c:4952 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:4955 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produït un error en preparar les revisions" -#: sequencer.c:5113 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" -"continue'.\n" - -#: sequencer.c:5226 sequencer.c:5243 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "res a fer" -#: sequencer.c:5257 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "no s'han pogut ometre les ordres «picks» no necessàries" -#: sequencer.c:5351 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." #: setup.c:124 -#, c-format -msgid "'%s' is outside repository" +#, fuzzy, c-format +msgid "'%s' is outside repository at '%s'" msgstr "«%s» és fora del dipòsit" -#: setup.c:174 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7082,7 +7354,7 @@ msgstr "" "Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin " "localment." -#: setup.c:187 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7094,12 +7366,12 @@ msgstr "" "Useu «--» per a separar els camins de les revisions:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:236 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "l'opció «%s» ha de venir abans dels arguments opcionals" -#: setup.c:255 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7110,94 +7382,94 @@ msgstr "" "Useu '--' per a separar els camins de les revisions:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:391 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "" "no s'ha pogut configurar un arbre de treball utilitzant una configuració no " "vàlida" -#: setup.c:395 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" -#: setup.c:541 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:549 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:568 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: setup.c:570 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "massa larg per a ser un fitxer .git: «%s»" -#: setup.c:572 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "error en llegir %s" -#: setup.c:574 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "format gitfile no vàlid: %s" -#: setup.c:576 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "sense camí al gitfile: %s" -#: setup.c:578 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "no és un dipòsit de git: %s" -#: setup.c:677 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "«$%s» massa gran" -#: setup.c:691 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "no és un dipòsit de git: «%s»" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "no es pot canviar de directori a «%s»" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "no es pot tornar al directori de treball actual" -#: setup.c:852 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "s'ha produït un error en fer stat a «%*s%s%s»" -#: setup.c:1090 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1099 setup.c:1105 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "no es pot canviar a «%s»" -#: setup.c:1110 +#: setup.c:1128 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:1116 +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7207,7 +7479,7 @@ msgstr "" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:1227 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7218,22 +7490,23 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: setup.c:1271 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "s'ha produït un error en obrir /dev/null o dup" -#: setup.c:1286 +#: setup.c:1304 msgid "fork failed" msgstr "el «fork» ha fallat" -#: setup.c:1291 +#: setup.c:1309 msgid "setsid failed" msgstr "l'«stash» ha fallat" #: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates" +msgstr "" +"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates" #: sha1-file.c:503 #, c-format @@ -7292,7 +7565,8 @@ msgstr "el dipòsit de referència «%s» és empeltat" #: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" -msgstr "línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s" +msgstr "" +"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s" #: sha1-file.c:943 #, c-format @@ -7308,198 +7582,198 @@ msgstr "mmap ha fallat" msgid "object file %s is empty" msgstr "el tipus d'objecte %s és buit" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1263 sha1-file.c:2443 #, fuzzy, c-format msgid "corrupt loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1265 sha1-file.c:2447 #, fuzzy, c-format msgid "garbage at end of loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:1296 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "tipus d'objecte és incorrecte" -#: sha1-file.c:1380 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type" -#: sha1-file.c:1383 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "no s'ha pogut desempaquetar la capçalera %s" -#: sha1-file.c:1389 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type" -#: sha1-file.c:1392 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "no s'ha pogut analitzar la capçalera %s" -#: sha1-file.c:1584 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "s'ha produït un error en llegir l'objecte %s" -#: sha1-file.c:1588 +#: sha1-file.c:1633 #, fuzzy, c-format msgid "replacement %s not found for %s" msgstr "no s'han trobat les plantilles %s" -#: sha1-file.c:1592 +#: sha1-file.c:1637 #, fuzzy, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1596 +#: sha1-file.c:1641 #, fuzzy, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1699 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "no s'ha pogut escriure al fitxer %s" -#: sha1-file.c:1706 +#: sha1-file.c:1753 #, fuzzy, c-format msgid "unable to set permission to '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: sha1-file.c:1713 +#: sha1-file.c:1760 msgid "file write error" msgstr "s'ha produït un error en escriure al fitxer" -#: sha1-file.c:1732 +#: sha1-file.c:1780 #, fuzzy msgid "error when closing loose object file" msgstr "error en tancar el fitxer de paquet" -#: sha1-file.c:1797 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1799 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "no s'ha pogut crear un fitxer temporal" -#: sha1-file.c:1823 +#: sha1-file.c:1871 #, fuzzy msgid "unable to write loose object file" msgstr "no s'ha pogut escriure l'objecte de nota" -#: sha1-file.c:1829 +#: sha1-file.c:1877 #, fuzzy, c-format msgid "unable to deflate new object %s (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: sha1-file.c:1833 +#: sha1-file.c:1881 #, fuzzy, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ha fallat fstat a %s" -#: sha1-file.c:1837 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, fuzzy, c-format msgid "failed utime() on %s" msgstr "s'ha produït un error en obrir «%s»" -#: sha1-file.c:1922 +#: sha1-file.c:1972 #, fuzzy, c-format msgid "cannot read object for %s" msgstr "no es pot llegir l'objecte %s" -#: sha1-file.c:1962 +#: sha1-file.c:2011 #, fuzzy msgid "corrupt commit" msgstr "autor corregit de la comissió" -#: sha1-file.c:1970 +#: sha1-file.c:2019 #, fuzzy msgid "corrupt tag" msgstr "informa de les etiquetes" -#: sha1-file.c:2069 +#: sha1-file.c:2119 #, fuzzy, c-format msgid "read error while indexing %s" msgstr "error en llegir %s" -#: sha1-file.c:2072 +#: sha1-file.c:2122 #, fuzzy, c-format msgid "short read while indexing %s" msgstr "no es pot llegir l'índex" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2195 sha1-file.c:2205 #, fuzzy, c-format msgid "%s: failed to insert into database" msgstr "gpg ha fallat en signar les dades" -#: sha1-file.c:2160 +#: sha1-file.c:2211 #, fuzzy, c-format msgid "%s: unsupported file type" msgstr "versió d'índex no compatible %s" -#: sha1-file.c:2184 +#: sha1-file.c:2235 #, fuzzy, c-format msgid "%s is not a valid object" msgstr "«%s» no és una terme vàlid" -#: sha1-file.c:2186 +#: sha1-file.c:2237 #, fuzzy, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de «%s» vàlid" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "no coincideix la suma per a %s (s'esperava %s)" -#: sha1-file.c:2427 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "no s'ha pogut fer «mmap» %s" -#: sha1-file.c:2432 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "no s'ha pogut desempaquetar la capçalera de %s" -#: sha1-file.c:2438 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "no s'ha pogut analitzar la capçalera de %s" -#: sha1-file.c:2449 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "no s'han pogut desempaquetar els continguts de %s" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1-name.c:797 +#: sha1-name.c:796 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7523,44 +7797,107 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "«git config advice.objectNameWarning false»" +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: sha1-name.c:1689 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "L'especificació «%s» és en el submòdul «%.*s»" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1704 +#, fuzzy, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "el camí «%s» no existeix" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" + +#: sha1-name.c:1756 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1758 +#, fuzzy, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "el camí «%s» no té la seva versió" + +#: sha1-name.c:1771 +#, fuzzy +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"El camí relatiu només es pot usar des del nivell superior de l'arbre de " +"treball" + +#: sha1-name.c:1909 +#, fuzzy, c-format +msgid "invalid object name '%.*s'." +msgstr "No és un nom d'objecte vàlid: «%s»" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:822 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7568,14 +7905,14 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1149 +#: strbuf.c:1164 #, c-format msgid "could not edit '%s'" msgstr "no s'ha pogut editar «%s»" @@ -7610,56 +7947,122 @@ msgstr "al submòdul sense popular «%s»" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "L'especificació «%s» és en el submòdul «%.*s»" +#: submodule.c:434 +#, fuzzy, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "paràmetre --color-moved incorrecte: %s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 +#: submodule.c:995 +#, fuzzy, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" + +#: submodule.c:1118 +#, fuzzy, c-format +msgid "process for submodule '%s' failed" +msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." -#: submodule.c:1481 -#, c-format -msgid "Could not access submodule '%s'" +#: submodule.c:1158 +#, fuzzy, c-format +msgid "Pushing submodule '%s'\n" +msgstr "S'està ometent el submòdul «%s»" + +#: submodule.c:1161 +#, fuzzy, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "No s'ha pogut agafar el submòdul '$sm_path'" + +#: submodule.c:1453 +#, fuzzy, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Avançament ràpid al submòdul %s" + +#: submodule.c:1483 +#, fuzzy, c-format +msgid "Could not access submodule '%s'\n" msgstr "no s'ha pogut accedir al submòdul «%s»" -#: submodule.c:1651 +#: submodule.c:1637 +#, fuzzy, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "Avançament ràpid al submòdul %s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» no reconegut com un dipòsit git" -#: submodule.c:1789 +#: submodule.c:1679 +#, fuzzy, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" + +#: submodule.c:1720 +#, fuzzy, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" -#: submodule.c:1817 +#: submodule.c:1828 #, fuzzy, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" -#: submodule.c:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" + +#: submodule.c:1876 +#, fuzzy +msgid "could not reset submodule index" +msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "el submòdul «%s» té l'índex brut" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "No s'ha pogut actualitzar el submòdul «%s»" -#: submodule.c:2027 +#: submodule.c:2038 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2048 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7667,17 +8070,17 @@ msgstr "" "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de " "treball" -#: submodule.c:2060 submodule.c:2119 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul «%s»" -#: submodule.c:2064 +#: submodule.c:2075 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2071 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7688,16 +8091,11 @@ msgstr "" "«%s» a\n" "«%s»\n" -#: submodule.c:2154 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" - -#: submodule.c:2198 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:2237 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" @@ -7721,7 +8119,7 @@ msgstr "" msgid "invalid value for %s" msgstr "valor no vàlid per a %s" -#: submodule-config.c:769 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" @@ -7737,7 +8135,7 @@ msgstr "l'execució de l'ordre de remolc «%s» ha fallat" msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut «%s» per a la clau «%s»" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "més d'un %s" @@ -7870,7 +8268,7 @@ msgstr "S'està avortant." msgid "failed to push all needed submodules" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: transport.c:1345 transport-helper.c:656 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "opció no admesa pel protocol" @@ -7884,7 +8282,7 @@ msgstr "imprimeix l'estat des de l'ajudant remot" msgid "unable to find remote helper for '%s'" msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»" -#: transport-helper.c:160 transport-helper.c:570 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "" @@ -7899,172 +8297,167 @@ msgstr "" msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:284 transport-helper.c:425 #, fuzzy, c-format msgid "%s unexpectedly said: '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:413 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s també ha bloquejat %s" -#: transport-helper.c:492 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "no s'ha pogut executar «fast-import»" -#: transport-helper.c:515 +#: transport-helper.c:516 #, fuzzy msgid "error while running fast-import" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:544 transport-helper.c:1133 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "no s'ha pogut llegir la referència %s" -#: transport-helper.c:589 +#: transport-helper.c:590 #, fuzzy, c-format msgid "unknown response to connect: %s" msgstr "opció desconeguda: %s\n" -#: transport-helper.c:611 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:613 +#: transport-helper.c:614 #, fuzzy msgid "invalid remote service path" msgstr "referència no vàlida: %s" -#: transport-helper.c:659 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "no es pot connectar al subservei %s" -#: transport-helper.c:735 +#: transport-helper.c:736 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:788 +#: transport-helper.c:789 #, fuzzy, c-format msgid "helper reported unexpected status of %s" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: transport-helper.c:849 +#: transport-helper.c:850 #, fuzzy, c-format msgid "helper %s does not support dry-run" msgstr "El servidor no admet --deepen" -#: transport-helper.c:852 +#: transport-helper.c:853 #, fuzzy, c-format msgid "helper %s does not support --signed" msgstr "El servidor no admet --shallow-since" -#: transport-helper.c:855 +#: transport-helper.c:856 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" msgstr "el destí receptor no admet pujar --signed" -#: transport-helper.c:860 +#: transport-helper.c:861 #, fuzzy, c-format msgid "helper %s does not support --atomic" msgstr "El servidor no admet --shallow-since" -#: transport-helper.c:866 +#: transport-helper.c:867 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" msgstr "el destí receptor no admet opcions de pujada" -#: transport-helper.c:964 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:969 +#: transport-helper.c:970 #, fuzzy, c-format msgid "helper %s does not support 'force'" msgstr "El servidor no admet --deepen" -#: transport-helper.c:1016 +#: transport-helper.c:1017 #, fuzzy msgid "couldn't run fast-export" msgstr "no s'ha pogut executar «stash»." -#: transport-helper.c:1021 +#: transport-helper.c:1022 #, fuzzy msgid "error while running fast-export" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:1046 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1119 +#: transport-helper.c:1120 #, fuzzy, c-format msgid "malformed response in ref list: %s" msgstr "full d'opcions mal format: «%s»" -#: transport-helper.c:1271 +#: transport-helper.c:1272 #, fuzzy, c-format msgid "read(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1298 +#: transport-helper.c:1299 #, fuzzy, c-format msgid "write(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1347 +#: transport-helper.c:1348 #, fuzzy, c-format msgid "%s thread failed" msgstr "%s ha fallat" -#: transport-helper.c:1351 +#: transport-helper.c:1352 #, fuzzy, c-format msgid "%s thread failed to join: %s" msgstr "s'ha produït un error en obrir «%s»" -#: transport-helper.c:1370 transport-helper.c:1374 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1411 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1415 +#: transport-helper.c:1416 #, fuzzy, c-format msgid "%s process failed" msgstr "%s ha fallat" -#: transport-helper.c:1433 transport-helper.c:1442 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objecte d'arbre massa curt" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "mode mal format en entrada d'arbre" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nom de fitxer buit en una entrada d'arbre" -#: tree-walk.c:48 -#, c-format -msgid "filename in tree entry contains backslash: '%s'" -msgstr "" - -#: tree-walk.c:124 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" @@ -8317,7 +8710,7 @@ msgid "" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1441 +#: unpack-trees.c:1445 #, fuzzy msgid "Updating index flags" msgstr "S'estan actualitzant els fitxers" @@ -8351,32 +8744,37 @@ msgstr "número de port no vàlid" msgid "invalid '..' path segment" msgstr "segment de camí '..' no vàlid" -#: worktree.c:258 builtin/am.c:2084 +#: walker.c:170 +#, fuzzy +msgid "Fetching objects" +msgstr "S'estan comprovant els objectes" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "«%s» no existeix" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "«%s» no és un fitxer .git, codi d'error %d" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "«%s» no assenyala de tornada a «%s»" @@ -8650,8 +9048,7 @@ msgstr "Actualment esteu fent «rebase»." #: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr "" -" (arregleu els conflictes i després executeu «git rebase --continue»)" +msgstr " (arregleu els conflictes i després executeu «git rebase --continue»)" #: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" @@ -8726,7 +9123,9 @@ msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" #: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu «git cherry-pick --continue»)" +msgstr "" +" (tots els conflictes estan arreglats: executeu «git cherry-pick --" +"continue»)" #: wt-status.c:1437 msgid " (use \"git cherry-pick --skip\" to skip this patch)" @@ -8933,125 +9332,129 @@ msgstr "s'ha produït un error en desenllaçar «%s»" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opcions>] [--] <especificació-de-camí>..." -#: builtin/add.c:87 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:92 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: builtin/add.c:102 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "elimina «%s»\n" -#: builtin/add.c:177 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:252 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" -#: builtin/add.c:263 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir «%s» per a escriptura." -#: builtin/add.c:267 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:270 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "l'edició del pedaç ha fallat" -#: builtin/add.c:273 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a «%s»" -#: builtin/add.c:275 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "El pedaç és buit. S'ha avortat." -#: builtin/add.c:280 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar «%s»" -#: builtin/add.c:288 +#: builtin/add.c:302 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:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 -#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:311 +#: builtin/add.c:325 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:313 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:314 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:315 +#: builtin/add.c:329 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:316 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:317 +#: builtin/add.c:331 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:318 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:321 +#: builtin/add.c:335 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:323 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:324 +#: builtin/add.c:338 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:325 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:327 builtin/update-index.c:1004 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un dipòsit incrustat" -#: builtin/add.c:347 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9082,168 +9485,172 @@ msgstr "" "\n" "Vegeu \"git help submodule\" per a més informació." -#: builtin/add.c:375 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "s'està afegint un dipòsit incrustat: %s" -#: builtin/add.c:393 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Useu -f si realment els voleu afegir.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" -#: builtin/add.c:400 +#: builtin/add.c:419 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:428 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:348 #, fuzzy msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--first-parent és incompatible amb --bisect" -#: builtin/add.c:434 +#: builtin/add.c:464 #, fuzzy msgid "--pathspec-from-file is incompatible with --edit" msgstr "--first-parent és incompatible amb --bisect" -#: builtin/add.c:446 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A i -u són mútuament incompatibles" -#: builtin/add.c:449 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run" -#: builtin/add.c:453 +#: builtin/add.c:483 #, 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:471 builtin/checkout.c:1648 builtin/commit.c:354 -#: builtin/reset.c:327 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 #, fuzzy msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--patch és incompatible amb --{hard,mixed,soft}" -#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 -#: builtin/reset.c:333 +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:482 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:483 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Potser volíeu dir «git add .»?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:511 +#: builtin/am.c:516 #, 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:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:790 +#: builtin/am.c:795 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:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "desplaçament de zona de temps no vàlid" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:948 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, 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:1169 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1262 +#: builtin/am.c:1267 #, fuzzy, c-format msgid "missing author line in commit %s" msgstr "Manca el nom de branca; proveu -b" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " "vies." -#: builtin/am.c:1486 +#: builtin/am.c:1491 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:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9251,24 +9658,24 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1511 +#: builtin/am.c:1516 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:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -9276,41 +9683,41 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, 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:1695 builtin/commit.c:394 +#: builtin/am.c:1700 builtin/commit.c:398 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/am.c:1699 +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1756 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1762 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1766 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9320,7 +9727,7 @@ msgstr "" "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1817 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9333,17 +9740,17 @@ msgstr "" "Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel " "fitxer." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 #: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte «%s»." -#: builtin/am.c:1976 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2020 +#: builtin/am.c:2025 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9351,144 +9758,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:2117 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/am.c:2153 +#: builtin/am.c:2172 +#, fuzzy, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor no vàlid per a --patch-format: %s" + +#: builtin/am.c:2176 +#, fuzzy, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--first-parent és incompatible amb --bisect" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]" -#: builtin/am.c:2154 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opcions>] (--continue | --skip | --abort)" -#: builtin/am.c:2160 +#: builtin/am.c:2214 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2162 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2164 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:811 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2167 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/am.c:2170 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2172 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2174 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2176 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2178 +#: builtin/am.c:2232 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:2181 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" -#: builtin/am.c:2184 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "passa-ho a través de git-apply" -#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 -#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 #: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2210 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2216 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç" -#: builtin/am.c:2218 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2221 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2224 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2227 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/am.c:2230 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2233 -msgid "show the patch being applied." +#: builtin/am.c:2288 +#, fuzzy +msgid "show the patch being applied" msgstr "mostra el pedaç que s'està aplicant." -#: builtin/am.c:2237 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2239 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 -#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2245 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "(ús intern per a git-rebase)" -#: builtin/am.c:2263 +#: builtin/am.c:2319 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." @@ -9496,18 +9914,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. No l'useu més." -#: builtin/am.c:2270 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/am.c:2285 +#: builtin/am.c:2341 #, 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:2309 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" @@ -9516,11 +9934,11 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: builtin/am.c:2315 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/am.c:2325 +#: builtin/am.c:2381 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9690,7 +10108,7 @@ msgstr "" "Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n" "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)" -#: builtin/bisect--helper.c:322 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "bisecant amb només una comissió %s" @@ -9699,22 +10117,22 @@ msgstr "bisecant amb només una comissió %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect--helper.c:377 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect--helper.c:380 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:390 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9723,122 +10141,121 @@ msgstr "" "paràmetre 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--helper.c:476 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "opció no reconeguda: «%s»" -#: builtin/bisect--helper.c:480 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "«%s» no sembla ser una revisió vàlida" -#: builtin/bisect--helper.c:512 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - Cal un HEAD" -#: builtin/bisect--helper.c:527 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-" -"vàlida>»." +"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»." -#: builtin/bisect--helper.c:548 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" -#: builtin/bisect--helper.c:551 +#: builtin/bisect--helper.c:553 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" -#: builtin/bisect--helper.c:575 +#: builtin/bisect--helper.c:577 #, fuzzy, c-format msgid "invalid ref: '%s'" msgstr "fitxer no vàlid: «%s»" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "realitza 'git bisect next'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "escriu els termes a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "comprova les revisions esperades" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:641 #, fuzzy msgid "reset the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:643 #, fuzzy msgid "write out the bisection state in BISECT_LOG" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:645 #, fuzzy msgid "check and set terms in a bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:649 #, fuzzy msgid "print out the bisect terms" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms requereix dos paràmetres" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 #, fuzzy msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:685 +#: builtin/bisect--helper.c:688 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:691 +#: builtin/bisect--helper.c:694 #, fuzzy msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:700 #, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:703 +#: builtin/bisect--helper.c:706 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" msgstr "--write-terms requereix dos paràmetres" @@ -10239,7 +10656,7 @@ msgstr "configura el mode de seguiment (vegeu git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:505 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "font" @@ -10352,7 +10769,7 @@ msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:684 builtin/clone.c:784 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -10459,19 +10876,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" @@ -10493,11 +10910,11 @@ msgstr "%s està bé\n" msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/bundle.c:168 builtin/remote.c:1609 +#: builtin/bundle.c:168 builtin/remote.c:1686 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'un subordre" -#: builtin/bundle.c:190 builtin/remote.c:1640 +#: builtin/bundle.c:190 builtin/remote.c:1717 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconeguda: %s" @@ -10552,7 +10969,7 @@ msgid "for blob objects, run filters on object's content" msgstr "" "en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:645 git-submodule.sh:992 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "blob" @@ -10614,8 +11031,8 @@ msgstr "llegeix els noms de fitxer de stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -10627,27 +11044,27 @@ msgstr "mostra els camins d'entrada que no coincideixin" msgid "ignore index when checking" msgstr "ignora l'índex en comprovar" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "no es poden especificar noms de camí amb --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z només té sentit amb --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "cap camí especificat" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 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:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "no es poden especificar --quiet i --verbose alhora" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching és vàlid només amb --verbose" @@ -10706,9 +11123,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 -#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "cadena" @@ -10826,61 +11243,61 @@ msgstr "%s: %s no es pot usar amb %s" msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:732 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:835 +#: builtin/checkout.c:837 #, 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:877 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:881 builtin/clone.c:716 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:885 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:888 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "Ja en «%s»\n" -#: builtin/checkout.c:892 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:894 builtin/checkout.c:1291 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:896 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10903,7 +11320,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:972 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10930,240 +11347,257 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:1051 builtin/checkout.c:1286 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1128 +#, c-format +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" + +#: builtin/checkout.c:1135 +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" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/checkout.c:1145 +#, fuzzy, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "actua en branques amb seguiment remot" + +#: builtin/checkout.c:1211 #, fuzzy msgid "only one reference expected" msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1228 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1232 -#, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" -msgstr "" - -#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1258 builtin/checkout.c:1622 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1334 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: builtin/checkout.c:1307 +#: builtin/checkout.c:1336 #, fuzzy, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»." -#: builtin/checkout.c:1308 builtin/checkout.c:1316 +#: builtin/checkout.c:1337 builtin/checkout.c:1345 #, fuzzy, c-format msgid "a branch is expected, got '%s'" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: builtin/checkout.c:1311 +#: builtin/checkout.c:1340 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" msgstr "La vostra branca està al dia amb «%s».\n" -#: builtin/checkout.c:1327 +#: builtin/checkout.c:1356 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1331 +#: builtin/checkout.c:1360 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1335 +#: builtin/checkout.c:1364 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1339 +#: builtin/checkout.c:1368 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1343 +#: builtin/checkout.c:1372 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1347 +#: builtin/checkout.c:1376 #, fuzzy msgid "you are switching branch while bisecting" msgstr "Actualment esteu bisecant." -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" -#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 -#: builtin/checkout.c:1380 builtin/checkout.c:1385 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1411 #, fuzzy, c-format msgid "'%s' cannot take <start-point>" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1419 #, 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:1397 +#: builtin/checkout.c:1426 #, fuzzy msgid "missing branch or commit argument" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 -#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 -#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1469 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "estil" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1471 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1454 builtin/worktree.c:503 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1486 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1461 builtin/merge.c:288 +#: builtin/checkout.c:1490 builtin/merge.c:289 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1464 +#: builtin/checkout.c:1493 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1477 +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1480 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mútuament excloents" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1568 #, fuzzy msgid "-p and --overlay are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/checkout.c:1577 +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1582 +#: builtin/checkout.c:1610 #, fuzzy msgid "missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1615 +#: builtin/checkout.c:1642 #, fuzzy, c-format msgid "could not resolve %s" msgstr "no s'ha pogut resoldre «%s»" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1665 #, 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:1642 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»" -#: builtin/checkout.c:1651 +#: builtin/checkout.c:1678 #, fuzzy msgid "--pathspec-from-file is incompatible with --detach" msgstr "--first-parent és incompatible amb --bisect" -#: builtin/checkout.c:1654 builtin/reset.c:324 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 #, fuzzy msgid "--pathspec-from-file is incompatible with --patch" msgstr "--first-parent és incompatible amb --bisect" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11171,97 +11605,80 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1697 #, fuzzy msgid "you must specify path(s) to restore" msgstr "Heu d'especificar un directori." -#: builtin/checkout.c:1689 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" - -#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 -#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1715 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1720 +#: builtin/checkout.c:1729 #, fuzzy msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1730 #, fuzzy msgid "use overlay mode (default)" msgstr "poda les referències soltes (per defecte)" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1775 #, fuzzy msgid "create and switch to a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1777 #, fuzzy msgid "create/reset and switch to a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1779 #, fuzzy msgid "second guess 'git switch <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 #, fuzzy msgid "throw away local modifications" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1813 #, fuzzy msgid "which tree-ish to checkout from" msgstr "llegeix l'objecte des de stdin" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1815 #, fuzzy msgid "restore the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/checkout.c:1808 +#: builtin/checkout.c:1817 #, fuzzy msgid "restore the working tree (default)" msgstr "Mostra l'estat de l'arbre de treball" -#: builtin/checkout.c:1810 +#: builtin/checkout.c:1819 #, fuzzy msgid "ignore unmerged entries" msgstr "s'està ignorant %s no fusionat\n" -#: builtin/checkout.c:1811 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "" @@ -11405,9 +11822,9 @@ msgstr "neteja interactiva" msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patró" @@ -11492,18 +11909,18 @@ msgstr "directori-de-plantilla" msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 -#: builtin/submodule--helper.c:1885 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:118 builtin/submodule--helper.c:1394 -#: builtin/submodule--helper.c:1887 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:327 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "nom" @@ -11519,8 +11936,8 @@ msgstr "agafa <branca> en lloc de la HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "profunditat" @@ -11528,7 +11945,7 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "hora" @@ -11537,7 +11954,7 @@ msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora específica" #: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1480 msgid "revision" msgstr "revisió" @@ -11545,7 +11962,8 @@ msgstr "revisió" msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" @@ -11584,12 +12002,12 @@ msgstr "específic al servidor" msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 #: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 #: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" @@ -11663,97 +12081,97 @@ msgstr "" 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:704 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:752 +#: builtin/clone.c:753 #, fuzzy msgid "failed to initialize sparse-checkout" msgstr "s'ha produït un error en finalitzar «%s»" -#: builtin/clone.c:775 +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:806 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:856 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:919 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:921 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:959 builtin/receive-pack.c:1948 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:963 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:976 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:979 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:992 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit «%s» no existeix" -#: builtin/clone.c:998 builtin/fetch.c:1787 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és un nombre positiu" -#: builtin/clone.c:1008 +#: builtin/clone.c:1014 #, 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:1018 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:1038 +#: builtin/clone.c:1044 #, 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:1058 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu «%s»...\n" -#: builtin/clone.c:1060 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1084 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11761,38 +12179,38 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1148 +#: builtin/clone.c:1154 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:1150 +#: builtin/clone.c:1156 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:1152 +#: builtin/clone.c:1158 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:1154 +#: builtin/clone.c:1160 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:1157 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1162 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1237 builtin/clone.c:1245 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, 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:1248 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -11869,13 +12287,13 @@ msgstr "pare" msgid "id of a parent commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 #: builtin/tag.c:412 msgid "message" msgstr "missatge" -#: builtin/commit-tree.c:115 builtin/commit.c:1496 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "missatge de comissió" @@ -11884,8 +12302,8 @@ msgstr "missatge de comissió" msgid "read commit log message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" @@ -11967,53 +12385,53 @@ msgstr "--include/--only no té sentit sense camí." msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:382 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:396 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:398 +#: builtin/commit.c:402 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:423 builtin/commit.c:446 builtin/commit.c:492 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:475 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:477 +#: builtin/commit.c:481 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:485 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:504 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:602 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió «%s» li manca la capçalera d'autor" -#: builtin/commit.c:604 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió «%s» té una línia d'autor mal formada" -#: builtin/commit.c:623 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:676 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12021,38 +12439,38 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:726 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, 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:728 +#: builtin/commit.c:732 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:732 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: builtin/commit.c:763 builtin/commit.c:779 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:770 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:830 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:849 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -12067,7 +12485,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -12082,7 +12500,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12092,7 +12510,7 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:875 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12104,142 +12522,142 @@ msgstr "" "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:892 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:900 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:907 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:925 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:992 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:1006 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, 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:1050 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1064 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "mode ignorat no vàlid «%s»" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid «%s»" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1175 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1180 +#: builtin/commit.c:1185 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:1183 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1193 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1195 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 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:1220 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 #, fuzzy, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1357 builtin/commit.c:1519 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1359 builtin/commit.c:1521 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1361 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "mostra la informació de «stash»" -#: builtin/commit.c:1363 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1370 msgid "version" msgstr "versió" -#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 -#: builtin/worktree.c:650 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1368 builtin/commit.c:1527 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1371 builtin/commit.c:1530 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "mode" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1379 builtin/commit.c:1538 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:1378 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12247,11 +12665,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1380 parse-options.h:192 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "quan" -#: builtin/commit.c:1381 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12259,173 +12677,173 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1384 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "no detectis canvis de noms" -#: builtin/commit.c:1386 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança" -#: builtin/commit.c:1406 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1489 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "author" msgstr "autor" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1495 builtin/gc.c:538 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "data" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 -#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1498 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a corregir la comissió " "especificada" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a «squash» a la comissió " "especificada" -#: builtin/commit.c:1501 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1512 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1513 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1514 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1515 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1531 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1532 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1539 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1541 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1614 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1621 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1640 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1647 +#: builtin/commit.c:1652 #, 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:1652 +#: builtin/commit.c:1657 #, 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:1686 +#: builtin/commit.c:1691 #, fuzzy msgid "" "repository has been updated, but unable to write\n" @@ -12448,55 +12866,60 @@ msgid "" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 -#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:52 +#, fuzzy, c-format +msgid "could not find object directory matching %s" +msgstr "no s'ha pogut obrir el directori «%s»" + +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "directori" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:51 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, fuzzy, c-format msgid "Could not open commit-graph '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:108 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:110 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:112 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:115 +#: builtin/commit-graph.c:137 #, fuzzy msgid "allow writing an incremental commit-graph file" msgstr "Escriu i verifica els fitxers commit-graph de Git" -#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:119 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -12504,210 +12927,214 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opcions>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "paràmetre --type no reconegut, %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "només un tipus cada cop" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "usa el fitxer de configuració del dipòsit" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "usa un fitxer de configuració per dipòsit" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Acció" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "obtén valor: nom [regex-de-valors]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "obtén tots els valors: clau [regex-de-valors]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "elimina una variable: nom [regex-de-valors]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "elimina totes les coincidències: nom [regex-de-valors]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "llista tots" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba el paràmetre de color: ranura [stdout-és-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Tipus" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "el valor té donat aquest tipus" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "el valor és \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "el valor és un camí (nom de fitxer o directori)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "el valor és una data de venciment" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Altre" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:157 +#: builtin/config.c:158 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:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "valor" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "patró de la clau no vàlid: %s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, 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:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "no es pot analitzar el color «%s»" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "no és en un directori git" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "no s'admet escriure a stdin" -#: builtin/config.c:502 +#: builtin/config.c:518 #, fuzzy msgid "writing config blobs is not supported" msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12722,75 +13149,75 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "només un fitxer de configuració cada cop" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local només es pot usar dins d'un dipòsit git" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob només es pot usar dins d'un dipòsit git" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME no està establerta" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color i el tipus de variable són incoherents" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "només una acció cada cop" -#: builtin/config.c:706 +#: builtin/config.c:732 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:712 +#: builtin/config.c:738 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:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default només és aplicable a --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "no s'ha pogut llegir el fitxer de configuració «%s»" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "s'ha produït un error processant els fitxers de configuració" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "no hi ha compatibilitat per a l'edició a stdin" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "no hi ha compatibilitat per l'edició de blobs" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12799,7 +13226,7 @@ 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:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "no existeix la secció: %s" @@ -12857,12 +13284,12 @@ msgstr "cap etiqueta coincideix exactament amb «%s»" msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12871,7 +13298,7 @@ msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:411 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12880,12 +13307,12 @@ msgstr "" "Cap etiqueta pot descriure «%s».\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:441 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:444 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12894,90 +13321,90 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:512 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:523 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no és una comissió o un blob" -#: builtin/describe.c:537 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:538 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:539 +#: builtin/describe.c:553 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:540 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:541 +#: builtin/describe.c:555 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:542 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:545 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:547 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:549 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:551 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "no consideris les etiquetes que no coincideixen amb <patró>" -#: builtin/describe.c:553 builtin/name-rev.c:473 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "marca" -#: builtin/describe.c:555 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:558 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" -#: builtin/describe.c:576 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:605 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:656 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/describe.c:658 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" @@ -13157,7 +13584,7 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:852 +#: builtin/fast-export.c:853 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" @@ -13255,20 +13682,20 @@ msgstr "git fetch --all [<opcions>]" msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:139 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:141 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:228 #, fuzzy msgid "set upstream for git pull/fetch" msgstr "estableix la font per a git pull/status" -#: builtin/fetch.c:143 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:145 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" @@ -13280,7 +13707,7 @@ msgstr "força la sobreescriptura de la referència local" msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:150 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" @@ -13292,7 +13719,7 @@ msgstr "no obtinguis les etiquetes (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:156 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" @@ -13300,7 +13727,7 @@ msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "sota demanda" @@ -13308,7 +13735,7 @@ msgstr "sota demanda" msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:164 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "retén el paquet baixat" @@ -13316,7 +13743,7 @@ msgstr "retén el paquet baixat" msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" @@ -13324,7 +13751,7 @@ msgstr "aprofundeix la història d'un clon superficial" msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en temps" -#: builtin/fetch.c:177 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" @@ -13340,15 +13767,15 @@ msgstr "" "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " "els fitxers de configuració)" -#: builtin/fetch.c:187 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:189 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "específica l'obtenció del mapa de referències" @@ -13361,7 +13788,7 @@ msgstr "" msgid "run 'gc --auto' after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/fetch.c:201 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "" @@ -13445,23 +13872,23 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:932 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:1017 builtin/fetch.c:1155 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:1028 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13471,80 +13898,80 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:1125 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:1126 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1159 builtin/remote.c:1035 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:1201 +#: builtin/fetch.c:1210 #, 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:1204 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció «%s» per a %s\n" -#: builtin/fetch.c:1412 +#: builtin/fetch.c:1421 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1427 +#: builtin/fetch.c:1436 #, fuzzy msgid "not setting upstream for a remote remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1438 #, fuzzy msgid "not setting upstream for a remote tag" msgstr "estableix la font per a git pull/status" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1440 #, fuzzy msgid "unknown branch type" msgstr "tipus d'objecte desconegut %d" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1442 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1559 builtin/fetch.c:1622 +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1581 +#: builtin/fetch.c:1590 #, fuzzy, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "no s'ha pogut establir «%s» a «%s»" -#: builtin/fetch.c:1684 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13552,44 +13979,44 @@ msgstr "" "Cap dipòsit remot especificat. Especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1721 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1771 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mútuament excloents" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1796 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1798 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "No existeix un remot ni un grup remot: %s" -#: builtin/fetch.c:1814 +#: builtin/fetch.c:1823 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:1832 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13601,23 +14028,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "àlies per --log (en desús)" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:681 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:682 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -13826,7 +14253,7 @@ msgstr "S'estan comprovant els directoris d'objecte" msgid "Checking %s link" msgstr "S'està comprovant l'enllaç %s" -#: builtin/fsck.c:695 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "%s no vàlid" @@ -14026,7 +14453,7 @@ msgstr "" "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-" "los." -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" @@ -14044,263 +14471,264 @@ 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:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:650 +#: builtin/grep.c:633 #, 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:716 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:815 +#: builtin/grep.c:803 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:817 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:819 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:821 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:823 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:826 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:828 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:830 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:832 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:834 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:837 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:839 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "cerca als subdirectories (per defecte)" -#: builtin/grep.c:841 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "descendeix com a màxim <profunditat> nivells" -#: builtin/grep.c:845 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:848 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:851 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:854 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:857 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:858 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidència" -#: builtin/grep.c:859 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:860 +#: builtin/grep.c:848 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:862 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:864 +#: builtin/grep.c:852 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:866 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:869 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:871 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:874 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "mostra només les parts de coincidents de la línia" -#: builtin/grep.c:876 +#: builtin/grep.c:864 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:877 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:879 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:881 +#: builtin/grep.c:869 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:884 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "mostra <n> línies de context abans i després d'una coincidència" -#: builtin/grep.c:887 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "mostra <n> línies de context abans d'una coincidència" -#: builtin/grep.c:889 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "mostra <n> línies de context després d'una coincidència" -#: builtin/grep.c:891 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:892 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:895 +#: builtin/grep.c:883 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:897 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:900 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:902 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:904 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:916 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:918 +#: builtin/grep.c:906 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:920 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisi de l'expressió grep" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "pager" msgstr "paginador" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:928 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:992 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "no s'ha donat cap patró" -#: builtin/grep.c:1028 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1036 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1067 +#: builtin/grep.c:1057 +#, fuzzy +msgid "--untracked not supported with --recurse-submodules" +msgstr "opció no admesa amb --recurse-submodules" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "combinació d'opcions no vàlida, s'està ignorant --threads" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "no hi ha suport de fils, s'està ignorant --threads" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1096 +#: builtin/grep.c:1101 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:1119 -msgid "option not supported with --recurse-submodules" -msgstr "opció no admesa amb --recurse-submodules" - -#: builtin/grep.c:1125 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1131 +#: builtin/grep.c:1133 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1139 +#: builtin/grep.c:1141 #, fuzzy msgid "both --cached and trees are given" msgstr "s'han donat ambdós --caches i arbres." @@ -14489,7 +14917,7 @@ msgstr "error de lectura d'entrada" msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" @@ -14551,192 +14979,192 @@ msgstr[1] "" msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informació d'objecte existent %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 #, fuzzy msgid "fsck error in packed object" msgstr "ignora els objectes empaquetats" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, 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:1264 +#: builtin/index-pack.c:1267 #, 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:1268 +#: builtin/index-pack.c:1271 #, 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:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "no es pot escriure «%s» al fitxer «%s»" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, fuzzy, c-format msgid "cannot close written %s file '%s'" msgstr "no es pot tancar el fitxer escrit a mantenir «%s»" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "error en tancar el fitxer empaquetat" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer empaquetat" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorrecte" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer empaquetat existent «%s»" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, 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:1643 +#: builtin/index-pack.c:1647 #, 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:1650 +#: builtin/index-pack.c:1654 #, 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:1689 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "%s incorrecte" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin requereix un dipòsit git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 #, fuzzy msgid "fsck error in pack objects" msgstr "error en objecte: %s" @@ -15462,7 +15890,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "executable" @@ -15548,182 +15976,182 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "l'opció «m» requereix un valor" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, fuzzy, c-format msgid "option `%s' requires a value" msgstr "l'opció «%s» requereix un valor" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, 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:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:132 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:247 builtin/pull.c:155 +#: builtin/merge.c:248 builtin/pull.c:135 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:248 builtin/pull.c:158 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:266 builtin/pull.c:163 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:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:271 +#: builtin/merge.c:272 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:279 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:280 +#: builtin/merge.c:281 #, fuzzy msgid "--abort but leave index and working tree alone" msgstr "restableix HEAD, l'índex i l'arbre de treball" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:290 +#: builtin/merge.c:291 #, fuzzy msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "no s'ha pogut executar «stash»." -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "l'«stash» ha fallat" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " (res a fer «squash»)" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» no assenyala una comissió" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:705 +#: builtin/merge.c:708 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:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, 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:801 +#: builtin/merge.c:804 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -15737,12 +16165,12 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:806 +#: builtin/merge.c:809 #, fuzzy msgid "An empty message aborts the commit.\n" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15752,75 +16180,75 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/merge.c:862 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:877 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:938 +#: builtin/merge.c:941 #, 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:977 +#: builtin/merge.c:980 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:979 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:981 +#: builtin/merge.c:984 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:986 +#: builtin/merge.c:989 #, 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:1043 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1146 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1180 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1283 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1287 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1296 +#: builtin/merge.c:1299 #, fuzzy msgid "--quit expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1309 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue no accepta paràmetres" -#: builtin/merge.c:1313 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1329 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15828,7 +16256,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1336 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15836,99 +16264,99 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1339 +#: builtin/merge.c:1342 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:1353 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1355 +#: builtin/merge.c:1358 #, fuzzy msgid "You cannot combine --squash with --commit." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1371 +#: builtin/merge.c:1374 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:1388 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1390 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" -#: builtin/merge.c:1395 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1397 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1476 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1485 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:1495 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1542 #, 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:1544 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1575 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16181,52 +16609,52 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissió>..." -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:405 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:463 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "només usa les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignora les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:469 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:470 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "llegeix de stdin" -#: builtin/name-rev.c:471 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:477 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" @@ -16645,7 +17073,7 @@ msgstr "referència de notes" msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" @@ -16664,382 +17092,359 @@ msgstr "" "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, fuzzy, c-format msgid "bad packed object CRC for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, fuzzy, c-format msgid "corrupt packed object for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, fuzzy, c-format msgid "recursive delta detected for object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:794 -#, fuzzy, c-format -msgid "packfile is invalid: %s" -msgstr "%s no vàlid" - -#: builtin/pack-objects.c:798 -#, fuzzy, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "no s'ha pogut obrir o llegir %s" - -#: builtin/pack-objects.c:802 -#, fuzzy -msgid "unable to seek in reused packfile" -msgstr "no es pot llegir el fitxer d'índex" - -#: builtin/pack-objects.c:813 -#, fuzzy -msgid "unable to read from reused packfile" -msgstr "no es pot llegir el fitxer d'índex" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 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:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:917 builtin/update-index.c:90 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "s'ha produït un error en fer stat a %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1297 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:1592 +#: builtin/pack-objects.c:1724 #, fuzzy, c-format msgid "delta base offset overflow in pack for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1601 +#: builtin/pack-objects.c:1733 #, fuzzy, c-format msgid "delta base offset out of bound for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1870 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "S'estan comptant els objectes" -#: builtin/pack-objects.c:2000 -#, fuzzy, c-format -msgid "unable to get size of %s" -msgstr "no s'ha pogut moure %s a %s" - -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2149 #, fuzzy, c-format msgid "unable to parse object header of %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, fuzzy, c-format msgid "object %s cannot be read" msgstr "objecte %s no trobat" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2713 #, fuzzy, c-format msgid "unable to pack objects reachable from tag %s" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "valor no vàlid per a --missing" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 #, fuzzy msgid "cannot open pack index" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3167 #, fuzzy msgid "unable to force loose object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3260 #, fuzzy, c-format msgid "not a rev '%s'" msgstr "no es pot llegir «%s»" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "revisió incorrecte «%s»" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex incorrecta «%s»" -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "<versió>[,<desplaçament>]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3384 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:3240 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer empaquetat de sortida" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3395 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:3250 +#: builtin/pack-objects.c:3397 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:3252 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3417 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:3273 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3425 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:3280 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3434 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c:3442 #, fuzzy msgid "ignore this pack" msgstr "usa el paquet prim" -#: builtin/pack-objects.c:3297 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3454 #, fuzzy msgid "write a bitmap index if possible" msgstr "escriu índex de mapa de bits" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "gestió dels objectes absents" -#: builtin/pack-objects.c:3314 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3463 #, fuzzy msgid "respect islands during delta compression" msgstr "mida de la finestra que s'usa per a compressió de diferències" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3558 #, fuzzy msgid "--thin cannot be used to build an indexable pack" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3561 #, fuzzy msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3567 #, fuzzy msgid "cannot use --filter without --stdout" msgstr "no es pot usar -a amb -d" -#: builtin/pack-objects.c:3481 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "S'estan enumerant els objectes" -#: builtin/pack-objects.c:3511 -#, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +#: builtin/pack-objects.c:3657 +#, fuzzy, c-format +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" "Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències " "%<PRIu32>)" @@ -17084,54 +17489,54 @@ msgstr "" msgid "cannot prune in a precious-objects repo" msgstr "no es pot podar en un dipòsit d'objectes preciosos" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no vàlid per a %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/pull.c:142 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/pull.c:146 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "Opcions relacionades amb fusionar" -#: builtin/pull.c:149 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis fent «rebase» en lloc de fusionar" -#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permet l'avanç ràpid" -#: builtin/pull.c:186 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "" "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" -#: builtin/pull.c:202 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "Opcions relacionades amb obtenir" -#: builtin/pull.c:212 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/pull.c:220 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "nombre de submòduls baixats en paral·lel" -#: builtin/pull.c:320 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor no vàlid per a pull.ff: %s" -#: builtin/pull.c:437 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17139,13 +17544,13 @@ msgstr "" "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que " "acabeu d'obtenir." -#: builtin/pull.c:439 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." -#: builtin/pull.c:440 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17153,7 +17558,7 @@ msgstr "" "Generalment això vol dir que heu proveït una especificació de\n" "referència de comodí que no tenia cap coincidència en el costat remot." -#: builtin/pull.c:443 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17164,44 +17569,44 @@ msgstr "" "Perquè aquest no és el remot configurat per defecte per a la vostra\n" "branca actual, heu d'especificar una branca en la línia d'ordres." -#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Especifiqueu sobre quina branca voleu fer «rebase»." -#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Especifiqueu amb quina branca voleu fusionar." -#: builtin/pull.c:453 builtin/pull.c:468 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "Vegeu git-pull(1) per detalls." -#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1381 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" -#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." -#: builtin/pull.c:472 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " "amb:" -#: builtin/pull.c:477 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17210,33 +17615,33 @@ msgstr "" "La vostra configuració especifica fusionar amb la referència «%s»\n" "del remot, però no s'ha obtingut tal referència." -#: builtin/pull.c:587 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "no s'ha pogut accedir a la comissió %s" -#: builtin/pull.c:867 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "s'està ignorant --verify-signatures en fer «rebase»" -#: builtin/pull.c:922 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase." -#: builtin/pull.c:930 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "" "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex." -#: builtin/pull.c:934 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "baixar fent «rebase»" -#: builtin/pull.c:935 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:960 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17247,7 +17652,7 @@ msgstr "" "s'està avançant ràpidament el vostre arbre de treball des de\n" "la comissió %s." -#: builtin/pull.c:966 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17265,15 +17670,15 @@ msgstr "" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:981 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar múltiples branques a un HEAD buit." -#: builtin/pull.c:985 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." -#: builtin/pull.c:992 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no es pot fer «rebase» amb modificacions als submòduls enregistrades " @@ -17718,227 +18123,219 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 #, c-format msgid "unusable todo list: '%s'" msgstr "llista per a fer inestable: «%s»" -#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 -#, c-format -msgid "could not write '%s'." -msgstr "no s'ha pogut escriure a «%s»." - -#: builtin/rebase.c:271 -msgid "no HEAD?" -msgstr "no hi ha cap HEAD?" - -#: builtin/rebase.c:298 +#: builtin/rebase.c:292 #, c-format msgid "could not create temporary %s" msgstr "no s'ha pogut crear el fitxer temporal %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:298 msgid "could not mark as interactive" msgstr "no s'ha pogut marcar com a interactiu" -#: builtin/rebase.c:362 +#: builtin/rebase.c:352 msgid "could not generate todo list" msgstr "no s'ha pogut generar la llista per a fer" -#: builtin/rebase.c:402 +#: builtin/rebase.c:391 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:461 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opcions>]" -#: builtin/rebase.c:469 -msgid "keep empty commits" +#: builtin/rebase.c:474 builtin/rebase.c:1550 +#, fuzzy +msgid "(DEPRECATED) keep empty commits" msgstr "mantén les comissions buides" -#: builtin/rebase.c:471 builtin/revert.c:128 +#: builtin/rebase.c:478 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:472 +#: builtin/rebase.c:480 msgid "rebase merge commits" msgstr "fes «rebase» de les comissions de fusió" -#: builtin/rebase.c:474 +#: builtin/rebase.c:482 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:476 +#: builtin/rebase.c:484 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:477 +#: builtin/rebase.c:485 msgid "sign commits" msgstr "signa les comissions" -#: builtin/rebase.c:479 builtin/rebase.c:1455 +#: builtin/rebase.c:487 builtin/rebase.c:1490 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:489 msgid "continue rebase" msgstr "continua el «rebase»" -#: builtin/rebase.c:483 +#: builtin/rebase.c:491 msgid "skip commit" msgstr "omet la comissió" -#: builtin/rebase.c:484 +#: builtin/rebase.c:492 msgid "edit the todo list" msgstr "edita la llista a fer" -#: builtin/rebase.c:486 +#: builtin/rebase.c:494 msgid "show the current patch" msgstr "mostra el pedaç actual" -#: builtin/rebase.c:489 +#: builtin/rebase.c:497 msgid "shorten commit ids in the todo list" msgstr "escurça els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:491 +#: builtin/rebase.c:499 msgid "expand commit ids in the todo list" msgstr "expandeix els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:493 +#: builtin/rebase.c:501 msgid "check the todo list" msgstr "comprova la llista a fer" -#: builtin/rebase.c:495 +#: builtin/rebase.c:503 msgid "rearrange fixup/squash lines" msgstr "reorganitza les línies «fixup/pick»" -#: builtin/rebase.c:497 +#: builtin/rebase.c:505 msgid "insert exec commands in todo list" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:498 +#: builtin/rebase.c:506 msgid "onto" msgstr "" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 #, fuzzy msgid "restrict-revision" msgstr "revisió" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 #, fuzzy msgid "restrict revision" msgstr "revisió" -#: builtin/rebase.c:503 +#: builtin/rebase.c:511 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:512 msgid "squash onto" msgstr "" -#: builtin/rebase.c:506 +#: builtin/rebase.c:514 #, fuzzy msgid "the upstream commit" msgstr "Desassigna la informació de font" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 #, fuzzy msgid "head-name" msgstr "canvi de nom" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 #, fuzzy msgid "head name" msgstr "davant per " -#: builtin/rebase.c:513 +#: builtin/rebase.c:521 #, fuzzy msgid "rebase strategy" msgstr "estratègia de fusió" -#: builtin/rebase.c:514 +#: builtin/rebase.c:522 #, fuzzy msgid "strategy-opts" msgstr "estratègia" -#: builtin/rebase.c:515 +#: builtin/rebase.c:523 #, fuzzy msgid "strategy options" msgstr "opcions de decoració" -#: builtin/rebase.c:516 +#: builtin/rebase.c:524 msgid "switch-to" msgstr "" -#: builtin/rebase.c:517 +#: builtin/rebase.c:525 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 #, fuzzy msgid "onto-name" msgstr "nom" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 #, fuzzy msgid "onto name" msgstr "nom del remot" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 #, fuzzy msgid "cmd" msgstr "ordre" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "the command to run" msgstr "l'ordre a executar" -#: builtin/rebase.c:522 builtin/rebase.c:1540 +#: builtin/rebase.c:530 builtin/rebase.c:1584 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:556 +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requereix un «rebase» interactiu" -#: builtin/rebase.c:608 +#: builtin/rebase.c:612 #, fuzzy, c-format msgid "could not get 'onto': '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: builtin/rebase.c:623 +#: builtin/rebase.c:627 #, fuzzy, c-format msgid "invalid orig-head: '%s'" msgstr "fitxer no vàlid: «%s»" -#: builtin/rebase.c:648 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:724 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "No s'ha pogut llegir «%s»" -#: builtin/rebase.c:742 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "No es pot emmagatzemar %s" -#: builtin/rebase.c:849 +#: builtin/rebase.c:853 msgid "could not determine HEAD revision" msgstr "no s'ha pogut determinar la revisió de HEAD" -#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17953,7 +18350,7 @@ msgstr "" "Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " "executeu «git rebase --abort»." -#: builtin/rebase.c:1060 +#: builtin/rebase.c:1058 #, c-format msgid "" "\n" @@ -17965,7 +18362,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -17982,7 +18386,7 @@ msgstr "" " git rebase '<branca>'\n" "\n" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17996,195 +18400,185 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1447 #, fuzzy msgid "exec commands cannot contain newlines" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1451 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "fes un «rebase» en la branca donada en comptes de la font" -#: builtin/rebase.c:1448 +#: builtin/rebase.c:1483 #, fuzzy msgid "use the merge-base of upstream and branch as the current base" msgstr "la branca font demanada «%s» no existeix" -#: builtin/rebase.c:1450 +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "permet al lligam pre-rebase executar-se" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "silenciós. Implica --no-stat" -#: builtin/rebase.c:1458 +#: builtin/rebase.c:1493 #, fuzzy msgid "do not show diffstat of what changed upstream" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1496 #, fuzzy msgid "add a Signed-off-by: line to each commit" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/rebase.c:1464 -#, fuzzy -msgid "make committer date match author date" -msgstr "Agrupa per «comitter» en comptes de per autor" - -#: builtin/rebase.c:1466 -msgid "ignore author date and use current date" -msgstr "" - -#: builtin/rebase.c:1468 +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 #, fuzzy -msgid "synonym of --reset-author-date" -msgstr "sinònim de --files-with-matches" +msgid "passed to 'git am'" +msgstr "passa-ho a «git am»" -#: builtin/rebase.c:1470 builtin/rebase.c:1474 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "passa-ho a «git-apply»" -#: builtin/rebase.c:1472 -#, fuzzy -msgid "ignore changes in whitespace" -msgstr "ignora els canvis d'espai en blanc al final de la línia" - -#: builtin/rebase.c:1476 builtin/rebase.c:1479 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "«cherry pick» totes les comissions, inclús les no canviades" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1515 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "omet el pedaç actual i continua" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "interromp i agafa la branca original" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "interromp però manté HEAD on és" -#: builtin/rebase.c:1490 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "edita la llista de coses a fer durant un «rebase» interactiu" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "mostra el pedaç que s'està aplicant o fusionant" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1530 +#, fuzzy +msgid "use apply strategies to rebase" +msgstr "estratègia de fusió a usar" + +#: builtin/rebase.c:1534 #, fuzzy msgid "use merging strategies to rebase" msgstr "estratègia de fusió a usar" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1542 #, fuzzy msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "intenta recrear les " -#: builtin/rebase.c:1509 -#, fuzzy -msgid "preserve empty commits during rebase" -msgstr "preserva les comissions inicialment buides" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" +msgstr "" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1517 +#: builtin/rebase.c:1560 #, fuzzy msgid "automatically stash/stash pop before and after" msgstr "" "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" -#: builtin/rebase.c:1519 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1566 #, fuzzy msgid "allow rebasing commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1529 +#: builtin/rebase.c:1573 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" msgstr "git merge-base --fork-point <referència> [<comissió>]" -#: builtin/rebase.c:1531 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "utilitza l'estratègia de fusió donada" -#: builtin/rebase.c:1533 builtin/revert.c:115 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "opció" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "passa l'argument a l'estratègia de fusió" -#: builtin/rebase.c:1537 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1598 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»." -#: builtin/rebase.c:1601 +#: builtin/rebase.c:1645 #, fuzzy msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1606 +#: builtin/rebase.c:1650 #, fuzzy msgid "cannot combine '--keep-base' with '--onto'" msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»" -#: builtin/rebase.c:1608 +#: builtin/rebase.c:1652 #, fuzzy msgid "cannot combine '--keep-base' with '--root'" msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»" -#: builtin/rebase.c:1612 +#: builtin/rebase.c:1656 msgid "No rebase in progress?" msgstr "No hi ha un «rebase» en curs?" -#: builtin/rebase.c:1616 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: builtin/rebase.c:1639 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: builtin/rebase.c:1651 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18192,16 +18586,16 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: builtin/rebase.c:1670 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "no s'han pogut descartar els canvis de l'arbre de treball" -#: builtin/rebase.c:1689 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" msgstr "no s'ha pogut tornar a %s" -#: builtin/rebase.c:1734 +#: builtin/rebase.c:1778 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18222,170 +18616,170 @@ msgstr "" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "«switch» «c» espera un valor numèric" -#: builtin/rebase.c:1798 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "Mode desconegut: %s" -#: builtin/rebase.c:1820 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" +msgstr "" + +#: builtin/rebase.c:1912 +#, fuzzy, c-format +msgid "Unknown rebase backend: %s" +msgstr "Subordre desconeguda: %s" + +#: builtin/rebase.c:1937 #, fuzzy msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1872 -msgid "cannot combine am options with either interactive or merge options" -msgstr "" - -#: builtin/rebase.c:1891 +#: builtin/rebase.c:1957 #, fuzzy msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1961 #, fuzzy msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "font no vàlida: «%s»" -#: builtin/rebase.c:1925 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "no s'ha pogut crear una comissió arrel nova" -#: builtin/rebase.c:1951 +#: builtin/rebase.c:2017 #, fuzzy, c-format msgid "'%s': need exactly one merge base with branch" msgstr "Cal exactament un rang." -#: builtin/rebase.c:1954 +#: builtin/rebase.c:2020 #, fuzzy, c-format msgid "'%s': need exactly one merge base" msgstr "Cal exactament un rang." -#: builtin/rebase.c:1962 +#: builtin/rebase.c:2028 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" msgstr "No assenyala una comissió vàlida: $onto_name" -#: builtin/rebase.c:1987 +#: builtin/rebase.c:2054 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no hi ha tal branca: $branch_name" -#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1961 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/rebase.c:2006 +#: builtin/rebase.c:2073 #, fuzzy msgid "Could not resolve HEAD to a revision" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: builtin/rebase.c:2044 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "No es pot emmagatzemar automàticament" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2114 #, fuzzy, c-format msgid "Unexpected stash response: '%s'" msgstr "final de fitxer inesperat" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2120 #, fuzzy, c-format msgid "Could not create directory for '%s'" msgstr "No s'ha pogut crear el directori «%s»" -#: builtin/rebase.c:2056 +#: builtin/rebase.c:2123 #, fuzzy, c-format msgid "Created autostash: %s\n" msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" -#: builtin/rebase.c:2059 +#: builtin/rebase.c:2126 #, fuzzy msgid "could not reset --hard" msgstr "No s'ha pogut llegir orig-head" -#: builtin/rebase.c:2068 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "Cometeu-los o emmagatzemeu-los." -#: builtin/rebase.c:2095 -#, c-format -msgid "could not parse '%s'" -msgstr "no s'ha pogut analitzar «%s»" - -#: builtin/rebase.c:2108 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "HEAD està al dia." -#: builtin/rebase.c:2121 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branca actual %s està al dia.\n" -#: builtin/rebase.c:2129 +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "La branca actual està al dia, «rebase» forçat." -#: builtin/rebase.c:2131 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branca actual %s està al dia; «rebase» forçat.\n" -#: builtin/rebase.c:2139 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»." -#: builtin/rebase.c:2146 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "Canvis a %s:\n" -#: builtin/rebase.c:2149 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "Canvis de %s a %s:\n" -#: builtin/rebase.c:2174 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al " "damunt...\n" -#: builtin/rebase.c:2183 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "No s'ha pogut separar HEAD" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avanç ràpid %s a %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:821 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18416,7 +18810,7 @@ msgstr "" "predeterminat, establiu la variable de configuració\n" "'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:841 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18438,11 +18832,11 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." -#: builtin/receive-pack.c:1936 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:1950 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." @@ -18463,50 +18857,50 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "«%s» no és una marca de temps vàlida" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, fuzzy, c-format msgid "Marking reachable objects..." msgstr "retén els objectes inabastables" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 #, fuzzy msgid "no reflog specified to delete" msgstr "cap remot especificat" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, fuzzy, c-format msgid "not a reflog: %s" msgstr "no es pot llegir «%s»" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, fuzzy, c-format msgid "no reflog for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre per «%s»" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "format de referència no vàlid: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18514,82 +18908,82 @@ msgstr "" "git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <antic> <nou>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branca>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <url-nou>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branca>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opcions>] <nom>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opcions>] <nom>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opcions>] [<grup> | <remot>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "S'està actualitzant %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18598,84 +18992,97 @@ msgstr "" "\t useu --mirror=fetch o\n" "\t --mirror=push en lloc d'això" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "paràmetre de reflexió desconegut: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "obtén les branques remotes" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "en obtenir, importa totes les etiquetes i tots els objectes" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no obtinguis cap etiqueta (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "branques a seguir" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "branca mestra" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una branca mestra no té sentit amb --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "especificar les branques a seguir té sentit només amb miralls d'obtenció" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» no és un nom de remot vàlid" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "No s'ha pogut configurar la mestra «%s»" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(coincident)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 +#: builtin/remote.c:653 +#, fuzzy, c-format +msgid "could not set '%s'" +msgstr "no s'ha pogut desassignar «%s»" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "No existeix el remot «%s»" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18687,17 +19094,17 @@ msgstr "" "\t%s\n" "\tActualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:701 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de «%s» ha fallat" -#: builtin/remote.c:735 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "la creació de «%s» ha fallat" -#: builtin/remote.c:801 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18712,118 +19119,118 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:815 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració «%s»" -#: builtin/remote.c:916 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" -#: builtin/remote.c:919 +#: builtin/remote.c:996 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:921 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:923 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:964 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca" -#: builtin/remote.c:973 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:975 +#: builtin/remote.c:1052 #, fuzzy, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:978 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "es fa «rebase» sobre el remot %s" -#: builtin/remote.c:982 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:985 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:988 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1031 +#: builtin/remote.c:1108 msgid "create" msgstr "crea" -#: builtin/remote.c:1034 +#: builtin/remote.c:1111 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1038 +#: builtin/remote.c:1115 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1041 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1044 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1051 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1054 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1058 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1129 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1156 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenció: %s" -#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(sense URL)" @@ -18831,177 +19238,177 @@ msgstr "(sense URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1172 builtin/remote.c:1174 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1176 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1178 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1182 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1197 builtin/remote.c:1223 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1206 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a «git pull»:" msgstr[1] " Branques locals configurades per a «git pull»:" -#: builtin/remote.c:1214 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " «git push» reflectirà les referències locals" -#: builtin/remote.c:1220 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a «git push»%s:" msgstr[1] " Referències locals configurades per a «git push»%s:" -#: builtin/remote.c:1241 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1243 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1258 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar la HEAD remota" -#: builtin/remote.c:1260 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:" -#: builtin/remote.c:1270 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1309 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "S'està podant %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1329 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1374 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot «%s»" -#: builtin/remote.c:1453 +#: builtin/remote.c:1530 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1460 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1477 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenció" -#: builtin/remote.c:1479 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1507 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot «%s»" -#: builtin/remote.c:1533 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1535 +#: builtin/remote.c:1612 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1537 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "suprimeix els URL" -#: builtin/remote.c:1544 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1583 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1593 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" @@ -19248,8 +19655,8 @@ msgstr "no s'ha pogut actualitzar %s" msgid "unable to write object to database" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 -#: builtin/replace.c:453 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, fuzzy, c-format msgid "not a valid object name: '%s'" msgstr "No és un nom d'objecte vàlid: «%s»" @@ -19274,17 +19681,17 @@ msgstr "" msgid "could not parse %s as a commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/replace.c:415 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió incorrecta en la comissió «%s»" -#: builtin/replace.c:417 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió mal formada en la comissió «%s»" -#: builtin/replace.c:429 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19293,105 +19700,105 @@ msgstr "" "la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; " "useu --edit en lloc de --graft" -#: builtin/replace.c:468 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "la comissió original «%s» té una signatura gpg" -#: builtin/replace.c:469 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarà la signatura en la comissió de reemplaçament!" -#: builtin/replace.c:479 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»" -#: builtin/replace.c:487 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:491 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "la comissió nova és la mateixa que l'antiga: «%s»" -#: builtin/replace.c:526 +#: builtin/replace.c:527 #, fuzzy, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "Eliminaria l'ítem següent:" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "canvia les mares d'una comissió" -#: builtin/replace.c:551 +#: builtin/replace.c:552 #, fuzzy msgid "convert existing graft file" msgstr "força la sobreescriptura de fitxers existents" -#: builtin/replace.c:552 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:555 +#: builtin/replace.c:556 msgid "use this format" msgstr "usa aquest format" -#: builtin/replace.c:568 +#: builtin/replace.c:569 #, fuzzy msgid "--format cannot be used when not listing" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/replace.c:576 +#: builtin/replace.c:577 #, fuzzy msgid "-f only makes sense when writing a replacement" msgstr "-z només té sentit amb --stdin" -#: builtin/replace.c:580 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw només té sentit amb --edit" -#: builtin/replace.c:586 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:592 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "nombre incorrecte d'arguments" -#: builtin/replace.c:598 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e necessita exactament un argument" -#: builtin/replace.c:604 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g necessita almenys un argument" -#: builtin/replace.c:610 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file arguments" -#: builtin/replace.c:616 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "només es pot especificar un patró amb -l" @@ -19476,8 +19883,8 @@ msgstr "HEAD ara és a %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "No es pot fer un restabliment de %s enmig d'una fusió." -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "sigues silenciós, només informa d'errors" @@ -19557,21 +19964,22 @@ msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»." msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'índex nou." -#: builtin/rev-list.c:411 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no es pot combinar --exclude-promisor-objects i --missing" -#: builtin/rev-list.c:472 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "el filtratge d'objectes requereix --objects" -#: builtin/rev-list.c:522 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-list.c:525 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes" +#: builtin/rev-list.c:615 +#, fuzzy +msgid "marked counting is incompatible with --objects" +msgstr "--first-parent és incompatible amb --bisect" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19736,39 +20144,43 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer següent té modificacions locals:" msgstr[1] "els fitxers següents tenen modificacions locals:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "només elimina de l'índex" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "passa per alt la comprovació d'actualitat" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permet l'eliminació recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "" + +#: builtin/rm.c:305 #, fuzzy msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos " "per a procedir" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no s'ha suprimit «%s» recursivament sense -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" @@ -20019,66 +20431,87 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el dipòsit local" -#: builtin/sparse-checkout.c:20 -msgid "git sparse-checkout (init|list|set|disable) <options>" +#: builtin/sparse-checkout.c:21 +#, fuzzy +msgid "git sparse-checkout (init|list|set|add|disable) <options>" msgstr "git sparse-checkout (init|list|set|disable) <opcions>" -#: builtin/sparse-checkout.c:61 +#: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:220 +#: builtin/sparse-checkout.c:225 +#, fuzzy +msgid "failed to create directory for sparse-checkout file" +msgstr "s'ha produït un error en crear el directori %s" + +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:237 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:256 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:262 +#: builtin/sparse-checkout.c:308 #, fuzzy msgid "initialize sparse-checkout" msgstr "omet l'aplicació del filtre d'agafament parcial" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:341 #, c-format msgid "failed to open '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: builtin/sparse-checkout.c:361 -msgid "git sparse-checkout set (--stdin | <patterns>)" +#: builtin/sparse-checkout.c:398 +#, fuzzy, c-format +msgid "could not normalize path %s" +msgstr "no s'ha pogut analitzar el pedaç «%s»" + +#: builtin/sparse-checkout.c:410 +#, fuzzy +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout set (--stdin | <patrons>)" -#: builtin/sparse-checkout.c:378 +#: builtin/sparse-checkout.c:435 +#, fuzzy, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" + +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +#, fuzzy +msgid "unable to load existing sparse-checkout patterns" +msgstr "estableix els patrons «sparse-checkout»" + +#: builtin/sparse-checkout.c:558 msgid "read patterns from standard in" msgstr "llegeix els patrons de l'entrada estàndard" -#: builtin/sparse-checkout.c:384 -#, msgid "set sparse-checkout patterns" +#: builtin/sparse-checkout.c:564 msgid "set sparse-checkout patterns" msgstr "estableix els patrons «sparse-checkout»" -#: builtin/sparse-checkout.c:447 +#: builtin/sparse-checkout.c:581 msgid "disable sparse-checkout" msgstr "inhabilita «sparse-checkout»" -#: builtin/sparse-checkout.c:459 +#: builtin/sparse-checkout.c:593 msgid "error while refreshing working directory" msgstr "s'ha produït un error en actualitzar el directori de treball" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<opcions>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opcions>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "" @@ -20086,25 +20519,27 @@ msgstr "" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branca> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 +#, fuzzy msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20112,186 +20547,196 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<missatge>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n" +" [--] [<pathspec>...]]" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "«%s» no és una comissió de tipus «stash»" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "S'han especificat massa revisions:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:549 +#: builtin/stash.c:162 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "No s'ha trobat cap «stash»." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "«%s» no és una referència vàlida" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear amb paràmetres no està implementat" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "no es pot aplicar un «stash» enmig d'una fusió" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "no s'ha pogut generar diff %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "no s'ha pogut desar l'arbre d'índex" -#: builtin/stash.c:436 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»" -#: builtin/stash.c:450 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "S'està fusionant %s amb %s" -#: builtin/stash.c:460 git-legacy-stash.sh:681 +#: builtin/stash.c:461 git-legacy-stash.sh:681 msgid "Index was not unstashed." -msgstr "L'índex no estava «unstashed»" +msgstr "L'índex no estava «unstashed»." -#: builtin/stash.c:521 builtin/stash.c:620 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "intenta tornar a crear l'índex" -#: builtin/stash.c:554 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Descartat %s (%s)" -#: builtin/stash.c:557 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: no s'ha pogut descartar l'entrada «stash»" -#: builtin/stash.c:582 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "«%s» no és una referència «stash»" -#: builtin/stash.c:632 git-legacy-stash.sh:695 +#: builtin/stash.c:633 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada." -#: builtin/stash.c:655 git-legacy-stash.sh:713 +#: builtin/stash.c:656 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: builtin/stash.c:795 builtin/stash.c:832 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "No es pot actualitzar %s amb %s" -#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 msgid "stash message" msgstr "missatge «stash»" -#: builtin/stash.c:823 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "«git stash store» requereix un paràmetre <comissió>" -#: builtin/stash.c:1045 git-legacy-stash.sh:218 +#: builtin/stash.c:1049 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "No hi ha canvis seleccionats" -#: builtin/stash.c:1145 git-legacy-stash.sh:150 +#: builtin/stash.c:1149 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Encara no teniu la comissió inicial" -#: builtin/stash.c:1172 git-legacy-stash.sh:165 +#: builtin/stash.c:1176 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "No es pot desar l'estat d'índex actual" -#: builtin/stash.c:1181 git-legacy-stash.sh:180 +#: builtin/stash.c:1185 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "No es poden desar els fitxers no seguits" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 #: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "No es pot desar l'estat d'arbre de treball actual" -#: builtin/stash.c:1229 git-legacy-stash.sh:234 +#: builtin/stash.c:1233 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: builtin/stash.c:1278 git-legacy-stash.sh:338 +#: builtin/stash.c:1282 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No es poden usar --patch i --include-untracked o --all a la vegada" -#: builtin/stash.c:1294 +#: builtin/stash.c:1298 msgid "Did you forget to 'git add'?" msgstr "Heu oblidat de fer «git add»?" -#: builtin/stash.c:1309 git-legacy-stash.sh:346 +#: builtin/stash.c:1313 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: builtin/stash.c:1316 git-legacy-stash.sh:351 +#: builtin/stash.c:1320 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: builtin/stash.c:1331 git-legacy-stash.sh:355 +#: builtin/stash.c:1335 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: builtin/stash.c:1336 +#: builtin/stash.c:1340 #, c-format msgid "Saved working directory and index state %s" msgstr "S'han desat el directori de treball i l'estat d'índex %s" -#: builtin/stash.c:1426 git-legacy-stash.sh:385 +#: builtin/stash.c:1430 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "keep index" msgstr "mantén l'índex" -#: builtin/stash.c:1463 builtin/stash.c:1499 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1464 builtin/stash.c:1500 +#: builtin/stash.c:1472 builtin/stash.c:1537 msgid "quiet mode" msgstr "mode silenciós" -#: builtin/stash.c:1466 builtin/stash.c:1502 +#: builtin/stash.c:1474 builtin/stash.c:1539 msgid "include untracked files in stash" msgstr "inclou els fitxers no seguits a «stash»" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1476 builtin/stash.c:1541 msgid "include ignore files" msgstr "inclou els fitxers ignorats" -#: builtin/stash.c:1564 +#: builtin/stash.c:1600 #, c-format msgid "could not exec %s" msgstr "no s'ha pogut executar %s" @@ -20313,7 +20758,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteposa el caràcter de comentari i un espai a cada línia" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" @@ -20327,7 +20772,7 @@ msgstr "" msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url «%s»" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "àncora alternativa per als camins relatius" @@ -20365,7 +20810,7 @@ msgstr "" msgid "Suppress output of entering each submodule command" msgstr "Omet la sortida en entrar l'ordre de cada submòdul" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "Inclou recursivament els submòduls imbricats" @@ -20414,73 +20859,73 @@ msgstr "Omet la sortida d'inicialitzar un submòdul" msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opcions>] [<camí>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»" -#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "Suprimeix la sortida de l'estat del submòdul" -#: builtin/submodule--helper.c:879 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "inclou recursivament els submòduls imbricats" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]" -#: builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camí>" -#: builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" -#: builtin/submodule--helper.c:1051 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "Omet la sortida de la sincronització de l'url del submòdul" -#: builtin/submodule--helper.c:1058 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20489,7 +20934,7 @@ msgstr "" "L'arbre de treball de submòdul «%s» conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" -#: builtin/submodule--helper.c:1124 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20498,47 +20943,47 @@ msgstr "" "L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' " "per a descartar-les" -#: builtin/submodule--helper.c:1132 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "S'ha netejat el directori «%s»\n" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n" -#: builtin/submodule--helper.c:1145 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "no s'ha pogut crear el directori de submòdul buit %s" -#: builtin/submodule--helper.c:1161 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis " "locals" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "Desregistra recursivament tots els submòduls" -#: builtin/submodule--helper.c:1196 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]" -#: builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: builtin/submodule--helper.c:1275 +#: builtin/submodule--helper.c:1289 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -20546,150 +20991,152 @@ msgid "" "'--reference-if-able' instead of '--reference'." msgstr "" -#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul «%s» no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:1353 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy" -#: builtin/submodule--helper.c:1360 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation" -#: builtin/submodule--helper.c:1383 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" -#: builtin/submodule--helper.c:1386 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "nom del submòdul nou" -#: builtin/submodule--helper.c:1389 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submòdul" -#: builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "força el progrés del clonatge" -#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 msgid "disallow cloning into non-empty directory" msgstr "no permetis clonar en un directori no buit" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1424 +#, fuzzy msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>" -#: builtin/submodule--helper.c:1431 +#: builtin/submodule--helper.c:1449 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" -#: builtin/submodule--helper.c:1442 +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat" -#: builtin/submodule--helper.c:1446 +#: builtin/submodule--helper.c:1464 #, c-format msgid "directory not empty: '%s'" msgstr "directori no buit: «%s»" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»" -#: builtin/submodule--helper.c:1494 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:1498 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:1594 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camí de submòdul «%s» no està inicialitzat" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" msgstr "Potser voleu usar 'update --init'?" -#: builtin/submodule--helper.c:1628 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "S'està ometent el submòdul no fusionat %s" -#: builtin/submodule--helper.c:1657 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "S'està ometent el submòdul «%s»" -#: builtin/submodule--helper.c:1803 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent" -#: builtin/submodule--helper.c:1814 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant" -#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "camí a l'arbre de treball" -#: builtin/submodule--helper.c:1879 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#: builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1916 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "tasques paral·leles" -#: builtin/submodule--helper.c:1894 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" -#: builtin/submodule--helper.c:1895 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" -#: builtin/submodule--helper.c:1904 +#: builtin/submodule--helper.c:1933 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:1917 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "valor incorrecte per al paràmetre update" -#: builtin/submodule--helper.c:1965 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20698,55 +21145,55 @@ msgstr "" "La branca de submòdul (%s) està configurada per a heretar la branca del " "superprojecte, però el superprojecte no és en cap branca" -#: builtin/submodule--helper.c:2088 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no s'ha pogut obtenir el gestor del dipòsit pel submòdul «%s»" -#: builtin/submodule--helper.c:2121 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "inclou recursivament als submòduls" -#: builtin/submodule--helper.c:2127 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]" -#: builtin/submodule--helper.c:2183 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "comprova si és segur escriure al fitxer .gitmodules" -#: builtin/submodule--helper.c:2186 +#: builtin/submodule--helper.c:2215 #, fuzzy msgid "unset the config in the .gitmodules file" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: builtin/submodule--helper.c:2191 +#: builtin/submodule--helper.c:2220 #, fuzzy msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [valor]" -#: builtin/submodule--helper.c:2192 +#: builtin/submodule--helper.c:2221 #, fuzzy msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config name [valor]" -#: builtin/submodule--helper.c:2193 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2212 git-submodule.sh:173 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, fuzzy, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos " "per a procedir" -#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:2268 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» no és un subordre vàlid de submodule--helper" @@ -20997,7 +21444,7 @@ msgstr "l'etiqueta «%s» ja existeix" msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta «%s» actualitzada (era %s)\n" -#: builtin/unpack-objects.c:501 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" @@ -21386,7 +21833,7 @@ msgstr "git worktree lock [<opcions>] <arbre de treball>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <camí>" -#: builtin/worktree.c:60 builtin/worktree.c:898 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "s'ha produït un error en suprimir «%s»" @@ -21440,198 +21887,201 @@ msgstr "fes caducar els arbres de treball més vells que <hora>" msgid "'%s' already exists" msgstr "«%s» ja existeix" -#: builtin/worktree.c:251 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»" -#: builtin/worktree.c:256 +#: builtin/worktree.c:249 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:258 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:308 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de «%s»" -#: builtin/worktree.c:439 builtin/worktree.c:445 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "S'està preparant l'arbre de treball (branca nova «%s»)" -#: builtin/worktree.c:441 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:450 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)" -#: builtin/worktree.c:456 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "S'està preparant l'arbre de treball (HEAD %s separat)" -#: builtin/worktree.c:497 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball" -#: builtin/worktree.c:500 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:502 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:504 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:505 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "mantén l'arbre de treball nou bloquejat" -#: builtin/worktree.c:508 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "configura el mode de seguiment (vegeu git-branch(1))" -#: builtin/worktree.c:511 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment " "remot" -#: builtin/worktree.c:519 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mútuament excloents" -#: builtin/worktree.c:580 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track només es pot usar si es crea una branca nova" -#: builtin/worktree.c:680 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 -#: builtin/worktree.c:926 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» no és un arbre de treball" -#: builtin/worktree.c:694 builtin/worktree.c:727 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:699 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» ja està bloquejat, raó: «%s»" -#: builtin/worktree.c:701 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "«%s» ja està bloquejat" -#: builtin/worktree.c:729 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "«%s» no està bloquejat" -#: builtin/worktree.c:770 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" -msgstr "els arbres de treball que contenen submòduls no es poden moure o suprimir" +msgstr "" +"els arbres de treball que contenen submòduls no es poden moure o suprimir" -#: builtin/worktree.c:778 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" -msgstr "força el moviment encara que l'arbre de treball estigui brut o bloquejat" +msgstr "" +"força el moviment encara que l'arbre de treball estigui brut o bloquejat" -#: builtin/worktree.c:801 builtin/worktree.c:928 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "«%s» és un arbre de treball principal" -#: builtin/worktree.c:806 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no s'ha pogut deduir el nom de destí des de «%s»" -#: builtin/worktree.c:812 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "el destí «%s» ja existeix" -#: builtin/worktree.c:820 +#: builtin/worktree.c:813 #, fuzzy, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:822 +#: builtin/worktree.c:815 #, fuzzy msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:825 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s" -#: builtin/worktree.c:830 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "s'ha produït un error en moure «%s» a «%s»" -#: builtin/worktree.c:878 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "no s'ha pogut executar «git status» a «%s»" -#: builtin/worktree.c:882 +#: builtin/worktree.c:875 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:887 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no s'ha pogut executar «git status» a «%s», codi %d" -#: builtin/worktree.c:910 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" -msgstr "força la supressió encara que l'arbre de treball estigui brut o bloquejat" +msgstr "" +"força la supressió encara que l'arbre de treball estigui brut o bloquejat" -#: builtin/worktree.c:933 +#: builtin/worktree.c:926 #, fuzzy, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:935 +#: builtin/worktree.c:928 #, fuzzy msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:938 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -21944,44 +22394,44 @@ msgstr "" msgid "dumb http transport does not support shallow capabilities" msgstr "El servidor no permet clients superficials" -#: remote-curl.c:1037 +#: remote-curl.c:1038 #, fuzzy msgid "fetch failed." msgstr "l'«stash» ha fallat" -#: remote-curl.c:1085 +#: remote-curl.c:1086 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1129 remote-curl.c:1135 +#: remote-curl.c:1130 remote-curl.c:1136 #, fuzzy, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" "s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»" -#: remote-curl.c:1147 remote-curl.c:1261 +#: remote-curl.c:1148 remote-curl.c:1263 #, fuzzy, c-format msgid "http transport does not support %s" msgstr "la variant «simple» d'ssh no és compatible amb -4" -#: remote-curl.c:1183 +#: remote-curl.c:1184 #, fuzzy msgid "git-http-push failed" msgstr "l'«stash» ha fallat" -#: remote-curl.c:1367 +#: remote-curl.c:1369 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1401 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1406 +#: remote-curl.c:1408 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1446 +#: remote-curl.c:1448 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -22933,60 +23383,49 @@ msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" -#: git-submodule.sh:202 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "El camí relatiu només es pot usar des del nivell superior de l'arbre de " "treball" -#: git-submodule.sh:212 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../" -#: git-submodule.sh:231 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ja existeix en l'índex" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ja existeix en l'índex i no és submòdul" -#: git-submodule.sh:241 +#: git-submodule.sh:242 #, fuzzy, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "el camí «%s» no té la seva versió" -#: git-submodule.sh:247 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" -"El camí següent s'ignora per un dels vostres fitxers .gitignore:\n" -"$sm_path\n" -"Useu -f si realment voleu afegir-lo." - -#: git-submodule.sh:270 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex" -#: git-submodule.sh:272 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" -#: git-submodule.sh:280 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Es troba un directori de git per a '$sm_name' localment amb els remots:" -#: git-submodule.sh:282 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23003,39 +23442,39 @@ msgstr "" "o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" "name'." -#: git-submodule.sh:288 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "S'està reactivant el directori de git local per al submòdul '$sm_name'." -#: git-submodule.sh:300 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No s'ha pogut agafar el submòdul '$sm_path'" -#: git-submodule.sh:305 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" -#: git-submodule.sh:314 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:580 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" -#: git-submodule.sh:590 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" -#: git-submodule.sh:595 +#: git-submodule.sh:605 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23044,7 +23483,7 @@ msgstr "" "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " "camí de submòdul '$sm_path'" -#: git-submodule.sh:613 +#: git-submodule.sh:623 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23053,7 +23492,7 @@ msgstr "" "No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està " "intentant obtenir directament $sha1:" -#: git-submodule.sh:619 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23062,76 +23501,76 @@ msgstr "" "S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. " "L'obtenció directa d'aquella comissió ha fallat." -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»" -#: git-submodule.sh:631 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No s'ha pogut fer «rebase» «$sha1»' en el camí de submòdul «$displaypath»" -#: git-submodule.sh:632 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»" -#: git-submodule.sh:637 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»" -#: git-submodule.sh:638 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»" -#: git-submodule.sh:643 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'execució de «$command $sha1» ha fallat en el camí de submòdul " "«$displaypath»" -#: git-submodule.sh:644 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Camí de submòdul «$displaypath»: «$command $sha1»" -#: git-submodule.sh:675 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "S'ha produït un error en recorre recursivament dins del camí de submòdul " "«$displaypath»" -#: git-submodule.sh:886 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:938 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:958 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Avís: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:961 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Avís: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:964 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" @@ -23181,9 +23620,10 @@ msgstr "" " p, pick <comissió> = usa la comissió\n" " r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n" " e, edit <comissió> = usa la comissió, però atura't per a esmenar\n" -" s, squash <comissió> = usa la comissió, però fusiona'l a la comissió prèvia\n" -" f, fixup <comissió> = com \"squash\", però descarta el missatge de registre d'aquesta " -"comissió\n" +" s, squash <comissió> = usa la comissió, però fusiona'l a la comissió " +"prèvia\n" +" f, fixup <comissió> = com \"squash\", però descarta el missatge de registre " +"d'aquesta comissió\n" " x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret " "d'ordres\n" " d, drop = elimina la comissió\n" @@ -23447,6 +23887,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)" msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)" +#: git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Tingueu en compte que les comissions buides estan comentades" + #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "No s'han pogut iniciar les comissions reescrites" @@ -23728,129 +24172,11 @@ msgstr "" msgid "The selected hunks do not apply to the index!\n" msgstr "Els trossos seleccionats no apliquen a l'índex\n" -#: git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Voleu aplicar-los igualment a l'arbre de treball? " - -#: git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "No s'ha aplicat res.\n" - #: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#: git-add--interactive.perl:1428 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1429 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1430 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1433 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1434 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1435 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1438 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1439 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1440 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1443 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1444 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1445 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1453 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d" -"%s,?]? " - -#: git-add--interactive.perl:1454 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1455 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1458 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1459 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1460 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " - #: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " @@ -24319,3 +24645,101 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " + +#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " +#~ msgstr "Canvia el mode de «stage» [y,n,a,q,d%s,?]? " + +#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " +#~ msgstr "Suprimeix «stage» [y,n,a,q,d%s,?]? " + +#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " +#~ msgstr "Fer un «stage» d'aquest tros [y,n,a,q,d%s,?]? " + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging.\n" +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per «staging».\n" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this and all the remaining hunks\n" +#~ "d - do not stage this hunk nor any of the remaining hunks\n" +#~ msgstr "" +#~ "y - fes «stage» d'aquest tros\n" +#~ "n - no facis «stage» d'aquest tros\n" +#~ "q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" +#~ "a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" +#~ "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer\n" + +#~ msgid "could not copy '%s' to '%s'." +#~ msgstr "no s'ha pogut copiar «%s» a «%s»." + +#~ msgid "malformed ident line" +#~ msgstr "línia d'identitat mal formada" + +#~ msgid "corrupted author without date information" +#~ msgstr "autor malmès sense informació de data" + +#~ msgid "could not parse '%.*s'" +#~ msgstr "no s'ha pogut analitzar «%.*s»" + +#~ msgid "could not checkout %s" +#~ msgstr "no es pot agafar %s" + +#~ msgid "Use -f if you really want to add them.\n" +#~ msgstr "Useu -f si realment els voleu afegir.\n" + +#~ msgid "Maybe you wanted to say 'git add .'?\n" +#~ msgstr "Potser volíeu dir «git add .»?\n" + +#, fuzzy +#~ msgid "packfile is invalid: %s" +#~ msgstr "%s no vàlid" + +#, fuzzy +#~ msgid "unable to open packfile for reuse: %s" +#~ msgstr "no s'ha pogut obrir o llegir %s" + +#, fuzzy +#~ msgid "unable to seek in reused packfile" +#~ msgstr "no es pot llegir el fitxer d'índex" + +#, fuzzy +#~ msgid "unable to read from reused packfile" +#~ msgstr "no es pot llegir el fitxer d'índex" + +#~ msgid "no HEAD?" +#~ msgstr "no hi ha cap HEAD?" + +#, fuzzy +#~ msgid "make committer date match author date" +#~ msgstr "Agrupa per «comitter» en comptes de per autor" + +#, fuzzy +#~ msgid "synonym of --reset-author-date" +#~ msgstr "sinònim de --files-with-matches" + +#, fuzzy +#~ msgid "ignore changes in whitespace" +#~ msgstr "ignora els canvis d'espai en blanc al final de la línia" + +#, fuzzy +#~ msgid "preserve empty commits during rebase" +#~ msgstr "preserva les comissions inicialment buides" + +#~ msgid "cannot combine --use-bitmap-index with object filtering" +#~ msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes" + +#~ msgid "" +#~ "The following path is ignored by one of your .gitignore files:\n" +#~ "$sm_path\n" +#~ "Use -f if you really want to add it." +#~ msgstr "" +#~ "El camí següent s'ignora per un dels vostres fitxers .gitignore:\n" +#~ "$sm_path\n" +#~ "Useu -f si realment voleu afegir-lo." |