diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2015-01-26 17:12:50 (GMT) |
|---|---|---|
| committer | Alex Henrie <alexhenrie24@gmail.com> | 2015-01-26 17:12:50 (GMT) |
| commit | 573ed5e14717c7bcccbb51357cc311a482135346 (patch) | |
| tree | 497242d95e3b2d24baa15dc3b7ab8d651d47d9fc /po | |
| parent | 1e607449135792dd117bd528432fc1fbc1115667 (diff) | |
| download | git-573ed5e14717c7bcccbb51357cc311a482135346.zip git-573ed5e14717c7bcccbb51357cc311a482135346.tar.gz git-573ed5e14717c7bcccbb51357cc311a482135346.tar.bz2 | |
l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/ca.po | 1862 |
1 files changed, 937 insertions, 925 deletions
@@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-11-01 07:46+0800\n" -"PO-Revision-Date: 2014-12-22 00:17+0100\n" -"Last-Translator: Joan Perals Tresserra <j.pertres@gmail.com>\n" +"POT-Creation-Date: 2015-01-18 11:24+0800\n" +"PO-Revision-Date: 2015-01-26 10:12-0700\n" +"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.1\n" +"X-Generator: Poedit 1.7.3\n" #: advice.c:55 #, c-format @@ -50,76 +50,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer" -#: archive.c:419 +#: archive.c:427 msgid "fmt" msgstr "format" -#: archive.c:419 +#: archive.c:427 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:420 builtin/log.c:1204 +#: archive.c:428 builtin/log.c:1204 msgid "prefix" msgstr "prefix" -#: archive.c:421 +#: archive.c:429 msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 -#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fitxer" -#: archive.c:423 builtin/archive.c:89 +#: archive.c:431 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:425 +#: archive.c:433 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:426 +#: archive.c:434 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:427 +#: archive.c:435 msgid "store only" msgstr "només emmagatzemar" -#: archive.c:428 +#: archive.c:436 msgid "compress faster" msgstr "comprimeix més ràpid" -#: archive.c:436 +#: archive.c:444 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:439 +#: archive.c:447 msgid "list supported archive formats" msgstr "allista els formats d'arxiu admesos" -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "dipòsit" -#: archive.c:442 builtin/archive.c:91 +#: archive.c:450 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 msgid "command" msgstr "ordre" -#: archive.c:444 builtin/archive.c:93 +#: archive.c:452 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remot" @@ -260,7 +260,7 @@ 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:87 builtin/commit.c:788 +#: bundle.c:87 builtin/commit.c:770 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" @@ -269,9 +269,9 @@ msgstr "no s'ha pogut obrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" @@ -291,7 +291,7 @@ msgstr "El farcell registra una història completa." #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" -msgstr[0] "EL farcell requereix aquesta referència:" +msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes %d referències:" #: bundle.c:251 @@ -329,7 +329,7 @@ msgstr "no es pot crear '%s'" msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:157 +#: color.c:259 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" @@ -378,25 +378,25 @@ msgstr "nivell de compressió de zlib dolent %d" msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1201 +#: config.c:1211 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:1262 +#: config.c:1272 msgid "unknown error occured while reading the configuration files" msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració" -#: config.c:1586 +#: config.c:1596 #, 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:1588 +#: config.c:1598 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d" -#: config.c:1647 +#: config.c:1657 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" @@ -641,11 +641,11 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:275 +#: lockfile.c:283 msgid "BUG: reopen a lockfile that is still open" msgstr "BUG: reobrir un fitxer de bloqueig que encara està obert" -#: lockfile.c:277 +#: lockfile.c:285 msgid "BUG: reopen a lockfile that has been committed" msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès" @@ -653,8 +653,8 @@ msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès" msgid "failed to read the cache" msgstr "s'ha fallat en llegir la memòria cau" -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 -#: builtin/clone.c:659 +#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580 +#: builtin/clone.c:662 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" @@ -672,64 +672,64 @@ msgstr "addinfo_cache ha fallat per al camí '%s'" msgid "error building trees" msgstr "error en construir arbres" -#: merge-recursive.c:691 +#: merge-recursive.c:688 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha fallat en crear el camí '%s' %s" -#: merge-recursive.c:702 +#: merge-recursive.c:699 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:716 merge-recursive.c:737 +#: merge-recursive.c:713 merge-recursive.c:734 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:727 +#: merge-recursive.c:724 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refusant perdre el fitxer no seguit a '%s'" -#: merge-recursive.c:767 +#: merge-recursive.c:764 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s '%s'" -#: merge-recursive.c:769 +#: merge-recursive.c:766 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s '%s'" -#: merge-recursive.c:792 builtin/clone.c:318 +#: merge-recursive.c:789 builtin/clone.c:321 #, c-format msgid "failed to open '%s'" msgstr "s'ha fallat en obrir '%s'" -#: merge-recursive.c:800 +#: merge-recursive.c:797 #, c-format msgid "failed to symlink '%s'" msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'" -#: merge-recursive.c:803 +#: merge-recursive.c:800 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no es sap què fer amb %06o %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:938 msgid "Failed to execute internal merge" msgstr "S'ha fallat en executar la fusió interna" -#: merge-recursive.c:945 +#: merge-recursive.c:942 #, c-format msgid "Unable to add %s to database" msgstr "no s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:961 +#: merge-recursive.c:958 msgid "unsupported object type in the tree" msgstr "tipus d'objecte no compatible en l'arbre" -#: merge-recursive.c:1036 merge-recursive.c:1050 +#: merge-recursive.c:1033 merge-recursive.c:1047 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -738,7 +738,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:1042 merge-recursive.c:1055 +#: merge-recursive.c:1039 merge-recursive.c:1052 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -747,20 +747,20 @@ 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:1096 +#: merge-recursive.c:1093 msgid "rename" msgstr "canvia de nom" -#: merge-recursive.c:1096 +#: merge-recursive.c:1093 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1152 +#: merge-recursive.c:1149 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; afegint com a %s en lloc" -#: merge-recursive.c:1174 +#: merge-recursive.c:1171 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -769,146 +769,146 @@ 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:1179 +#: merge-recursive.c:1176 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1233 +#: merge-recursive.c:1230 #, 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:1263 +#: merge-recursive.c:1260 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1462 +#: merge-recursive.c:1459 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTE (supressió/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s" -#: merge-recursive.c:1472 +#: merge-recursive.c:1469 #, c-format msgid "Adding merged %s" msgstr "Afegint %s fusionat" -#: merge-recursive.c:1477 merge-recursive.c:1675 +#: merge-recursive.c:1474 merge-recursive.c:1672 #, c-format msgid "Adding as %s instead" msgstr "Afegint com a %s en lloc d'això" -#: merge-recursive.c:1528 +#: merge-recursive.c:1525 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1531 +#: merge-recursive.c:1528 #, c-format msgid "object %s is not a blob" msgstr "L'objecte %s no és un blob" -#: merge-recursive.c:1579 +#: merge-recursive.c:1576 msgid "modify" msgstr "modifica" -#: merge-recursive.c:1579 +#: merge-recursive.c:1576 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1589 +#: merge-recursive.c:1586 msgid "content" msgstr "contingut" -#: merge-recursive.c:1596 +#: merge-recursive.c:1593 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1630 +#: merge-recursive.c:1627 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s saltat (el fusionat és igual a l'existent)" -#: merge-recursive.c:1644 +#: merge-recursive.c:1641 #, c-format msgid "Auto-merging %s" msgstr "Autofusionant %s" -#: merge-recursive.c:1648 git-submodule.sh:1150 +#: merge-recursive.c:1645 git-submodule.sh:1150 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1649 +#: merge-recursive.c:1646 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1732 #, c-format msgid "Removing %s" msgstr "Eliminant %s" -#: merge-recursive.c:1760 +#: merge-recursive.c:1757 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1766 +#: merge-recursive.c:1763 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1771 +#: merge-recursive.c:1768 #, 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. Afegint %s com a %s" -#: merge-recursive.c:1781 +#: merge-recursive.c:1778 #, c-format msgid "Adding %s" msgstr "Afegint %s" -#: merge-recursive.c:1798 +#: merge-recursive.c:1795 msgid "Fatal merge failure, shouldn't happen." msgstr "Fallat de fusió fatal; això no ha de passar." -#: merge-recursive.c:1817 +#: merge-recursive.c:1814 msgid "Already up-to-date!" msgstr "Ja al dia!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1823 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:1856 +#: merge-recursive.c:1853 #, c-format msgid "Unprocessed path??? %s" msgstr "Camí no processat??? %s" -#: merge-recursive.c:1901 +#: merge-recursive.c:1898 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:1914 +#: merge-recursive.c:1911 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat:" msgstr[1] "s'han trobat %u avantpassats:" -#: merge-recursive.c:1951 +#: merge-recursive.c:1948 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2008 +#: merge-recursive.c:2005 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2019 builtin/merge.c:666 +#: merge-recursive.c:2016 builtin/merge.c:667 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -916,19 +916,19 @@ msgstr "No s'ha pogut escriure l'índex." msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" -#: notes-utils.c:83 +#: notes-utils.c:82 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Valor de notes.rewriteMode dolent: '%s'" -#: notes-utils.c:93 +#: notes-utils.c:92 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:120 +#: notes-utils.c:119 #, c-format msgid "Bad %s value: '%s'" msgstr "Valor dolent de %s: '%s'" @@ -1038,7 +1038,7 @@ msgstr "no s'ha pogut analitzar el format --pretty" msgid "done" msgstr "fet" -#: read-cache.c:1261 +#: read-cache.c:1267 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1047,7 +1047,7 @@ msgstr "" "index.version establert, però el valor no és vàlid.\n" "Usant la versió %i" -#: read-cache.c:1271 +#: read-cache.c:1277 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1075,32 +1075,32 @@ msgstr "%s segueix ambdós %s i %s" msgid "Internal error" msgstr "Error intern" -#: remote.c:1968 +#: remote.c:1980 #, 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:1972 +#: remote.c:1984 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:1975 +#: remote.c:1987 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "La vostra branca està al dia amb '%s'.\n" -#: remote.c:1979 +#: remote.c:1991 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n" msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n" -#: remote.c:1985 +#: remote.c:1997 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:1988 +#: remote.c:2000 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1112,11 +1112,11 @@ msgstr[1] "" "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " "ràpidament.\n" -#: remote.c:1996 +#: remote.c:2008 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" -#: remote.c:1999 +#: remote.c:2011 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1131,7 +1131,7 @@ msgstr[1] "" "La vostra branca i '%s' s'han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2009 +#: remote.c:2021 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" @@ -1144,22 +1144,22 @@ msgstr "s'ha fallat en obrir /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ha fallat" -#: send-pack.c:265 +#: send-pack.c:268 msgid "failed to sign the push certificate" msgstr "s'ha fallat en firmar el certificat de pujada" -#: send-pack.c:322 +#: send-pack.c:325 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 -#: builtin/merge.c:1002 builtin/merge.c:1012 +#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 +#: builtin/merge.c:1005 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 -#: builtin/merge.c:1004 builtin/merge.c:1017 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997 +#: builtin/merge.c:1010 #, c-format msgid "Could not write to '%s'" msgstr "No s'ha pogut escriure al '%s'" @@ -1182,7 +1182,7 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:211 sequencer.c:852 sequencer.c:935 +#: sequencer.c:211 sequencer.c:856 sequencer.c:939 #, c-format msgid "Could not write to %s" msgstr "No s'ha pogut escriure a %s" @@ -1205,44 +1205,44 @@ msgid "Commit your changes or stash them to proceed." msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:304 +#: sequencer.c:321 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:335 +#: sequencer.c:339 msgid "Could not resolve HEAD commit\n" msgstr "No s'ha pogut resoldre la comissió HEAD\n" -#: sequencer.c:355 +#: sequencer.c:359 msgid "Unable to update cache tree\n" msgstr "No s'ha pogut actualitzar l'arbre cau\n" -#: sequencer.c:402 +#: sequencer.c:406 #, c-format msgid "Could not parse commit %s\n" msgstr "No s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:407 +#: sequencer.c:411 #, c-format msgid "Could not parse parent commit %s\n" -msgstr "No s'ha pogut analitzar la comissió pare %s\n" +msgstr "No s'ha pogut analitzar la comissió mare %s\n" -#: sequencer.c:473 +#: sequencer.c:477 msgid "Your index file is unmerged." msgstr "El vostre fitxer d'índex està sense fusionar." -#: sequencer.c:492 +#: sequencer.c:496 #, 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:500 +#: sequencer.c:504 #, c-format msgid "Commit %s does not have parent %d" -msgstr "La comissió %s no té pare %d" +msgstr "La comissió %s no té mare %d" -#: sequencer.c:504 +#: sequencer.c:508 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1250,154 +1250,154 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:517 +#: sequencer.c:521 #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "%s: no es pot analitzar la comissió pare %s" +msgstr "%s: no es pot analitzar la comissió mare %s" -#: sequencer.c:521 +#: sequencer.c:525 #, c-format msgid "Cannot get commit message for %s" msgstr "No es pot obtenir el missatge de comissió de %s" -#: sequencer.c:607 +#: sequencer.c:611 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s...%s" -#: sequencer.c:608 +#: sequencer.c:612 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s...%s" -#: sequencer.c:644 +#: sequencer.c:648 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:652 +#: sequencer.c:656 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha fallat en llegir l'índex" -#: sequencer.c:656 +#: sequencer.c:660 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha fallat en actualitzar l'índex" -#: sequencer.c:716 +#: sequencer.c:720 #, c-format msgid "Cannot %s during a %s" msgstr "No es pot %s durant un %s" -#: sequencer.c:738 +#: sequencer.c:742 #, c-format msgid "Could not parse line %d." msgstr "No s'ha pogut analitzar la línia %d." -#: sequencer.c:743 +#: sequencer.c:747 msgid "No commits parsed." msgstr "Cap comissió analitzada." -#: sequencer.c:756 +#: sequencer.c:760 #, c-format msgid "Could not open %s" msgstr "No s'ha pogut obrir %s" -#: sequencer.c:760 +#: sequencer.c:764 #, c-format msgid "Could not read %s." msgstr "No s'ha pogut llegir %s." -#: sequencer.c:767 +#: sequencer.c:771 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Full d'instruccions inusable: %s" -#: sequencer.c:797 +#: sequencer.c:801 #, c-format msgid "Invalid key: %s" msgstr "Clau no vàlida: %s" -#: sequencer.c:800 +#: sequencer.c:804 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no vàlid per a %s: %s" -#: sequencer.c:812 +#: sequencer.c:816 #, c-format msgid "Malformed options sheet: %s" msgstr "Full d'opcions mal format: %s" -#: sequencer.c:833 +#: sequencer.c:837 msgid "a cherry-pick or revert is already in progress" msgstr "un recull de cireres o una reversió ja està en curs" -#: sequencer.c:834 +#: sequencer.c:838 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:838 +#: sequencer.c:842 #, c-format msgid "Could not create sequencer directory %s" msgstr "No s'ha pogut crear el directori de seqüenciador %s" -#: sequencer.c:854 sequencer.c:939 +#: sequencer.c:858 sequencer.c:943 #, c-format msgid "Error wrapping up %s." msgstr "Error en finalitzar %s." -#: sequencer.c:873 sequencer.c:1009 +#: sequencer.c:877 sequencer.c:1013 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" -#: sequencer.c:875 +#: sequencer.c:879 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:877 +#: sequencer.c:881 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:899 builtin/apply.c:4128 +#: sequencer.c:903 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "no es pot obrir %s: %s" -#: sequencer.c:902 +#: sequencer.c:906 #, c-format msgid "cannot read %s: %s" msgstr "no es pot llegir %s: %s" -#: sequencer.c:903 +#: sequencer.c:907 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:909 +#: sequencer.c:913 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és corrupte" -#: sequencer.c:932 +#: sequencer.c:936 #, c-format msgid "Could not format %s." msgstr "No s'ha pogut formatar %s." -#: sequencer.c:1077 +#: sequencer.c:1081 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot recollir com a cirera un %s" -#: sequencer.c:1080 +#: sequencer.c:1084 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:1114 +#: sequencer.c:1118 msgid "Can't revert as initial commit" msgstr "No es pot revertir com a comissió inicial" -#: sequencer.c:1115 +#: sequencer.c:1119 msgid "Can't cherry-pick into empty head" msgstr "No es pot recollir cireres en un cap buit" @@ -1470,7 +1470,7 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" msgid "staging updated .gitmodules failed" msgstr "L'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:1111 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "No s'ha pogut crear l'enllaç de git %s" @@ -1480,28 +1480,28 @@ msgstr "No s'ha pogut crear l'enllaç de git %s" msgid "Could not set core.worktree in %s" msgstr "No s'ha pogut establir core.worktree en %s" -#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 -#: trailer.c:569 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut '%s' per a la clau '%s'" -#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#: trailer.c:552 trailer.c:557 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "més d'un %s" -#: trailer.c:589 +#: trailer.c:590 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "fitxa de remolc buida en el remolc '%.*s'" -#: trailer.c:709 +#: trailer.c:710 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: trailer.c:712 +#: trailer.c:713 msgid "could not read from stdin" msgstr "No s'ha pogut llegir des d'stdin" @@ -1703,15 +1703,15 @@ msgstr "contingut no seguit, " msgid "bug: unhandled diff status %c" msgstr "bug: estat de diferència no gestionat %c" -#: wt-status.c:761 +#: wt-status.c:758 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:763 +#: wt-status.c:760 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:842 +#: wt-status.c:839 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1719,191 +1719,191 @@ msgstr "" "No toqueu la línia de sobre.\n" "Tot el que hi ha a sota s'eliminarà." -#: wt-status.c:933 +#: wt-status.c:930 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:936 +#: wt-status.c:933 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:939 +#: wt-status.c:936 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:942 +#: wt-status.c:939 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:952 +#: wt-status.c:949 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:955 +#: wt-status.c:952 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:959 +#: wt-status.c:956 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:961 +#: wt-status.c:958 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:963 +#: wt-status.c:960 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1023 wt-status.c:1040 +#: wt-status.c:1020 wt-status.c:1037 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: wt-status.c:1028 wt-status.c:1045 +#: wt-status.c:1025 wt-status.c:1042 msgid "You are currently rebasing." msgstr "Actualment esteu rebasant." -#: wt-status.c:1031 +#: wt-status.c:1028 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1033 +#: wt-status.c:1030 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: wt-status.c:1035 +#: wt-status.c:1032 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1048 +#: wt-status.c:1045 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1052 +#: wt-status.c:1049 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1057 +#: wt-status.c:1054 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant una rebase." -#: wt-status.c:1060 +#: wt-status.c:1057 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vegada que el vostre directori de treball sigui net, executeu \"git " "rebase --continue\")" -#: wt-status.c:1064 +#: wt-status.c:1061 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." -#: wt-status.c:1069 +#: wt-status.c:1066 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant una rebase." -#: wt-status.c:1072 +#: wt-status.c:1069 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1074 +#: wt-status.c:1071 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " "vostres canvis)" -#: wt-status.c:1084 +#: wt-status.c:1081 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu recollint com a cirera la comissió %s." -#: wt-status.c:1089 +#: wt-status.c:1086 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1092 +#: wt-status.c:1089 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" -#: wt-status.c:1094 +#: wt-status.c:1091 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " "cireres)" -#: wt-status.c:1103 +#: wt-status.c:1100 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1108 +#: wt-status.c:1105 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1113 +#: wt-status.c:1110 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1124 +#: wt-status.c:1121 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1128 +#: wt-status.c:1125 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1131 +#: wt-status.c:1128 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1306 +#: wt-status.c:1303 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1313 +#: wt-status.c:1310 msgid "rebase in progress; onto " msgstr "rebase en progrés; en " -#: wt-status.c:1320 +#: wt-status.c:1317 msgid "HEAD detached at " msgstr "HEAD separat a" -#: wt-status.c:1322 +#: wt-status.c:1319 msgid "HEAD detached from " msgstr "HEAD separat de" -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "Not currently on any branch." msgstr "Actualment no en cap branca." -#: wt-status.c:1342 +#: wt-status.c:1339 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1356 +#: wt-status.c:1353 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1358 +#: wt-status.c:1355 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1362 +#: wt-status.c:1359 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1915,31 +1915,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" "'git help status')." -#: wt-status.c:1368 +#: wt-status.c:1365 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1370 +#: wt-status.c:1367 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1376 +#: wt-status.c:1373 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1381 +#: wt-status.c:1378 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1384 +#: wt-status.c:1381 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1387 +#: wt-status.c:1384 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1948,51 +1948,51 @@ msgstr "" "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " "\"git add\" per a seguir-los)\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1396 wt-status.c:1401 +#: wt-status.c:1393 wt-status.c:1398 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1399 +#: wt-status.c:1396 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1403 +#: wt-status.c:1400 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "no hi ha res a cometre, directori de treball net\n" -#: wt-status.c:1512 +#: wt-status.c:1509 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1518 +#: wt-status.c:1515 msgid "Initial commit on " msgstr "Comissió inicial en " -#: wt-status.c:1550 +#: wt-status.c:1547 msgid "gone" msgstr "no hi és" -#: wt-status.c:1552 wt-status.c:1560 +#: wt-status.c:1549 wt-status.c:1557 msgid "behind " msgstr "darrere " -#: compat/precompose_utf8.c:55 builtin/clone.c:357 +#: compat/precompose_utf8.c:55 builtin/clone.c:360 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha fallat en desenllaçar '%s'" @@ -2052,13 +2052,13 @@ msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "marxa en sec" #: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "sigues detallat" @@ -2067,7 +2067,7 @@ msgstr "sigues detallat" msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" @@ -2114,10 +2114,6 @@ msgstr "" msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:287 -msgid "no files added" -msgstr "no s'ha afegit cap fitxer" - #: builtin/add.c:293 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" @@ -2400,7 +2396,7 @@ msgstr "%s: el pedaç no aplica" msgid "Checking patch %s..." msgstr "Comprovant el pedaç %s..." -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 +#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí '%s'" @@ -2481,7 +2477,7 @@ msgstr "entrada no reconeguda" msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 #: builtin/fetch.c:93 msgid "path" msgstr "camí" @@ -2857,7 +2853,7 @@ msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" #: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "No es pot suprimir la branca '%s', en la qual esteu actualment." +msgstr "No es pot suprimir la branca '%s', en la qual sou actualment." #: builtin/branch.c:245 #, c-format @@ -3034,8 +3030,8 @@ msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" #: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 -#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 +#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "comissió" @@ -3081,8 +3077,8 @@ msgid "edit the description for the branch" msgstr "edita la descripció de la branca" #: builtin/branch.c:851 -msgid "force creation (when already exists)" -msgstr "força creació (quan ja existeix)" +msgid "force creation, move/rename, deletion" +msgstr "força creació, moviment/canvi de nom, supressió" #: builtin/branch.c:854 msgid "print only not merged branches" @@ -3100,7 +3096,7 @@ msgstr "llista les branques en columnes" msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:881 builtin/clone.c:634 +#: builtin/branch.c:881 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -3108,77 +3104,77 @@ msgstr "HEAD no trobat sota refs/heads!" msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:909 builtin/branch.c:948 +#: builtin/branch.c:914 builtin/branch.c:953 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:924 +#: builtin/branch.c:929 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:929 +#: builtin/branch.c:934 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:936 +#: builtin/branch.c:941 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha comissió en la branca '%s'." -#: builtin/branch.c:939 +#: builtin/branch.c:944 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:954 +#: builtin/branch.c:959 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:959 +#: builtin/branch.c:964 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:963 +#: builtin/branch.c:968 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 +#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:970 +#: builtin/branch.c:975 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:982 +#: builtin/branch.c:987 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:986 +#: builtin/branch.c:991 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:992 +#: builtin/branch.c:997 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:1006 +#: builtin/branch.c:1011 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:1012 +#: builtin/branch.c:1017 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:1015 +#: builtin/branch.c:1020 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3187,7 +3183,7 @@ msgstr "" "La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --" "track o --set-upstream-to\n" -#: builtin/branch.c:1032 +#: builtin/branch.c:1037 #, c-format msgid "" "\n" @@ -3198,12 +3194,12 @@ msgstr "" "Si volíeu fer '%s' seguir '%s', feu això:\n" "\n" -#: builtin/branch.c:1033 +#: builtin/branch.c:1038 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1034 +#: builtin/branch.c:1039 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3221,44 +3217,44 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:332 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<tipus>|--textconv) <objecte>" -#: builtin/cat-file.c:333 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <llista_de_objectes>" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:372 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:370 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte " -#: builtin/cat-file.c:377 +#: builtin/cat-file.c:373 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:379 +#: builtin/cat-file.c:375 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:382 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" @@ -3287,7 +3283,7 @@ msgstr "llegeix els noms de fitxer d'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:18 builtin/checkout.c:1089 builtin/gc.c:274 +#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "omet el reportatge de progrés" @@ -3392,106 +3388,106 @@ msgstr "git checkout [opcions] <branca>" msgid "git checkout [options] [<branch>] -- <file>..." msgstr "git checkout [opcions] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:114 builtin/checkout.c:147 +#: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format msgid "path '%s' does not have our version" msgstr "el camí '%s' no té la versió nostra" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have their version" msgstr "el camí '%s' no té la versió seva" -#: builtin/checkout.c:132 +#: builtin/checkout.c:150 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí '%s' no té totes les versions necessàries" -#: builtin/checkout.c:176 +#: builtin/checkout.c:194 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí '%s' no té les versions necessàries" -#: builtin/checkout.c:193 +#: builtin/checkout.c:211 #, c-format msgid "path '%s': cannot merge" msgstr "camí '%s': no es pot fusionar" -#: builtin/checkout.c:210 +#: builtin/checkout.c:228 #, c-format msgid "Unable to add merge result for '%s'" msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'" -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237 -#: builtin/checkout.c:240 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255 +#: builtin/checkout.c:258 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no es pot usar amb actualització de camins" -#: builtin/checkout.c:243 builtin/checkout.c:246 +#: builtin/checkout.c:261 builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no es pot usar amb %s" -#: builtin/checkout.c:249 +#: builtin/checkout.c:267 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "No es pot actualitzar els camins i canviar a la branca '%s' a la vegada." -#: builtin/checkout.c:260 builtin/checkout.c:449 +#: builtin/checkout.c:278 builtin/checkout.c:467 msgid "corrupt index file" msgstr "fitxer d'índex corrupte" -#: builtin/checkout.c:320 builtin/checkout.c:327 +#: builtin/checkout.c:338 builtin/checkout.c:345 #, c-format msgid "path '%s' is unmerged" msgstr "el camí '%s' està sense fusionar" -#: builtin/checkout.c:471 +#: builtin/checkout.c:489 msgid "you need to resolve your current index first" msgstr "heu de resoldre el vostre índex actual primer" -#: builtin/checkout.c:597 +#: builtin/checkout.c:615 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "No es pot fer reflog per a '%s'\n" -#: builtin/checkout.c:635 +#: builtin/checkout.c:653 msgid "HEAD is now at" -msgstr "HEAD ara està a" +msgstr "HEAD ara és a" -#: builtin/checkout.c:642 +#: builtin/checkout.c:660 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:645 +#: builtin/checkout.c:663 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:649 +#: builtin/checkout.c:667 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha agafat i restablert la branca '%s'\n" -#: builtin/checkout.c:651 builtin/checkout.c:1032 +#: builtin/checkout.c:669 builtin/checkout.c:1050 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha agafat la branca nova '%s'\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:671 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha agafat la branca '%s'\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:723 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:711 +#: builtin/checkout.c:729 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3514,7 +3510,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:729 +#: builtin/checkout.c:747 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3529,139 +3525,139 @@ msgstr "" " git branch nom_de_branca_nova %s\n" "\n" -#: builtin/checkout.c:759 +#: builtin/checkout.c:777 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:763 +#: builtin/checkout.c:781 msgid "Previous HEAD position was" -msgstr "La posició de HEAD anterior ha estat" +msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:790 builtin/checkout.c:1027 +#: builtin/checkout.c:808 builtin/checkout.c:1045 msgid "You are on a branch yet to be born" -msgstr "Esteu en una branca que encara ha de nàixer" +msgstr "Sou en una branca que encara ha de nàixer" -#: builtin/checkout.c:934 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "només una referència esperada, %d donades." -#: builtin/checkout.c:973 +#: builtin/checkout.c:991 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1020 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1059 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1044 builtin/checkout.c:1048 +#: builtin/checkout.c:1062 builtin/checkout.c:1066 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078 +#: builtin/checkout.c:1081 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1086 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a una no comissió '%s'" -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1109 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1111 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1112 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1113 msgid "detach the HEAD at named commit" msgstr "separa el HEAD a la comissió anomenada" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1114 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1116 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1116 msgid "new unparented branch" -msgstr "branca nova sense pares" +msgstr "branca nova sense mare" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1117 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1119 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1121 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevulles modificacions locals)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1105 builtin/merge.c:226 +#: builtin/checkout.c:1123 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "estil" -#: builtin/checkout.c:1107 +#: builtin/checkout.c:1125 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1128 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades escasses" -#: builtin/checkout.c:1112 +#: builtin/checkout.c:1130 msgid "second guess 'git checkout no-such-branch'" msgstr "dubta 'git checkout cap-branca-així'" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1170 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1175 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1212 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1219 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3670,12 +3666,12 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1224 #, 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:1210 +#: builtin/checkout.c:1228 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3867,146 +3863,150 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [opcions] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 #: builtin/push.c:514 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/clone.c:67 +#: builtin/clone.c:68 msgid "don't create a checkout" msgstr "no facis cap agafada" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:72 +#: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit reflectit (implica bare)" -#: builtin/clone.c:74 +#: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:76 +#: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:78 +#: builtin/clone.c:79 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "initialitza els submòduls en el clon" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:84 builtin/init-db.c:493 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:85 builtin/init-db.c:494 msgid "directory from which templates will be used" msgstr "directori del qual les plantilles s'usaran" -#: builtin/clone.c:86 +#: builtin/clone.c:87 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:88 +#: builtin/clone.c:89 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:90 +#: builtin/clone.c:91 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <branca> en lloc del HEAD del remot" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:97 builtin/init-db.c:494 +#: builtin/clone.c:99 +msgid "use --reference only while cloning" +msgstr "usa --reference només en clonar" + +#: builtin/clone.c:100 builtin/init-db.c:502 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:101 builtin/init-db.c:503 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:99 +#: builtin/clone.c:102 msgid "key=value" msgstr "calu=valor" -#: builtin/clone.c:100 +#: builtin/clone.c:103 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:253 +#: builtin/clone.c:256 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: builtin/clone.c:257 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència '%s' és superficial" -#: builtin/clone.c:260 +#: builtin/clone.c:263 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència '%s' és empeltat" -#: builtin/clone.c:322 +#: builtin/clone.c:325 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha fallat en crear el directori '%s'" -#: builtin/clone.c:324 builtin/diff.c:84 +#: builtin/clone.c:327 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "s'ha fallat en fer stat a '%s'" -#: builtin/clone.c:326 +#: builtin/clone.c:329 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és un directori" -#: builtin/clone.c:340 +#: builtin/clone.c:343 #, c-format msgid "failed to stat %s\n" msgstr "s'ha fallat en fer stat a '%s'\n" -#: builtin/clone.c:362 +#: builtin/clone.c:365 #, c-format msgid "failed to create link '%s'" msgstr "s'ha fallat en crear l'enllaç '%s'" -#: builtin/clone.c:366 +#: builtin/clone.c:369 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha fallat en copiar el fitxer a '%s'" -#: builtin/clone.c:389 builtin/clone.c:563 +#: builtin/clone.c:392 builtin/clone.c:566 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:401 +#: builtin/clone.c:404 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4016,110 +4016,122 @@ msgstr "" "Podeu inspeccionar què s'ha agafat amb 'git status' i\n" "tornar a intentar l'agafada amb 'git checkout -f HEAD'\n" -#: builtin/clone.c:478 +#: builtin/clone.c:481 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:558 +#: builtin/clone.c:561 #, c-format msgid "Checking connectivity... " msgstr "Provant connectivitat... " -#: builtin/clone.c:561 +#: builtin/clone.c:564 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:625 +#: builtin/clone.c:628 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:656 +#: builtin/clone.c:659 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:765 +#: builtin/clone.c:746 +msgid "cannot repack to clean up" +msgstr "no es pot reempaquetar per a netejar" + +#: builtin/clone.c:748 +msgid "cannot unlink temporary alternates file" +msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" + +#: builtin/clone.c:778 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:769 +#: builtin/clone.c:782 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:780 +#: builtin/clone.c:793 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:783 +#: builtin/clone.c:796 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:796 +#: builtin/clone.c:809 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:802 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:812 +#: builtin/clone.c:825 #, 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:822 +#: builtin/clone.c:835 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:835 builtin/clone.c:847 +#: builtin/clone.c:848 builtin/clone.c:860 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'ha pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:838 +#: builtin/clone.c:851 #, 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:857 +#: builtin/clone.c:870 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:859 +#: builtin/clone.c:872 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonant a '%s'...\n" -#: builtin/clone.c:895 +#: builtin/clone.c:897 +msgid "--dissociate given, but there is no --reference" +msgstr "s'ha donat --dissociate, però no hi ha --reference" + +#: builtin/clone.c:912 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:898 +#: builtin/clone.c:915 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, ignorant --local" -#: builtin/clone.c:903 +#: builtin/clone.c:920 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:907 +#: builtin/clone.c:924 #, c-format msgid "Don't know how to clone %s" msgstr "No es sap com clonar %s" -#: builtin/clone.c:958 builtin/clone.c:966 +#: builtin/clone.c:975 builtin/clone.c:983 #, 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:969 +#: builtin/clone.c:986 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -4305,31 +4317,26 @@ msgstr "no es pot llegir l'índex" msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:592 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió '%s' li manca la capçalera d'autor" -#: builtin/commit.c:594 +#: builtin/commit.c:586 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió '%s' té una línia d'autor mal formada" -#: builtin/commit.c:613 +#: builtin/commit.c:605 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:621 +#: builtin/commit.c:613 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: builtin/commit.c:642 -#, c-format -msgid "Malformed ident string: '%s'" -msgstr "Cadena d'identificació mal formada: '%s'" - -#: builtin/commit.c:675 +#: builtin/commit.c:657 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4337,43 +4344,43 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:724 builtin/shortlog.c:273 +#: builtin/commit.c:706 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(llegint el missatge de registre de l'entrada estàndard)\n" -#: builtin/commit.c:726 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir de l'entrada estàndard" -#: builtin/commit.c:730 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:752 +#: builtin/commit.c:734 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:756 +#: builtin/commit.c:738 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogur llegir SQUASH_MSG" -#: builtin/commit.c:760 +#: builtin/commit.c:742 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: builtin/commit.c:831 +#: builtin/commit.c:789 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:849 +#: builtin/commit.c:807 #, c-format msgid "" "\n" @@ -4388,7 +4395,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:812 #, c-format msgid "" "\n" @@ -4403,7 +4410,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:825 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4413,7 +4420,7 @@ msgstr "" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:874 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4424,146 +4431,146 @@ msgstr "" "Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n" "mateix si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:888 +#: builtin/commit.c:852 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:896 +#: builtin/commit.c:860 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:903 +#: builtin/commit.c:867 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:921 +#: builtin/commit.c:885 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:978 +#: builtin/commit.c:942 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:993 builtin/tag.c:495 +#: builtin/commit.c:957 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1095 +#: builtin/commit.c:1059 #, c-format msgid "No existing author found with '%s'" msgstr "Cap autor existent trobat amb '%s'" -#: builtin/commit.c:1110 builtin/commit.c:1350 +#: builtin/commit.c:1074 builtin/commit.c:1314 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid '%s'" -#: builtin/commit.c:1147 +#: builtin/commit.c:1111 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1177 +#: builtin/commit.c:1141 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:1186 +#: builtin/commit.c:1150 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1189 +#: builtin/commit.c:1153 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1191 +#: builtin/commit.c:1155 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar." -#: builtin/commit.c:1194 +#: builtin/commit.c:1158 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1204 +#: builtin/commit.c:1168 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:1206 +#: builtin/commit.c:1170 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup." -#: builtin/commit.c:1214 +#: builtin/commit.c:1178 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:1231 +#: builtin/commit.c:1195 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:1233 +#: builtin/commit.c:1197 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." -#: builtin/commit.c:1235 +#: builtin/commit.c:1199 msgid "Clever... amending the last one with dirty index." msgstr "Intel·ligent... esmenant l'últim amb índex brut." -#: builtin/commit.c:1237 +#: builtin/commit.c:1201 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "S'han especificat camins explícits sense -i o -o; presumint camins --only..." -#: builtin/commit.c:1249 builtin/tag.c:728 +#: builtin/commit.c:1213 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" -#: builtin/commit.c:1254 +#: builtin/commit.c:1218 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1364 builtin/commit.c:1644 +#: builtin/commit.c:1328 builtin/commit.c:1608 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1366 builtin/commit.c:1646 +#: builtin/commit.c:1330 builtin/commit.c:1610 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 +#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1371 builtin/commit.c:1650 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1374 builtin/commit.c:1653 +#: builtin/commit.c:1338 builtin/commit.c:1617 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1377 builtin/commit.c:1656 +#: builtin/commit.c:1341 builtin/commit.c:1620 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcional: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1380 +#: builtin/commit.c:1344 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1381 parse-options.h:153 +#: builtin/commit.c:1345 parse-options.h:153 msgid "when" msgstr "quan" -#: builtin/commit.c:1382 +#: builtin/commit.c:1346 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4571,210 +4578,210 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1384 +#: builtin/commit.c:1348 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1471 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1473 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1518 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1521 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1614 +#: builtin/commit.c:1578 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1615 +#: builtin/commit.c:1579 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1617 +#: builtin/commit.c:1581 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1618 builtin/tag.c:601 +#: builtin/commit.c:1582 builtin/tag.c:601 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1619 +#: builtin/commit.c:1583 msgid "author" msgstr "autor" -#: builtin/commit.c:1619 +#: builtin/commit.c:1583 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1620 builtin/gc.c:275 +#: builtin/commit.c:1584 builtin/gc.c:275 msgid "date" msgstr "data" -#: builtin/commit.c:1620 +#: builtin/commit.c:1584 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 -#: builtin/notes.c:565 builtin/tag.c:599 +#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "missatge" -#: builtin/commit.c:1621 +#: builtin/commit.c:1585 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1622 +#: builtin/commit.c:1586 msgid "reuse and edit message from specified commit" -msgstr "reutilitza i edita el missatge de la comissió especificada" +msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1623 +#: builtin/commit.c:1587 msgid "reuse message from specified commit" -msgstr "reutilitza el missatge de la comissió especificada" +msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1624 +#: builtin/commit.c:1588 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1625 +#: builtin/commit.c:1589 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1626 +#: builtin/commit.c:1590 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)" -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1628 +#: builtin/commit.c:1592 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1629 +#: builtin/commit.c:1593 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1630 +#: builtin/commit.c:1594 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1630 builtin/tag.c:604 +#: builtin/commit.c:1594 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "com despullar els espais i #comentaris del missatge" -#: builtin/commit.c:1631 +#: builtin/commit.c:1595 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "ID de clau" -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 +#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "firma la comissió amb GPG" -#: builtin/commit.c:1636 +#: builtin/commit.c:1600 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1637 +#: builtin/commit.c:1601 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1638 +#: builtin/commit.c:1602 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1639 +#: builtin/commit.c:1603 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1640 +#: builtin/commit.c:1604 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1641 +#: builtin/commit.c:1605 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1642 +#: builtin/commit.c:1606 msgid "bypass pre-commit hook" msgstr "evita el ganxo de precomissió" -#: builtin/commit.c:1643 +#: builtin/commit.c:1607 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1654 +#: builtin/commit.c:1618 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1655 +#: builtin/commit.c:1619 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1660 +#: builtin/commit.c:1624 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1662 +#: builtin/commit.c:1626 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1691 +#: builtin/commit.c:1655 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1730 builtin/merge.c:518 +#: builtin/commit.c:1694 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/commit.c:1737 +#: builtin/commit.c:1701 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD corrupte (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1708 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1763 +#: builtin/commit.c:1727 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1774 +#: builtin/commit.c:1738 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1779 +#: builtin/commit.c:1743 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 +#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/commit.c:1827 +#: builtin/commit.c:1791 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4870,17 +4877,13 @@ msgstr "llista tots" msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:72 builtin/config.c:73 -msgid "slot" -msgstr "ranura" - #: builtin/config.c:72 -msgid "find the color configured: [default]" -msgstr "troba el color configurat: [per defecte]" +msgid "find the color configured: slot [default]" +msgstr "troba el color configurat: ranura [per defecte]" #: builtin/config.c:73 -msgid "find the color setting: [stdout-is-tty]" -msgstr "troba l'ajust de color: [stdout-és-tty]" +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "troba l'ajust de color: ranura [stdout-és-tty]" #: builtin/config.c:74 msgid "Type" @@ -4914,11 +4917,11 @@ msgstr "acaba els valors amb un octet NUL" msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:315 +#: builtin/config.c:316 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:455 +#: builtin/config.c:457 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -4933,7 +4936,7 @@ msgstr "" "#\tuser = %s\n" "#\temail = %s\n" -#: builtin/config.c:590 +#: builtin/config.c:589 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració '%s'" @@ -5048,7 +5051,7 @@ msgstr "sempre usa el format llarg" #: builtin/describe.c:401 msgid "only follow first parent" -msgstr "només segueix el primer pare" +msgstr "només segueix la primera mare" #: builtin/describe.c:404 msgid "only output exact matches" @@ -5362,7 +5365,7 @@ msgstr " (%s s'ha tornat penjant)" msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:799 builtin/remote.c:1063 +#: builtin/fetch.c:799 builtin/remote.c:1060 msgid "(none)" msgstr "(cap)" @@ -5438,30 +5441,30 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>]|--no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 +#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:663 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:667 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "àlies per --log (desaprovat)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -5469,44 +5472,44 @@ msgstr "fitxer del qual llegir" msgid "unable to parse format" msgstr "no s'ha pogut analitzar el format" -#: builtin/for-each-ref.c:1057 +#: builtin/for-each-ref.c:1064 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [opcions] [<patró>]" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1079 msgid "quote placeholders suitably for shells" msgstr "" "posa els marcadors de posició entre cometes adequades per als terminals" -#: builtin/for-each-ref.c:1074 +#: builtin/for-each-ref.c:1081 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per a perl" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1083 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per a python" -#: builtin/for-each-ref.c:1078 -msgid "quote placeholders suitably for tcl" -msgstr "posa els marcadors de posició entre cometes adequades per a tcl" +#: builtin/for-each-ref.c:1085 +msgid "quote placeholders suitably for Tcl" +msgstr "posa els marcadors de posició entre cometes adequades per a Tcl" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1088 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:1082 builtin/replace.c:438 +#: builtin/for-each-ref.c:1089 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1089 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1090 msgid "key" msgstr "clau" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1091 msgid "field name to sort on" msgstr "nom de camp en el qual ordenar" @@ -5963,61 +5966,61 @@ msgstr "" "'%s': ordre per a un visualitzador de manuals compatible.\n" "Si us plau, considereu usar 'man.<eina>.path' en lloc d'això." -#: builtin/help.c:352 +#: builtin/help.c:354 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualitzador de manuals desconegut" -#: builtin/help.c:369 +#: builtin/help.c:371 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la sol·licitud" -#: builtin/help.c:377 +#: builtin/help.c:379 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha gestionat la sol·licitud" -#: builtin/help.c:423 +#: builtin/help.c:428 msgid "Defining attributes per path" msgstr "La definició d'atributs per camí" -#: builtin/help.c:424 +#: builtin/help.c:429 msgid "Everyday Git With 20 Commands Or So" msgstr "Git quotidià amb més o menys 20 ordres" -#: builtin/help.c:425 +#: builtin/help.c:430 msgid "A Git glossary" msgstr "Un glossari de Git" -#: builtin/help.c:426 +#: builtin/help.c:431 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica els fitxers intencionalment no seguits a ignorar" -#: builtin/help.c:427 +#: builtin/help.c:432 msgid "Defining submodule properties" msgstr "La definició de les propietats de submòduls" -#: builtin/help.c:428 +#: builtin/help.c:433 msgid "Specifying revisions and ranges for Git" msgstr "L'especificació de revisions i rangs per al Git" -#: builtin/help.c:429 +#: builtin/help.c:434 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)" -#: builtin/help.c:430 +#: builtin/help.c:435 msgid "An overview of recommended workflows with Git" msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" -#: builtin/help.c:442 +#: builtin/help.c:447 msgid "The common Git guides are:\n" msgstr "Les guies de Git comunes són:\n" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:468 builtin/help.c:485 #, c-format msgid "usage: %s%s" msgstr "ús: %s%s" -#: builtin/help.c:496 +#: builtin/help.c:501 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' és un àlies de `%s'" @@ -6360,37 +6363,37 @@ msgstr "no es pot copiar '%s' a '%s'" msgid "ignoring template %s" msgstr "ignorant la plantilla %s" -#: builtin/init-db.c:133 +#: builtin/init-db.c:136 #, c-format msgid "insanely long template path %s" msgstr "camí de plantilla increïblement llarg %s" -#: builtin/init-db.c:141 +#: builtin/init-db.c:144 #, c-format msgid "templates not found %s" msgstr "no s'han trobat les plantilles %s" -#: builtin/init-db.c:154 +#: builtin/init-db.c:157 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "no copiant plantilles d'una versió de format errònia %d de '%s'" -#: builtin/init-db.c:192 +#: builtin/init-db.c:197 #, c-format msgid "insane git directory %s" msgstr "directori de git boig %s" -#: builtin/init-db.c:323 builtin/init-db.c:326 +#: builtin/init-db.c:331 builtin/init-db.c:334 #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#: builtin/init-db.c:355 +#: builtin/init-db.c:363 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:358 +#: builtin/init-db.c:366 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" @@ -6398,24 +6401,24 @@ msgstr "no s'ha pogut moure %s a %s" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:418 +#: builtin/init-db.c:426 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s dipòsit de Git%s a %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:427 msgid "Reinitialized existing" msgstr "S'ha reinicialitzat un existent" -#: builtin/init-db.c:419 +#: builtin/init-db.c:427 msgid "Initialized empty" msgstr "S'ha inicialitzat un buit" -#: builtin/init-db.c:420 +#: builtin/init-db.c:428 msgid " shared" msgstr " compartit" -#: builtin/init-db.c:467 +#: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" @@ -6423,29 +6426,29 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" "shared[=<permisos>]] [directori]" -#: builtin/init-db.c:490 +#: builtin/init-db.c:498 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:491 +#: builtin/init-db.c:499 msgid "specify that the git repository is to be shared amongst several users" msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171 msgid "be quiet" msgstr "calla" -#: builtin/init-db.c:525 builtin/init-db.c:530 +#: builtin/init-db.c:533 builtin/init-db.c:538 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:534 +#: builtin/init-db.c:542 #, c-format msgid "cannot chdir to %s" msgstr "no es pot chdir a %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:563 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6454,7 +6457,7 @@ msgstr "" "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" "dir=<directori>)" -#: builtin/init-db.c:583 +#: builtin/init-db.c:591 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball '%s'" @@ -6480,12 +6483,12 @@ msgid "trailer(s) to add" msgstr "remolcs a afegir" #: builtin/log.c:41 -msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camí>...]\n" +msgid "git log [<options>] [<revision range>] [[--] <path>...]" +msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camí>...]" #: builtin/log.c:42 -msgid " or: git show [options] <object>..." -msgstr " o: git show [opcions] <objecte>..." +msgid "git show [options] <object>..." +msgstr "git show [opcions] <objecte>..." #: builtin/log.c:81 #, c-format @@ -6604,7 +6607,7 @@ msgstr "comença nombrant els pedaços a <n> en lloc d'1" #: builtin/log.c:1203 msgid "mark the series as Nth re-roll" -msgstr "marca la sèrie com a la Nª llançada" +msgstr "marca la sèrie com a l'enèsima llançada" #: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" @@ -6862,214 +6865,214 @@ msgstr "mostra les dades de depuració" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "mostra només els arbres" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "recursa als subarbres" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "mostra els arbres en recursar" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "acaba les entrades amb un octet NUL" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "mida de l'objecte d'inclusió" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "llista només els noms de fitxer" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "usa els noms de camí complets" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "llista l'arbre sencer; no només el directori actual (implica --full-name)" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] [<commit>...]" msgstr "git merge [opcions] [<comissió>...]" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [opcions] <missatge> HEAD <comissió>" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:99 +#: builtin/merge.c:100 msgid "switch `m' requires a value" msgstr "l'opció `m' requereix un valor" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, 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:137 +#: builtin/merge.c:138 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:142 +#: builtin/merge.c:143 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:192 +#: builtin/merge.c:193 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:195 +#: builtin/merge.c:196 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:196 +#: builtin/merge.c:197 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:198 +#: builtin/merge.c:199 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt per a fusionar el " "missatge de comissió" -#: builtin/merge.c:201 +#: builtin/merge.c:202 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:203 +#: builtin/merge.c:204 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:206 +#: builtin/merge.c:207 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:212 +#: builtin/merge.c:213 msgid "Verify that the named commit has a valid GPG signature" msgstr "Verifica que la comissió anomenada tingui una firma GPG vàlida" -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:216 +#: builtin/merge.c:217 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:218 +#: builtin/merge.c:219 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:222 +#: builtin/merge.c:223 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:250 +#: builtin/merge.c:251 msgid "could not run stash." msgstr "no s'ha pogut executar stash." -#: builtin/merge.c:255 +#: builtin/merge.c:256 msgid "stash failed" msgstr "L'emmagatzemament ha fallat." -#: builtin/merge.c:260 +#: builtin/merge.c:261 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:279 builtin/merge.c:296 +#: builtin/merge.c:280 builtin/merge.c:297 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:326 +#: builtin/merge.c:327 msgid " (nothing to squash)" msgstr " (res a aixafar)" -#: builtin/merge.c:339 +#: builtin/merge.c:340 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió d'aixafada -- no actualitzant HEAD\n" -#: builtin/merge.c:371 +#: builtin/merge.c:372 msgid "Writing SQUASH_MSG" msgstr "Escrivint SQUASH_MSG" -#: builtin/merge.c:373 +#: builtin/merge.c:374 msgid "Finishing SQUASH_MSG" msgstr "Finalitzant SQUASH_MSG" -#: builtin/merge.c:396 +#: builtin/merge.c:397 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no actualitzant HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no assenyala una comissió" -#: builtin/merge.c:558 +#: builtin/merge.c:559 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions dolenta: %s" -#: builtin/merge.c:653 +#: builtin/merge.c:654 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/merge.c:677 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "No gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:691 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:704 +#: builtin/merge.c:705 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:793 +#: builtin/merge.c:794 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de '%s'" -#: builtin/merge.c:802 +#: builtin/merge.c:803 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "No cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:809 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7085,49 +7088,49 @@ msgstr "" "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "Empty commit message." msgstr "Missatge de comissió buit." -#: builtin/merge.c:844 +#: builtin/merge.c:845 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:907 +#: builtin/merge.c:900 #, 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:923 +#: builtin/merge.c:916 #, c-format msgid "'%s' is not a commit" msgstr "'%s' no és una comissió" -#: builtin/merge.c:964 +#: builtin/merge.c:957 msgid "No current branch." msgstr "Cap branca actual." -#: builtin/merge.c:966 +#: builtin/merge.c:959 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:968 +#: builtin/merge.c:961 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:973 +#: builtin/merge.c:966 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca de seguiment remot per a %s de %s" -#: builtin/merge.c:1129 +#: builtin/merge.c:1122 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1145 +#: builtin/merge.c:1138 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7135,11 +7138,11 @@ msgstr "" "No heu completat la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1148 git-pull.sh:34 +#: builtin/merge.c:1141 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu completat la vostra fusió (MERGE_HEAD existeix)." -#: builtin/merge.c:1152 +#: builtin/merge.c:1145 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7147,103 +7150,103 @@ msgstr "" "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1155 +#: builtin/merge.c:1148 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1164 +#: builtin/merge.c:1157 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1173 +#: builtin/merge.c:1166 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:1205 +#: builtin/merge.c:1198 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només exactament una comissió a un cap buit" -#: builtin/merge.c:1208 +#: builtin/merge.c:1201 msgid "Squash commit into empty head not supported yet" msgstr "Aixafar una comissió a un cap buit encara no es permet" -#: builtin/merge.c:1210 +#: builtin/merge.c:1203 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 cap buit" -#: builtin/merge.c:1215 +#: builtin/merge.c:1208 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1266 +#: builtin/merge.c:1259 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una firma GPG no fiable, suposadament de %s." -#: builtin/merge.c:1269 +#: builtin/merge.c:1262 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una firma GPG dolenta suposadament de %s." -#: builtin/merge.c:1272 +#: builtin/merge.c:1265 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té firma GPG." -#: builtin/merge.c:1275 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una firma GPG bona de %s\n" -#: builtin/merge.c:1356 +#: builtin/merge.c:1349 #, c-format msgid "Updating %s..%s\n" msgstr "Actualitzant %s..%s\n" -#: builtin/merge.c:1395 +#: builtin/merge.c:1388 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1402 +#: builtin/merge.c:1395 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1434 +#: builtin/merge.c:1427 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, avortant." -#: builtin/merge.c:1457 builtin/merge.c:1536 +#: builtin/merge.c:1450 builtin/merge.c:1529 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1454 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1520 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1529 +#: builtin/merge.c:1522 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1538 +#: builtin/merge.c:1531 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1543 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7354,7 +7357,7 @@ msgstr "git mv [opcions] <font>... <destí>" #: builtin/mv.c:69 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "El directori %s està en l'índex i no hi ha cap submòdul?" +msgstr "El directori %s és en l'índex i no hi ha cap submòdul?" #: builtin/mv.c:71 msgid "Please stage your changes to .gitmodules or stash them to proceed" @@ -7365,7 +7368,7 @@ msgstr "" #: builtin/mv.c:89 #, c-format msgid "%.*s is in index" -msgstr "%.*s està en l'índex" +msgstr "%.*s és en l'índex" #: builtin/mv.c:111 msgid "force move/rename even if target exists" @@ -7436,7 +7439,7 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "Canviant el nom de %s a %s\n" -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" @@ -7487,11 +7490,11 @@ msgstr "git notes [--ref <referència_de_notes>] [llista [<objecte>]]" #: builtin/notes.c:25 msgid "" -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] add [-f] [-m <missatge> | -F " -"<fitxer> | (-c | -C) <objecte>] [<objecte>]" +"git notes [--ref <referència_de_notes>] add [-f] [--allow-empty] [-m " +"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" @@ -7500,15 +7503,16 @@ msgstr "" #: builtin/notes.c:27 msgid "" -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència_de_notes>] append [-m <missatge> | -F <fitxer> " -"| (-c | -C) <objecte>] [<objecte>]" +"git notes [--ref <referència_de_notes>] append [--allow-empty] [-m " +"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c:28 -msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "git notes [--ref <referència_de_notes>] edit [<objecte>]" +msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]" +msgstr "" +"git notes [--ref <referència_de_notes>] edit [--allow-empty] [<objecte>]" #: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" @@ -7593,120 +7597,119 @@ msgstr "git notes prune [<opcions>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:136 +#: builtin/notes.c:146 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'" -#: builtin/notes.c:140 +#: builtin/notes.c:150 msgid "could not read 'show' output" msgstr "no s'ha pogut llegir la sortida de 'show'" -#: builtin/notes.c:148 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'" -#: builtin/notes.c:166 builtin/tag.c:477 +#: builtin/notes.c:173 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer '%s'" -#: builtin/notes.c:185 +#: builtin/notes.c:192 msgid "Please supply the note contents using either -m or -F option" msgstr "" "Si us plau, proveïu els continguts de la nota fent servir l'opció -m o " "l'opció -F" -#: builtin/notes.c:206 builtin/notes.c:847 -#, c-format -msgid "Removing note for object %s\n" -msgstr "Eliminant la nota de l'objecte %s\n" - -#: builtin/notes.c:211 +#: builtin/notes.c:201 msgid "unable to write note object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/notes.c:213 +#: builtin/notes.c:203 #, c-format msgid "The note contents have been left in %s" msgstr "Els continguts de la nota s'han deixat en %s" -#: builtin/notes.c:247 builtin/tag.c:693 +#: builtin/notes.c:231 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir '%s'" -#: builtin/notes.c:249 builtin/tag.c:696 +#: builtin/notes.c:233 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir ni llegir '%s'" -#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 -#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 -#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 -#: builtin/notes.c:842 builtin/tag.c:709 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 +#: builtin/notes.c:854 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "S'ha fallat en resoldre '%s' com a referència vàlida." -#: builtin/notes.c:271 +#: builtin/notes.c:255 #, c-format msgid "Failed to read object '%s'." msgstr "S'ha fallat en llegir l'objecte '%s'." -#: builtin/notes.c:275 +#: builtin/notes.c:259 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'." -#: builtin/notes.c:315 +#: builtin/notes.c:299 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: '%s'." -#: builtin/notes.c:330 +#: builtin/notes.c:314 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "S'ha fallat en copiar les notes de '%s' a '%s'" -#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 -#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 -#: builtin/notes.c:907 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 +#: builtin/notes.c:919 msgid "too many parameters" msgstr "massa paràmetres" -#: builtin/notes.c:387 builtin/notes.c:646 +#: builtin/notes.c:371 builtin/notes.c:658 #, c-format msgid "No note found for object %s." msgstr "No s'ha trobat cap nota per a l'objecte %s." -#: builtin/notes.c:409 builtin/notes.c:566 +#: builtin/notes.c:392 builtin/notes.c:555 msgid "note contents as a string" msgstr "anota els continguts com a cadena" -#: builtin/notes.c:412 builtin/notes.c:569 +#: builtin/notes.c:395 builtin/notes.c:558 msgid "note contents in a file" msgstr "anota els continguts en un fitxer" -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 -#: builtin/notes.c:574 builtin/tag.c:628 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 +#: builtin/notes.c:563 builtin/tag.c:628 msgid "object" msgstr "objecte" -#: builtin/notes.c:415 builtin/notes.c:572 +#: builtin/notes.c:398 builtin/notes.c:561 msgid "reuse and edit specified note object" -msgstr "reutilitza i edita l'objecte de nota especificat" +msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:418 builtin/notes.c:575 +#: builtin/notes.c:401 builtin/notes.c:564 msgid "reuse specified note object" -msgstr "reutilitza l'objecte de nota especificat" +msgstr "reusa l'objecte de nota especificat" + +#: builtin/notes.c:404 builtin/notes.c:567 +msgid "allow storing empty note" +msgstr "permet l'emmagatzematge d'una nota buida" -#: builtin/notes.c:420 builtin/notes.c:488 +#: builtin/notes.c:405 builtin/notes.c:476 msgid "replace existing notes" msgstr "reemplaça les notes existents" -#: builtin/notes.c:454 +#: builtin/notes.c:430 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7715,25 +7718,30 @@ msgstr "" "No es pot afegir les notes. S'ha trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:459 builtin/notes.c:536 +#: builtin/notes.c:445 builtin/notes.c:524 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:489 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Eliminant la nota de l'objecte %s\n" + +#: builtin/notes.c:477 msgid "read objects from stdin" msgstr "llegeix els objectes des d'stdin" -#: builtin/notes.c:491 +#: builtin/notes.c:479 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "carrega la configuració de reescriptura per a <ordre> (implica --stdin)" -#: builtin/notes.c:509 +#: builtin/notes.c:497 msgid "too few parameters" msgstr "hi ha massa pocs paràmetres" -#: builtin/notes.c:530 +#: builtin/notes.c:518 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7742,12 +7750,12 @@ msgstr "" "No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:542 +#: builtin/notes.c:530 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Manquen notes a l'objecte font %s. No es pot copiar." -#: builtin/notes.c:591 +#: builtin/notes.c:582 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7756,15 +7764,15 @@ msgstr "" "S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" -#: builtin/notes.c:738 +#: builtin/notes.c:750 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:740 +#: builtin/notes.c:752 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:742 +#: builtin/notes.c:754 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7772,44 +7780,44 @@ msgstr "" "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:744 +#: builtin/notes.c:756 msgid "Committing unmerged notes" msgstr "Cometent les notes sense fusionar" -#: builtin/notes.c:746 +#: builtin/notes.c:758 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:748 +#: builtin/notes.c:760 msgid "Aborting notes merge resolution" msgstr "Avortant la resolució de fusió de notes" -#: builtin/notes.c:750 +#: builtin/notes.c:762 msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:845 +#: builtin/notes.c:857 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:857 +#: builtin/notes.c:869 msgid "attempt to remove non-existent note is not an error" msgstr "l'intent d'eliminar una nota no existent no és un error" -#: builtin/notes.c:860 +#: builtin/notes.c:872 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:941 +#: builtin/notes.c:953 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:942 +#: builtin/notes.c:954 msgid "use notes from <notes_ref>" msgstr "usa les notes de <referència de notes>" -#: builtin/notes.c:977 builtin/remote.c:1624 +#: builtin/notes.c:989 builtin/remote.c:1621 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconegut: %s" @@ -7865,148 +7873,152 @@ msgstr "l'opció %s no accepta la forma negativa" msgid "unable to parse value '%s' for option %s" msgstr "no s'ha pogut analitzar el valor '%s' per a l'opció %s" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2623 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2625 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2627 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2630 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2631 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2632 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:2634 +#: builtin/pack-objects.c:2635 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2637 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2639 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2641 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2643 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:2644 +#: builtin/pack-objects.c:2645 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2647 msgid "reuse existing deltas" -msgstr "reutilitza les deltes existents" +msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2648 +#: builtin/pack-objects.c:2649 msgid "reuse existing objects" -msgstr "reutilitza els objectes existents" +msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2650 +#: builtin/pack-objects.c:2651 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2653 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2655 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2657 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2659 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als que encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2662 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2665 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:2667 +#: builtin/pack-objects.c:2668 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2671 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2672 +#: builtin/pack-objects.c:2673 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:2674 +#: builtin/pack-objects.c:2675 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2675 parse-options.h:140 +#: builtin/pack-objects.c:2676 parse-options.h:140 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2677 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2680 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2682 +msgid "create packs suitable for shallow fetches" +msgstr "crea paquets adequats per als obteniments superficials" + +#: builtin/pack-objects.c:2684 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2683 +#: builtin/pack-objects.c:2686 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2685 +#: builtin/pack-objects.c:2688 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2690 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:2689 +#: builtin/pack-objects.c:2692 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet" -#: builtin/pack-objects.c:2778 +#: builtin/pack-objects.c:2783 msgid "Counting objects" msgstr "Comptant els objectes" @@ -8101,7 +8113,7 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"Actualment no esteu en cap branca.\n" +"Actualment no sou en cap branca.\n" "Per a pujar la història que condueix a l'estat actual\n" "(HEAD separat) ara, useu\n" "\n" @@ -8180,8 +8192,8 @@ msgstr "" "\n" "Vegeu 'git help config' i cerqueu 'push.default' per a més informació.\n" "(s'ha introduït el mode 'simple' en el Git 1.7.11. Useu el mode similar\n" -"'current' en lloc de 'simple' si a vegades utilitzeu versions més\n" -"antigues del Git)" +"'current' en lloc de 'simple' si a vegades useu versions més antigues\n" +"del Git)" #: builtin/push.c:272 msgid "" @@ -8468,7 +8480,7 @@ msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branca>] [-m <mestre>] [-f] [--tags|--no-tags] [--" +"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:14 builtin/remote.c:33 @@ -8596,57 +8608,57 @@ msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "especificar les branques a seguir té sentit només amb miralls d'obteniment" -#: builtin/remote.c:185 builtin/remote.c:641 +#: builtin/remote.c:187 builtin/remote.c:643 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:189 builtin/remote.c:645 +#: builtin/remote.c:191 builtin/remote.c:647 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no és un nom de remot vàlid" -#: builtin/remote.c:233 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" -msgstr "No s'ha pogut configurar el mestre '%s'" +msgstr "No s'ha pogut configurar la mestra '%s'" -#: builtin/remote.c:333 +#: builtin/remote.c:335 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "No s'ha pogut obtenir el mapa d'obteniment de l'especificació de referència " "%s" -#: builtin/remote.c:434 builtin/remote.c:442 +#: builtin/remote.c:436 builtin/remote.c:444 msgid "(matching)" msgstr "(coincident)" -#: builtin/remote.c:446 +#: builtin/remote.c:448 msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 +#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604 #, c-format msgid "Could not append '%s' to '%s'" msgstr "No s'ha pogut annexar '%s' a '%s'" -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 +#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895 #, c-format msgid "No such remote: %s" msgstr "No hi ha tal remot: %s" -#: builtin/remote.c:651 +#: builtin/remote.c:653 #, 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:657 builtin/remote.c:850 +#: builtin/remote.c:659 builtin/remote.c:847 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració '%s'" -#: builtin/remote.c:672 +#: builtin/remote.c:674 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8657,32 +8669,32 @@ msgstr "" "\t%s\n" "\tSi us plau, actualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:678 +#: builtin/remote.c:680 #, c-format msgid "Could not append '%s'" msgstr "No s'ha pogut annexar '%s'" -#: builtin/remote.c:689 +#: builtin/remote.c:691 #, c-format msgid "Could not set '%s'" msgstr "No s'ha pogut establir '%s'" -#: builtin/remote.c:711 +#: builtin/remote.c:713 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de '%s' ha fallat" -#: builtin/remote.c:745 +#: builtin/remote.c:747 #, c-format msgid "creating '%s' failed" msgstr "la creació de '%s' ha fallat" -#: builtin/remote.c:769 +#: builtin/remote.c:766 #, c-format msgid "Could not remove branch %s" msgstr "No s'ha pogut eliminar la branca %s" -#: builtin/remote.c:836 +#: builtin/remote.c:833 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8697,265 +8709,265 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:951 +#: builtin/remote.c:948 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (el pròxim obteniment emmagatzemarà a remotes/%s)" -#: builtin/remote.c:954 +#: builtin/remote.c:951 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:956 +#: builtin/remote.c:953 msgid " stale (use 'git remote prune' to remove)" msgstr " ranci (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:958 +#: builtin/remote.c:955 msgid " ???" msgstr " ???" -#: builtin/remote.c:999 +#: builtin/remote.c:996 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot rebasar sobre > 1 branca" -#: builtin/remote.c:1006 +#: builtin/remote.c:1003 #, c-format msgid "rebases onto remote %s" msgstr "es rebasa sobre el remot %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1006 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1010 +#: builtin/remote.c:1007 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1012 +#: builtin/remote.c:1009 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:1013 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " i amb el remot" -#: builtin/remote.c:1059 +#: builtin/remote.c:1056 msgid "create" msgstr "crea" -#: builtin/remote.c:1062 +#: builtin/remote.c:1059 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1066 +#: builtin/remote.c:1063 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1069 +#: builtin/remote.c:1066 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1072 +#: builtin/remote.c:1069 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1079 +#: builtin/remote.c:1076 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1079 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1086 +#: builtin/remote.c:1083 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1089 +#: builtin/remote.c:1086 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1154 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1184 +#: builtin/remote.c:1181 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1185 +#: builtin/remote.c:1182 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obteniment: %s" -#: builtin/remote.c:1186 builtin/remote.c:1333 +#: builtin/remote.c:1183 builtin/remote.c:1334 msgid "(no URL)" msgstr "(sense URL)" -#: builtin/remote.c:1195 builtin/remote.c:1197 +#: builtin/remote.c:1192 builtin/remote.c:1194 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 +#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1205 +#: builtin/remote.c:1202 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" -#: builtin/remote.c:1217 +#: builtin/remote.c:1214 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1220 builtin/remote.c:1247 +#: builtin/remote.c:1217 builtin/remote.c:1244 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1229 +#: builtin/remote.c:1226 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:1237 +#: builtin/remote.c:1234 msgid " Local refs will be mirrored by 'git push'" msgstr " 'git push' reflectirà les referències locals" -#: builtin/remote.c:1244 +#: builtin/remote.c:1241 #, 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:1265 +#: builtin/remote.c:1262 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1267 +#: builtin/remote.c:1264 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1282 +#: builtin/remote.c:1279 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar el HEAD remot" -#: builtin/remote.c:1284 +#: builtin/remote.c:1281 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament " "amb:" -#: builtin/remote.c:1294 +#: builtin/remote.c:1291 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1302 +#: builtin/remote.c:1299 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1304 +#: builtin/remote.c:1301 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1322 +#: builtin/remote.c:1319 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1323 +#: builtin/remote.c:1320 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1329 +#: builtin/remote.c:1330 #, c-format msgid "Pruning %s" msgstr "Podant %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1331 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1354 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1357 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1405 +#: builtin/remote.c:1402 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1471 builtin/remote.c:1545 +#: builtin/remote.c:1468 builtin/remote.c:1542 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot '%s'" -#: builtin/remote.c:1491 +#: builtin/remote.c:1488 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1498 +#: builtin/remote.c:1495 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1520 +#: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1522 +#: builtin/remote.c:1519 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1524 +#: builtin/remote.c:1521 msgid "delete URLs" msgstr "suprimeix URLs" -#: builtin/remote.c:1531 +#: builtin/remote.c:1528 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1571 +#: builtin/remote.c:1568 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1576 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1578 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/remote.c:1595 +#: builtin/remote.c:1592 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" @@ -8963,73 +8975,73 @@ msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" msgid "git repack [options]" msgstr "git repack [opcions]" -#: builtin/repack.c:160 +#: builtin/repack.c:159 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" -#: builtin/repack.c:162 +#: builtin/repack.c:161 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:165 +#: builtin/repack.c:164 msgid "remove redundant packs, and run git-prune-packed" msgstr "tragueu els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:166 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa l'argument --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:168 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa l'argument --no-reuse-object a git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:170 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:173 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:175 msgid "write bitmap index" msgstr "escriu índex de mapa de bits" -#: builtin/repack.c:177 +#: builtin/repack.c:176 msgid "approxidate" msgstr "aproximat" -#: builtin/repack.c:178 +#: builtin/repack.c:177 msgid "with -A, do not loosen objects older than this" msgstr "amb -A, no soltis els objectes més vells que aquest" -#: builtin/repack.c:180 +#: builtin/repack.c:179 msgid "size of the window used for delta compression" msgstr "mida de la finestra que s'usa per a compressió de deltes" -#: builtin/repack.c:181 builtin/repack.c:185 +#: builtin/repack.c:180 builtin/repack.c:184 msgid "bytes" msgstr "octets" -#: builtin/repack.c:182 +#: builtin/repack.c:181 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "el mateix que l'anterior, però limita la mida de memòria en lloc del " "recompte d'entrades" -#: builtin/repack.c:184 +#: builtin/repack.c:183 msgid "limits the maximum delta depth" msgstr "limita la profunditat màxima de les deltes" -#: builtin/repack.c:186 +#: builtin/repack.c:185 msgid "maximum size of each packfile" msgstr "mida màxima de cada fitxer de paquet" -#: builtin/repack.c:188 +#: builtin/repack.c:187 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:374 +#: builtin/repack.c:371 #, c-format msgid "removing '%s' failed" msgstr "la supressió de '%s' ha fallat" @@ -9044,7 +9056,7 @@ msgstr "git replace [-f] --edit <objecte>" #: builtin/replace.c:21 msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "git replace [-f] --graft <comissió> [<pare>...]" +msgstr "git replace [-f] --graft <comissió> [<mare>...]" #: builtin/replace.c:22 msgid "git replace -d <object>..." @@ -9106,7 +9118,7 @@ msgstr "edita un objecte existent" #: builtin/replace.c:435 msgid "change a commit's parents" -msgstr "canvia els pares d'una comissió" +msgstr "canvia les mares d'una comissió" #: builtin/replace.c:436 msgid "replace the ref if it exists" @@ -9178,7 +9190,7 @@ msgstr "S'ha fallat en trobar l'arbre de %s." #: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" -msgstr "HEAD ara està a %s" +msgstr "HEAD ara és a %s" #: builtin/reset.c:183 #, c-format @@ -9335,7 +9347,7 @@ msgstr "edita el missatge de comissió" #: builtin/revert.c:87 msgid "parent number" -msgstr "número de pare" +msgstr "número de mare" #: builtin/revert.c:89 msgid "merge strategy" @@ -9517,81 +9529,81 @@ msgstr "Ajusta les línies de la sortida" #: builtin/show-branch.c:9 msgid "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " -"<glob>)...]" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t [--more=<n> | --list | --independent | --merge-base]\n" +"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" -"current] [--color[=<quan>] | --no-color] [--sparse] [--more=<n> | --list | --" -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<revisió> " -"| <glob>)...]" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" +"\t\t [--current] [--color[=<quan>] | --no-color] [--sparse]\n" +"\t\t [--more=<n> | --list | --independent | --merge-base]\n" +"\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<referència>]" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:652 msgid "show remote-tracking and local branches" msgstr "mostra les branques amb seguiment remot i les locals" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:654 msgid "show remote-tracking branches" msgstr "mostra les branques amb seguiment remot" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:656 msgid "color '*!+-' corresponding to the branch" msgstr "colora '*!+-' corresponent a la branca" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:658 msgid "show <n> more commits after the common ancestor" msgstr "mostra <n> comissions després de l'avantpassat comú" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:660 msgid "synonym to more=-1" msgstr "sinònim de more=-1" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:661 msgid "suppress naming strings" msgstr "omet l'anomenament de cadenes" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:663 msgid "include the current branch" msgstr "inclou la branca actual" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:665 msgid "name commits with their object names" msgstr "anomena les comissions amb els seus noms d'objecte" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:667 msgid "show possible merge bases" msgstr "mostra les bases de fusió possibles" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:669 msgid "show refs unreachable from any other ref" msgstr "mostra les referències inabastables de qualsevulla altra referència" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:671 msgid "show commits in topological order" msgstr "mostra les comissions en ordre topològic" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:674 msgid "show only commits not on the first branch" msgstr "mostra només les comissions que no siguin en la primera branca" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:676 msgid "show merges reachable from only one tip" msgstr "mostra les fusions abastables de només una punta" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:678 msgid "topologically sort, maintaining date order where possible" msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:681 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:682 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostra les <n> entrades més recents començant a la base" @@ -9661,11 +9673,11 @@ msgstr "suprimeix la referència simbòlica" msgid "shorten ref output" msgstr "escurça la sortida de referències" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 msgid "reason" msgstr "raó" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 msgid "reason of the update" msgstr "raó de l'actualització" @@ -10030,19 +10042,19 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [opcions] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:359 msgid "delete the reference" msgstr "suprimeix la referència" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:361 msgid "update <refname> not the one it points to" msgstr "actualitza <nom de referència>, no la que assenyali" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:362 msgid "stdin has NUL-terminated arguments" msgstr "stdin té paràmetres acabats amb NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:363 msgid "read updates from stdin" msgstr "llegeix les actualitzacions des d'stdin" @@ -10102,7 +10114,7 @@ msgstr "només útil per a la depuració" msgid "print debugging messages to stderr" msgstr "imprimeix els missatges de depuració a stderr" -#: git.c:17 +#: git.c:14 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -10223,13 +10235,13 @@ msgstr "usa <n> xifres per presentar els SHA-1" #: rerere.h:27 msgid "update the index with reused conflict resolution if possible" msgstr "" -"actualitza l'índex amb la resolució de conflicte reutilitzada si és possible" +"actualitza l'índex amb la resolució de conflicte reusada si és possible" -#: git-am.sh:52 +#: git-am.sh:53 msgid "You need to set your committer info first" msgstr "Cal establir la vostra informació de comitent primer" -#: git-am.sh:97 +#: git-am.sh:98 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10237,7 +10249,7 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No rebobinant a ORIG_HEAD" -#: git-am.sh:107 +#: git-am.sh:108 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --continue\".\n" @@ -10250,21 +10262,21 @@ msgstr "" "Per a restaurar la branca original i deixar d'apedaçar, executeu \"$cmdline " "--abort\"." -#: git-am.sh:123 +#: git-am.sh:124 msgid "Cannot fall back to three-way merge." msgstr "No es pot retrocedir a una fusió de 3 vies." -#: git-am.sh:139 +#: git-am.sh:140 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." -#: git-am.sh:141 +#: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "Usant la informació d'índex per a reconstruir un arbre base..." -#: git-am.sh:156 +#: git-am.sh:157 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10272,28 +10284,28 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: git-am.sh:165 +#: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..." -#: git-am.sh:181 +#: git-am.sh:182 msgid "Failed to merge in the changes." msgstr "S'ha fallat en fusionar els canvis." -#: git-am.sh:276 +#: git-am.sh:277 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" -#: git-am.sh:363 +#: git-am.sh:364 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "El format de pedaç $patch_format no és compatible." -#: git-am.sh:365 +#: git-am.sh:366 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: git-am.sh:392 +#: git-am.sh:398 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." @@ -10301,18 +10313,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. Si us plau, no l'useu més." -#: git-am.sh:486 +#: git-am.sh:496 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "un directori de rebase anterior $dotest encara existeix però s'ha donat una " "bústia." -#: git-am.sh:491 +#: git-am.sh:501 msgid "Please make up your mind. --skip or --abort?" msgstr "Si us plau, preneu una decisió. --skip o --abort?" -#: git-am.sh:527 +#: git-am.sh:537 #, sh-format msgid "" "Stray $dotest directory found.\n" @@ -10321,16 +10333,16 @@ msgstr "" "Directori $dotest extraviat trobat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: git-am.sh:535 +#: git-am.sh:545 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operació de resolució no en curs; no reprenem." -#: git-am.sh:601 +#: git-am.sh:612 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Índex brut: no es pot aplicar pedaços (bruts: $files)" -#: git-am.sh:705 +#: git-am.sh:722 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -10343,32 +10355,32 @@ msgstr "" "Per a restaurar la branca original i deixar d'empaquetar, executeu " "\"$cmdline --abort\"." -#: git-am.sh:732 +#: git-am.sh:749 msgid "Patch does not have a valid e-mail address." msgstr "El pedaç no té cap adreça de correu electrònic vàlida." -#: git-am.sh:779 +#: git-am.sh:796 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "no es pot ser interactiu sense que stdin sigui connectat a un terminal." -#: git-am.sh:783 +#: git-am.sh:800 msgid "Commit Body is:" msgstr "El cos de la comissió és:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:790 +#: git-am.sh:807 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Aplica? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots " -#: git-am.sh:826 +#: git-am.sh:843 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Aplicant: $FIRSTLINE" -#: git-am.sh:847 +#: git-am.sh:864 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10378,7 +10390,7 @@ msgstr "" "Si no hi ha res a allistar, probablement alguna altra cosa\n" "ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: git-am.sh:855 +#: git-am.sh:872 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -10386,16 +10398,16 @@ msgstr "" "Encara teniu camins sense fusionar en el vostre índex\n" "heu oblidat d'usar 'git add'?" -#: git-am.sh:871 +#: git-am.sh:888 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: git-am.sh:881 +#: git-am.sh:898 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "El pedaç ha fallat a $msgnum $FIRSTLINE" -#: git-am.sh:884 +#: git-am.sh:901 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -10404,7 +10416,7 @@ msgstr "" "La còpia del pedaç que ha fallat es troba en:\n" " $dotest/patch" -#: git-am.sh:902 +#: git-am.sh:919 msgid "applying to an empty history" msgstr "aplicant a una història buida" @@ -10468,22 +10480,22 @@ msgstr "Si us plau, invoqueu 'bisect_state' amb almenys un paràmetre." msgid "Bad rev input: $rev" msgstr "Introducció de revisió dolenta: $rev" -#: git-bisect.sh:250 +#: git-bisect.sh:253 msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' pot acceptar només un paràmetre." -#: git-bisect.sh:273 +#: git-bisect.sh:276 msgid "Warning: bisecting only with a bad commit." msgstr "Avís: bisecant amb només comissió dolenta." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:279 +#: git-bisect.sh:282 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: git-bisect.sh:289 +#: git-bisect.sh:292 msgid "" "You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" @@ -10491,7 +10503,7 @@ msgstr "" "Cal donar-me almenys una revisió bona i una dolenta.\n" "(Podeu usar \"git bisect bad\" i \"git bisect good\" per això.)" -#: git-bisect.sh:292 +#: git-bisect.sh:295 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revision.\n" @@ -10501,16 +10513,16 @@ msgstr "" "Després cal donar-me almenys una revisió bona i una dolenta.\n" "(Podeu usar \"git bisect bad\" i \"git bisect good\" per això.)" -#: git-bisect.sh:363 git-bisect.sh:490 +#: git-bisect.sh:366 git-bisect.sh:493 msgid "We are not bisecting." msgstr "No estem bisecant." -#: git-bisect.sh:370 +#: git-bisect.sh:373 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' no és una comissió vàlida" -#: git-bisect.sh:379 +#: git-bisect.sh:382 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -10519,25 +10531,25 @@ msgstr "" "No s'ha pogut agafar el HEAD original '$branch'.\n" "Proveu 'git bisect reset <comissió>'." -#: git-bisect.sh:406 +#: git-bisect.sh:409 msgid "No logfile given" msgstr "Cap fitxer de registre donat" -#: git-bisect.sh:407 +#: git-bisect.sh:410 #, sh-format msgid "cannot read $file for replaying" msgstr "no es pot llegir $file per a reproducció" -#: git-bisect.sh:424 +#: git-bisect.sh:427 msgid "?? what are you talking about?" msgstr "?? de què parleu?" -#: git-bisect.sh:436 +#: git-bisect.sh:439 #, sh-format msgid "running $command" msgstr "executant $command" -#: git-bisect.sh:443 +#: git-bisect.sh:446 #, sh-format msgid "" "bisect run failed:\n" @@ -10546,11 +10558,11 @@ msgstr "" "el pas de bisecció ha fallat:\n" "el codi de sortida $res de '$command' és < 0 o >= 128" -#: git-bisect.sh:469 +#: git-bisect.sh:472 msgid "bisect run cannot continue any more" msgstr "el pas de bisecció no pot continuar més" -#: git-bisect.sh:475 +#: git-bisect.sh:478 #, sh-format msgid "" "bisect run failed:\n" @@ -10559,7 +10571,7 @@ msgstr "" "el pas de bisecció ha fallat:\n" "'bisect_state $state' ha surt amb el codi d'error $res" -#: git-bisect.sh:482 +#: git-bisect.sh:485 msgid "bisect run success" msgstr "pas de bisecció reeixit" |