summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2015-12-20 11:32:26 (GMT)
committerJiang Xin <worldhello.net@gmail.com>2015-12-20 11:32:26 (GMT)
commit5b82d4ee294cc3eae47433e48466889849f25777 (patch)
treefd711276cc7e43f3f50d8099341aac81966ae5dd
parent13691905d06c7224b27d6365958d951f9542663d (diff)
parent0d8e36f314a8f0fb3ddd676561241530d04dbe33 (diff)
downloadgit-5b82d4ee294cc3eae47433e48466889849f25777.zip
git-5b82d4ee294cc3eae47433e48466889849f25777.tar.gz
git-5b82d4ee294cc3eae47433e48466889849f25777.tar.bz2
Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
-rw-r--r--po/ca.po3107
1 files changed, 1644 insertions, 1463 deletions
diff --git a/po/ca.po b/po/ca.po
index c92a18c..66b1f50 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-14 21:05-0600\n"
+"POT-Creation-Date: 2015-12-11 23:36+0800\n"
+"PO-Revision-Date: 2015-12-18 23:36-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
#: advice.c:55
#, c-format
@@ -32,12 +32,12 @@ msgstr ""
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
+msgid "Please, commit your changes before merging."
msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."
#: advice.c:104
@@ -63,78 +63,78 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "format"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1228
msgid "prefix"
msgstr "prefix"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fitxer"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
-msgstr "comprimeix més ràpid"
+msgstr "comprimeix més ràpidament"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "allista els formats d'arxiu admesos"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "dipòsit"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "ordre"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
-msgstr "camí a l'ordre git-upload-archive remot"
+msgstr "camí a l'ordre git-upload-archive remota"
#: attr.c:265
msgid ""
@@ -144,90 +144,90 @@ msgstr ""
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu '\\!' per exclamació capdavantera literal."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "No establint la branca %s com a la seva pròpia font."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la branca remota %s de %s per "
"rebasar."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la branca local %s per rebasar."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "La branca %s està configurada per a seguir la branca local %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la referència remota %s per "
"rebasar."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "La branca %s està configurada per a seguir la referència remota %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la referència local %s per "
"rebasar."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "La branca %s està configurada per a seguir la referència local %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' no és un nom de branca vàlid."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una branca amb nom '%s' ja existeix."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
"una branca."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada '%s' no existeix"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -248,22 +248,22 @@ msgstr ""
"\"git push -u\" per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: '%s'."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: '%s'."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: '%s'."
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ja s'ha agafat a '%s'"
@@ -278,7 +278,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:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
@@ -287,9 +287,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:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -329,7 +329,7 @@ msgstr "El rev-list s'ha mort"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
@@ -347,13 +347,13 @@ msgstr "no es pot crear '%s'"
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -511,23 +511,23 @@ msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
msgid "Performing inexact rename detection"
msgstr "Realitzant detecció inexacta de canvis de nom"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -536,16 +536,16 @@ msgstr ""
"Errors trobats en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "El diff external s'ha mort, aturant a %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -554,16 +554,16 @@ msgstr ""
"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "La memòria cau no seguida està deshabilitada en aquest sistema."
@@ -615,7 +615,7 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
#: help.c:246
msgid "These are common Git commands used in various situations:"
-msgstr "Aquests són ordres del Git comunament usats en diverses situacions:"
+msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
#: help.c:311
#, c-format
@@ -623,7 +623,7 @@ msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"'%s' sembla una ordre git, però no hem pogut\n"
+"'%s' sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui estropejat?"
#: help.c:368
@@ -672,8 +672,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "s'ha fallat en llegir la memòria cau"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
@@ -691,64 +691,64 @@ msgstr "addinfo_cache ha fallat per al camí '%s'"
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha fallat en crear el camí '%s' %s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, 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:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refusant perdre el fitxer no seguit a '%s'"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s '%s'"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha fallat en obrir '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s '%s'"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "S'ha fallat en executar la fusió interna"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "no s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "tipus d'objecte no compatible en l'arbre"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -757,7 +757,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:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -766,20 +766,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:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "canvia de nom"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, 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:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -788,147 +788,147 @@ 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:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, 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:1259
+#: merge-recursive.c:1258
#, 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:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
"%s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Afegint %s fusionat"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Afegint com a %s en lloc d'això"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "L'objecte %s no és un blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s saltat (el fusionat és igual a l'existent)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Autofusionant %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Eliminant %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, 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:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Afegint %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Fallat de fusió fatal; això no ha de passar."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Ja al dia!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Camí no processat??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, 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:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -958,31 +958,41 @@ msgstr "Valor dolent de %s: '%s'"
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-NUM"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objecte mal format '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "No s'ha pogut fer %s escrivible pel grup"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1054,11 +1064,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "fet"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1067,7 +1077,7 @@ msgstr ""
"index.version establert, però el valor no és vàlid.\n"
"Usant la versió %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1076,119 +1086,164 @@ msgstr ""
"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"
"Usant la versió %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positiu esperat contents:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format esperat: %%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "no s'ha pogut analitzar el format"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format esperat: %%(align:<amplada>,<posició>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "format impropi introduït align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "amplada positiva esperada amb l'àtom %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objecte mal format a '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: manca l'àtom %%(end)"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objecte %s mal format"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es pot obtenir ambdós %s i %s a %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Error intern"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "no hi ha tal branca: '%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca '%s'"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca '%s' no té cap remot al qual pujar"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les especificacions de referència de '%s' no inclouen '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
-#: remote.c:2124
+#: remote.c:2083
#, 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:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "La vostra branca està al dia amb '%s'.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1200,11 +1255,11 @@ msgstr[1] ""
"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
"ràpidament.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1219,28 +1274,28 @@ msgstr[1] ""
"La vostra branca i '%s' s'han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:2198
+#: revision.c:2191
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
-#: revision.c:2201
+#: revision.c:2194
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: revision.c:2395
+#: revision.c:2388
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "s'ha fallat en obrir /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ha fallat"
@@ -1459,7 +1514,7 @@ msgstr "no es pot resoldre HEAD"
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:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "no es pot obrir %s: %s"
@@ -1501,12 +1556,12 @@ msgstr "No es pot revertir com a comissió inicial"
msgid "Can't cherry-pick into empty head"
msgstr "No es pot recollir cireres en un cap buit"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "s'ha fallat en llegir %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1555,7 +1610,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:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "No s'ha pogut establir core.worktree en %s"
@@ -1566,7 +1621,7 @@ msgstr "No s'ha pogut establir core.worktree en %s"
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut '%s' per a la clau '%s'"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
@@ -1633,8 +1688,8 @@ msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir '%s' per a lectura"
@@ -1662,17 +1717,17 @@ msgstr "no hi ha tal usuari"
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wrapper.c:631
+#: wrapper.c:647
#, c-format
msgid "could not open %s for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:658 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: wrapper.c:648
+#: wrapper.c:664
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
@@ -1879,8 +1934,8 @@ msgstr "No s'ha fet cap ordre."
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Últim ordre fet (%d ordre fet):"
-msgstr[1] "Últims ordres fets (%d ordres fets):"
+msgstr[0] "Última ordre fet (%d ordre feta):"
+msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
#: wt-status.c:1119
#, c-format
@@ -2018,27 +2073,27 @@ msgstr "Actualment esteu bisecant."
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:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "rebasament interactiu en progrés; sobre "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "rebasament en progrés; sobre "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD separat de "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Actualment no en cap branca."
@@ -2127,23 +2182,23 @@ msgstr ""
msgid "nothing to commit, working directory clean\n"
msgstr "no hi ha res a cometre, directori de treball net\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (sense branca)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (sense branca)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "no hi és"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "darrere "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha fallat en desenllaçar '%s'"
@@ -2157,7 +2212,7 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "s'ha fallat en actualitzar els fitxers"
@@ -2170,7 +2225,7 @@ msgstr "elimina '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
@@ -2206,15 +2261,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "sigues detallat"
@@ -2222,7 +2277,7 @@ msgstr "sigues detallat"
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
@@ -2281,148 +2336,149 @@ msgstr "-A i -u són mutualment incompatibles"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Res especificat, res afegit.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a '%s'"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir '%s'"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit '%s' per el ganxo applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "no s'ha pogut obrir '%s' per a lectura: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no s'ha pogut obrir '%s' per a escriptura: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç '%s'"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha fallat en crear el directori '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "S'ha fallat en dividir els pedaços."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
"\"."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1344
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "Usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2430,38 +2486,38 @@ msgstr ""
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "S'ha fallat en fusionar els canvis."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "aplicant a una història buida"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin sigui connectat a un terminal."
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -2469,37 +2525,37 @@ msgstr "El cos de la comissió és:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicant: %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La còpia del pedaç que ha fallat es troba en: %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2509,7 +2565,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ç."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2517,17 +2573,17 @@ msgstr ""
"Encara teniu camins sense fusionar en el vostre índex.\n"
"Heu oblidat d'usar 'git add'?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte '%s'."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "s'ha fallat en netejar l'índex"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2535,152 +2591,154 @@ msgstr ""
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No rebobinant a ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [opcions] [(<bústia>|<directori-de-correu>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [opcions] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "calla"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "afegeix una línia Signed-off-by al missatge de comissió"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "despulla tot abans d'una línia de tissores"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "acció"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "arrel"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "camí"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "número"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr ""
"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "salta el pedaç actual"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "firma les comissions amb GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
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."
@@ -2688,18 +2746,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."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "s'ha fallat en llegir l'índex"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de rebasament anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2708,7 +2766,7 @@ msgstr ""
"Directori %s extraviat trobat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operació de resolució no en curs; no reprenem."
@@ -2716,65 +2774,65 @@ msgstr "Operació de resolució no en curs; no reprenem."
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2789,77 +2847,77 @@ msgstr[1] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "el pedaç és malmès a la línia %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** avís: el fitxer %s queda buit però no se suprimeix"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2868,326 +2926,326 @@ msgstr ""
"tot cercant:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a '%s'"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "la lectura de %s ha fallat"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "llegint de '%s' més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: %s"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Comprovant el pedaç %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí '%s'"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "tancant el fitxer '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "error intern"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicant el pedaç %%s amb %d rebuig"
msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos"
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncant el nom del fitxer .rej a %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "no es pot obrir el pedaç '%s'"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error d'espai en blanc omès"
msgstr[1] "%d errors d'espai en blanc omesos"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3249,101 +3307,101 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades de culpa"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
"defecte: desactivat)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
@@ -3353,27 +3411,31 @@ msgstr "Processa només el rang de línies n,m, comptant des d'1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3383,7 +3445,7 @@ msgstr ""
" '%s', però encara no s'ha fusionat\n"
" a HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3393,12 +3455,12 @@ msgstr ""
" fusionat a '%s', encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3407,348 +3469,340 @@ msgstr ""
"La branca '%s' no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "No es pot suprimir la branca '%s', en la qual sou actualment."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca '%s'."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "la branca '%s' no assenyala cap comissió"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: no hi és]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: darrere per %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[darrere de %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: davant per %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[davant de %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: davant per %d, darrere per %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[davant %d, darrere %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** referència no vàlida ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(cap branca, rebasant %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap branca, bisecció començada en %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat de %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(cap branca)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "l'objecte '%s' no assenyala cap comissió"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "no s'han pogut llegir algunes referències"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: '%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca malanomenada '%s'"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objecte %s mal format"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "comissió"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "imprimeix només les branques sense fusionar"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "imprimeix només les branques fusionades"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "clau"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "nom del camp en el qual ordenar"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "objecte"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "imprimeix només les branques de l'objecte"
+
+#: builtin/branch.c:670
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:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
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:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha comissió en la branca '%s'."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha branca amb nom '%s'."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "hi ha massa branques per a una operació de canvi de nom"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "hi ha massa branques per a establir una nova font"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, 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:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "no hi ha tal branca '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca '%s' no existeix"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "hi ha massa branques per a desestablir la font"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
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:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca '%s' no té informació de font"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
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:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3757,7 +3811,7 @@ msgstr ""
"La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --"
"track o --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3768,12 +3822,12 @@ msgstr ""
"Si volíeu fer '%s' seguir '%s', feu això:\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3800,12 +3854,8 @@ msgstr ""
"<tipus>|--textconv) <objecte>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <llista-"
-"d'objectes>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3862,9 +3912,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr ""
-"git check-attr --stdin [-z] [-a | --all | <atribut>...] < <llista-de-camins>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3882,7 +3931,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:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
@@ -3968,6 +4017,8 @@ msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "cadena"
@@ -3987,106 +4038,106 @@ msgstr "git checkout [<opcions>] <branca>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí '%s' no té la versió nostra"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí '%s' no té la versió seva"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, 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:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí '%s' no té les versions necessàries"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí '%s': no es pot fusionar"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, 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:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no es pot usar amb actualització de camins"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no es pot usar amb %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, 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:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "fitxer d'índex malmès"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "heu de resoldre el vostre índex actual primer"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a '%s': %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha agafat i restablert la branca '%s'\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha agafat la branca nova '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha agafat la branca '%s'\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4109,7 +4160,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4136,144 +4187,150 @@ msgstr[1] ""
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de nàixer"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "només una referència esperada, %d donades."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió '%s'"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "separa el HEAD a la comissió anomenada"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulla modificació local)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "força l'informe de progrés"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4282,12 +4339,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:1251
+#: builtin/checkout.c:1261
#, 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:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4326,7 +4383,7 @@ msgstr "Saltaria el dipòsit %s\n"
msgid "failed to remove %s"
msgstr "s'ha fallat en eliminar %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4338,7 +4395,7 @@ msgstr ""
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4358,36 +4415,36 @@ msgstr ""
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Adéu."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4405,62 +4462,62 @@ msgstr ""
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; sortint."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "força"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4468,7 +4525,7 @@ msgstr ""
"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; "
"refusant netejar"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4480,16 +4537,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "força l'informe de progrés"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
-msgstr "no facis cap agafada"
+msgstr "no facis cap agafament"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
@@ -4513,15 +4565,15 @@ msgstr "configura com a dipòsit compartit"
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "dipòsit de referència"
@@ -4545,7 +4597,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot"
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
msgid "depth"
msgstr "profunditat"
@@ -4557,11 +4609,11 @@ msgstr "crea un clon superficial de tal profunditat"
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
@@ -4573,178 +4625,181 @@ msgstr "clau=valor"
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
+
+#: builtin/clone.c:302
#, 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:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència '%s' és superficial"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència '%s' és empeltat"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha fallat en fer stat a '%s'"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-"La clonació ha tingut èxit, però l'agafada ha fallat.\n"
-"Podeu inspeccionar què s'ha agafat amb 'git status' i\n"
-"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"
+"La clonació ha tingut èxit, però l'agafament ha\n"
+"fallat. Podeu inspeccionar què s'ha agafat amb\n"
+"'git status' i tornar a intentar l'agafament amb\n"
+"'git checkout -f HEAD'\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, 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:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Provant connectivitat... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
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:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, 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:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, 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:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonant a '%s'...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "s'ha donat --dissociate, però no hi ha --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
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:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, ignorant --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, 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:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -4780,15 +4835,15 @@ msgstr "Espai d'encoixinada entre columnes"
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4815,7 +4870,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4841,7 +4896,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -4851,7 +4906,7 @@ msgstr ""
"deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
"podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4866,11 +4921,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "D'altra manera, si us plau, useu 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4886,66 +4941,66 @@ msgstr ""
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com a cireres les comissions restants.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió '%s' li manca la capçalera d'autor"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió '%s' té una línia d'autor mal formada"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -4953,38 +5008,38 @@ msgstr ""
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4999,7 +5054,7 @@ msgstr ""
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5014,7 +5069,7 @@ msgstr ""
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5024,7 +5079,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:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5035,148 +5090,149 @@ 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:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, 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:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid '%s'"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
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:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
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:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
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:1165
+#: builtin/commit.c:1166
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:1173
+#: builtin/commit.c:1174
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:1190
+#: builtin/commit.c:1191
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:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Intel·ligent... esmenant l'últim amb índex brut."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
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:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5184,197 +5240,202 @@ msgstr ""
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "comissió"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
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:1583
+#: builtin/commit.c:1586
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:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "firma la comissió amb GPG"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "evita el ganxo de precomissió"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, 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:1737
+#: builtin/commit.c:1740
#, 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:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5514,11 +5575,11 @@ msgstr "mostra només els noms de variable"
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5533,16 +5594,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
@@ -5662,7 +5723,7 @@ msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
@@ -5839,7 +5900,7 @@ msgstr "aprofundeix la història d'un clon superficial"
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:118 builtin/log.c:1233
+#: builtin/fetch.c:118 builtin/log.c:1232
msgid "dir"
msgstr "directori"
@@ -5881,7 +5942,7 @@ msgstr "[al dia]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[rebutjat]"
@@ -5905,40 +5966,40 @@ msgstr "[branca nova]"
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(sense avanç ràpid)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no es pot obrir %s: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5948,55 +6009,55 @@ msgstr ""
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevulla branca antiga o conflictiva"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Obtenint %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6004,32 +6065,32 @@ msgstr ""
"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -6039,23 +6100,23 @@ msgid ""
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
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:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (desaprovat)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -6063,97 +6124,117 @@ msgstr "fitxer del qual llegir"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<opcions>] [<patró>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <objecte>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<objecte>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<objecte>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr ""
"posa els marcadors de posició entre cometes de forma adequada per a "
"intèrprets d'ordres"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "posa els marcadors de posició entre cometes adequades per al perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "posa els marcadors de posició entre cometes adequades per al python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "clau"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "imprimeix només les referències que assenyalin l'objecte donat"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "nom de camp en el qual ordenar"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "imprimeix només les referències que s'han fusionat"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "imprimeix només les referències que no s'han fusionat"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "imprimeix només les referències que continguin la comissió"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Comprovant connectivitat"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Comprovant els directoris d'objecte"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Comprovant els objectes"
@@ -6161,56 +6242,71 @@ msgstr "Comprovant els objectes"
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: %s"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "directori d'objectes increïblement llarg %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"L'última execució de gc ha informat d'ho següent. Si us plau, corregiu\n"
+"la causa primordial i elimineu %s.\n"
+"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu \"git help gc\" per neteja manual.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6246,203 +6342,199 @@ msgstr "l'opció `%c' espera un valor numèric"
msgid "cannot open '%s'"
msgstr "no es pot obrir '%s'"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "mostra l'ús"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index o --untracked no es pot usar amb revisions."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -6455,10 +6547,10 @@ msgstr ""
"[--] <fitxer>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <llista-de-camins>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "tipus"
@@ -6531,12 +6623,12 @@ msgstr "S'ha fallat en analitzar la versió d'emacsclient."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "s'ha fallat en executar '%s': %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6545,7 +6637,7 @@ msgstr ""
"'%s': camí a un visualitzador de manuals no compatible.\n"
"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6554,61 +6646,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:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualitzador de manuals desconegut"
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
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:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' és un àlies de `%s'"
@@ -6901,87 +6993,62 @@ msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'"
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "No s'ha pogut fer %s escrivible pel grup"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "nom de plantilla increïblement llarg %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en '%s'"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "no es pot fer stat en la plantilla '%s'"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "no es pot fer opendir en el directori '%s'"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "no es pot fer readlink en '%s'"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "enllaç simbòlic increïblement llarg %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no es pot fer symlink en '%s' '%s'"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no es pot copiar '%s' a '%s'"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "ignorant la plantilla %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "camí de plantilla increïblement llarg %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "no s'han trobat les plantilles %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, 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:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "directori de git boig %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
@@ -6989,24 +7056,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:434
+#: builtin/init-db.c:399
#, 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:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "S'ha reinicialitzat un existent"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "S'ha inicialitzat un buit"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " compartit"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7014,25 +7081,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
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:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot chdir a %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7041,7 +7108,7 @@ msgstr ""
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball '%s'"
@@ -7127,213 +7194,213 @@ msgstr "format.headers sense valor"
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Dos directoris de sortida?"
-#: builtin/log.c:1211
+#: builtin/log.c:1210
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1214
+#: builtin/log.c:1213
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1218
+#: builtin/log.c:1217
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1220
+#: builtin/log.c:1219
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1222
+#: builtin/log.c:1221
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1223
+#: builtin/log.c:1222
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1224
+#: builtin/log.c:1223
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1226
+#: builtin/log.c:1225
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1228
+#: builtin/log.c:1227
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1230
+#: builtin/log.c:1229
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1233
+#: builtin/log.c:1232
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1236
+#: builtin/log.c:1235
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1239
+#: builtin/log.c:1238
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1241
+#: builtin/log.c:1240
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1243
+#: builtin/log.c:1242
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1245
+#: builtin/log.c:1244
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1246
+#: builtin/log.c:1245
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1247
+#: builtin/log.c:1246
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1247 builtin/log.c:1249
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1248
+#: builtin/log.c:1247
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1250
+#: builtin/log.c:1249
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1252
+#: builtin/log.c:1251
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1253
+#: builtin/log.c:1252
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1255
+#: builtin/log.c:1254
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1256
+#: builtin/log.c:1255
msgid "make first mail a reply to <message-id>"
msgstr "fes del primer missatge una resposta a <ID de missatge>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1256 builtin/log.c:1259
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1258
+#: builtin/log.c:1257
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1261
+#: builtin/log.c:1260
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1265
+#: builtin/log.c:1264
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1267
+#: builtin/log.c:1266
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1268
+#: builtin/log.c:1267
msgid "add a signature"
msgstr "afegeix una firma"
-#: builtin/log.c:1270
+#: builtin/log.c:1269
msgid "add a signature from a file"
msgstr "afegeix una firma des d'un fitxer"
-#: builtin/log.c:1271
+#: builtin/log.c:1270
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1360
+#: builtin/log.c:1359
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1362
+#: builtin/log.c:1361
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix i -k són mutualment exclusius."
-#: builtin/log.c:1370
+#: builtin/log.c:1369
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1372
+#: builtin/log.c:1371
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1374
+#: builtin/log.c:1373
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1397
+#: builtin/log.c:1396
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1399
+#: builtin/log.c:1398
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1496
+#: builtin/log.c:1495
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
-#: builtin/log.c:1559
+#: builtin/log.c:1558
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:1607
+#: builtin/log.c:1606
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1660
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7341,7 +7408,7 @@ msgstr ""
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
@@ -7444,35 +7511,35 @@ 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:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "mostra només els arbres"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "recursa als subarbres"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "mostra els arbres en recursar"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "acaba les entrades amb un octet NUL"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "mida de l'objecte d'inclusió"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "llista només els noms de fitxer"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "usa els noms de camí complets"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"llista l'arbre sencer; no només el directori actual (implica --full-name)"
@@ -7708,16 +7775,16 @@ msgstr "No hi ha cap font per defecte definida per a la branca actual."
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar '%s'"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7725,7 +7792,7 @@ msgstr ""
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7733,54 +7800,54 @@ msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
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:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Aixafar una comissió a un cap buit encara no es permet"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
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:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar no més d'exactament una comissió a un cap buit"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, 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:1336
+#: builtin/merge.c:1334
#, 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:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té firma GPG."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, 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"
@@ -7790,46 +7857,46 @@ msgstr "La comissió %s té una firma GPG bona de %s\n"
msgid "Updating %s..%s\n"
msgstr "Actualitzant %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, avortant."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, 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:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8022,48 +8089,48 @@ 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:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
@@ -8194,7 +8261,7 @@ msgstr "no s'ha pogut llegir la sortida de 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer '%s'"
@@ -8214,12 +8281,12 @@ msgstr "no s'ha pogut escriure l'objecte de nota"
msgid "The note contents have been left in %s"
msgstr "Els continguts de la nota s'han deixat en %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir '%s'"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir '%s'"
@@ -8227,7 +8294,7 @@ msgstr "no s'ha pogut obrir o llegir '%s'"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
@@ -8261,11 +8328,6 @@ msgstr "anota els continguts com a cadena"
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "objecte"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
@@ -8334,7 +8396,7 @@ msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-"S'han desaprovat les opcions -m/-F/-c/-C en favor del subordre 'edit'.\n"
+"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:764
@@ -8395,10 +8457,10 @@ msgstr "referència de notes"
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
-msgstr "Subordre desconegut: %s"
+msgstr "Subordre desconeguda: %s"
#: builtin/pack-objects.c:28
msgid ""
@@ -8616,20 +8678,24 @@ msgstr "Eliminant objectes duplicats"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "no es pot podar en un dipòsit d'objectes precioses"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [opcions] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/pull.c:113
@@ -8682,8 +8748,7 @@ msgstr ""
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-"No hi ha candidats per a fusionar entre les referències que acabeu de "
-"obtenir."
+"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
#: builtin/pull.c:439
msgid ""
@@ -8702,7 +8767,7 @@ msgid ""
msgstr ""
"Heu demanat baixar del remot '%s', però no heu especificat cap branca.\n"
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
-"branca actual, heu de especificar una branca en la línia d'ordres."
+"branca actual, heu d'especificar una branca en la línia d'ordres."
#: builtin/pull.c:447
msgid "You are not currently on a branch."
@@ -9194,12 +9259,12 @@ msgstr "salta l'aplicació del filtre d'agafament dispers"
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' per a '%s' no és una marca de temps vàlida"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' no és una marca de temps vàlida"
@@ -9216,15 +9281,15 @@ msgstr ""
"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <antic> <nou>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
@@ -9246,48 +9311,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branca>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nom>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <url-nou>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <url>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opcions>] <nom> <url>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branca>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branca>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opcions>] <nom>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opcions>] <nom>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Actualitzant %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9296,98 +9365,98 @@ msgstr ""
"\t plau, useu --mirror=fetch o\n"
"\t --mirror=push en lloc d'això"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "paràmetre de reflexió desconegut: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "obtén les branques remotes"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "o no obtinguis cap etiqueta (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "branques a seguir"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "branca mestra"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "especificar una branca mestra no té sentit amb --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 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:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra '%s'"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(coincident)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "No s'ha pogut annexar '%s' a '%s'"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
-#: builtin/remote.c:647
+#: 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:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9398,27 +9467,27 @@ msgstr ""
"\t%s\n"
"\tSi us plau, actualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "No s'ha pogut annexar '%s'"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "No s'ha pogut establir '%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de '%s' ha fallat"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de '%s' ha fallat"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9433,267 +9502,280 @@ msgstr[1] ""
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, 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:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "es rebasa sobre el remot %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " i amb el remot"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " i amb el remot"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(sense URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, 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:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a 'git pull':"
msgstr[1] " Branques locals configurades per a 'git pull':"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, 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:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
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:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Podant %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "consulta els URL de pujada en lloc dels URL d'obteniment"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "retorna tots els URL"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "cap URL configurat per al remot '%s'"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
#: builtin/repack.c:17
msgid "git repack [<options>]"
@@ -9765,7 +9847,11 @@ msgstr "mida màxima de cada fitxer de paquet"
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "no es pot suprimir paquets en un dipòsit d'objectes precioses"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "l'eliminació de '%s' ha fallat"
@@ -9860,7 +9946,7 @@ msgstr "usa aquest format"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registra les resolucions netes en l'índex"
@@ -9996,23 +10082,23 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou."
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10242,7 +10328,7 @@ msgstr "llegeix les referències des d'stdin"
#: builtin/send-pack.c:173
msgid "print status from remote helper"
-msgstr "imprimeix l'estat des del ajudant remot"
+msgstr "imprimeix l'estat des de l'ajudant remot"
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
@@ -10274,7 +10360,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10286,71 +10372,71 @@ msgstr ""
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
"\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
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:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "omet l'anomenament de cadenes"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevulla altra referència"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
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:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
@@ -10363,43 +10449,137 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<patró>] < <llista-de-referències>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<patró>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "mostra només les etiquetes (es pot combinar amb heads)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "mostra només els caps (es pot combinar amb tags)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"comprovació de referència més estricta, requereix el camí de referència "
"exacte"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostra la referència HEAD, encara que es filtrés"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "dereferencia les etiquetes a IDs d'objecte"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "mostra el hash SHA1 usant només <n> xifres"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències d'stdin que no siguin en el dipòsit local"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"salta i elimina totes les línies començant amb el caràcter de comentari"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "anteposa el caràcter de comentari i espai blanc a cada línia"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "àncora alternativa per als camins relatius"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <camí>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "a on es clonarà el submòdul nou"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "nom del submòdul nou"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "url del qual clonar el submòdul"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "profunditat dels clons superficials"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
+"<dipòsit>] [--name <nom>] [--url <url>][--depth <profunditat>] [--] "
+"[<camí>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no s'ha pogut crear el directori '%s'"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "no es pot obrir el fitxer '%s'"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "no s'ha pogut tancar el fitxer %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "fatal: s'ha d'executar la subordre submodule--helper amb una subordre"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "fatal: '%s' no és una subordre vàlida de submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
@@ -10428,7 +10608,7 @@ msgstr "raó"
msgid "reason of the update"
msgstr "raó de l'actualització"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10436,48 +10616,44 @@ msgstr ""
"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
"d'etiqueta> [<cap>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<nombre>]] [--contains <comissió>]\n"
-"\t\t[--points-at <objecte>] [<patró>...]"
+"\t\t[--points-at <objecte>] [--format=<format>]\n"
+"\t\t[--[no-]merged [<comissió>]] [<patró>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nom-d'etiqueta>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'etiqueta massa llarg: %.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "etiqueta '%s' no trobada."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "L'etiqueta '%s' s'ha suprimit (era %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "no s'ha pogut verificar l'etiqueta '%s'"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10490,7 +10666,7 @@ msgstr ""
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10505,153 +10681,138 @@ msgstr ""
"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "especificació d'ordenació '%s' no admesa"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "especificació d'ordenació '%s' no admesa en la variable '%s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "no s'ha pogut firmar l'etiqueta"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "tipus d'objecte dolent."
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "capçalera d'etiqueta massa gran."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "cap missatge d'etiqueta?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "l'opció 'points-at' requereix un objecte"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i firmada per GPG"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a firmar l'etiqueta"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "ordena les etiquetes"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "imprimeix només les etiquetes que s'han fusionat"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "imprimeix només les etiquetes que no s'han fusionat"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort i -n són incompatibles"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "es permet l'opció -n només amb -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "es permet l'opció --contains només amb -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "es permet --points-at option només amb -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "es permeten les opcions --merged i --no-merged només amb -l"
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta '%s' ja existeix"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
@@ -10923,78 +11084,82 @@ msgstr "git verify-tag [-v | --verbose] <etiqueta>..."
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<opcions>] <camí> <branca>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<opcions>] <camí> [<branca>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opcions>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "s'ha fallat en eliminar: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ja existeix"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de '%s'"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Preparant %s (identificador %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "separa el HEAD a la comissió anomenada"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
@@ -11144,49 +11309,49 @@ msgstr "data-de-caducitat"
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"actualitza l'índex amb la resolució de conflicte reusada si és possible"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Cal començar per \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vós [Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "opció no reconeguda: '$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' no sembla una revisió vàlida"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD dolent - Cal un HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11194,39 +11359,39 @@ msgstr ""
"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
"vàlida>'."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD dolent - referència simbòlica estranya"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Paràmetre bisect_write dolent: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió dolenta: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Si us plau, invoqueu 'bisect_state' amb almenys un paràmetre."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Introducció de revisió dolenta: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Avís: bisecant amb només comissió $TERM_BAD."
@@ -11234,11 +11399,11 @@ msgstr "Avís: bisecant amb només comissió $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11247,7 +11412,7 @@ msgstr ""
"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11258,16 +11423,16 @@ msgstr ""
"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "No estem bisecant."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' no és una comissió vàlida"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11276,25 +11441,25 @@ msgstr ""
"No s'ha pogut agafar el HEAD original '$branch'.\n"
"Proveu 'git bisect reset <comissió>'."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Cap fitxer de registre donat"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no es pot llegir $file per a reproducció"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? de què parleu?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "executant $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11303,11 +11468,11 @@ msgstr ""
"el pas de bisecció ha fallat:\n"
"el codi de sortida $res de '$command' és < 0 o >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "el pas de bisecció no pot continuar més"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11316,15 +11481,47 @@ msgstr ""
"el pas de bisecció ha fallat:\n"
"'bisect_state $state' ha surt amb el codi d'error $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "pas de bisecció reeixit"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "si us plau, useu dos termes distintes"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' no és un terme vàlid"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "no es pot usar l'ordre interna '$term' com a terme"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "no es pot canviar el significat del terme '$term'"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "Ordre invàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "cap terme definit"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"paràmetre invàlid $arg per a 'git bisect terms'.\n"
+"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11364,24 +11561,24 @@ msgstr "El ganxo de prerebasament ha refusat rebasar."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot rebasar."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "L'opció --exec s'ha d'usar amb l'opció --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "No hi ha rebasament en curs?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'acció --edit-todo només es pot usar durant un rebasament interactiva."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11389,12 +11586,12 @@ msgstr ""
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "No s'ha pogut tornar a $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11415,65 +11612,65 @@ msgstr ""
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; rebasament forçada."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Primer, rebobinant el cap per a reproduir el vostre treball al damunt..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "S'ha avançat $branch_name ràpidament a $onto_name"
@@ -11546,115 +11743,99 @@ msgstr "No es pot desar l'estat actual"
msgid "Cannot remove worktree changes"
msgstr "No es pot eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Cap magatzem trobat."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Massa revisions especificades: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "No es pot desallistar fitxers modificats"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "no es pot despullar un component de l'url '$remoteurl'"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-"No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '$sm_path'"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "El clonatge de '$url' al camí de submòdul '$sm_path' ha fallat"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "El directori de git '$a' és part del camí de submòdul '$b' o viceversa"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11665,23 +11846,23 @@ msgstr ""
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11689,7 +11870,7 @@ msgstr ""
"Si voleu tornar a usar aquest directori de git local en lloc de clonar de "
"nou des de"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -11697,7 +11878,7 @@ msgstr ""
"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
"correcte"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11705,78 +11886,78 @@ msgid ""
msgstr ""
"o esteu insegur de què vol dir això, trieu un altre nom amb l'opció '--name'."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "no s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha fallat en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha fallat en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Entrant a '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
"Aturant a '$prefix$displaypath'; l'script ha retornat un estat no zero."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"No s'ha trobat cap url per al camí de submòdul '$displaypath' a .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "S'ha fallat en registrar l'url per al camí de submòdul '$displaypath'"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "S'ha registrat el submòdul '$name' ($url) per al camí '$displaypath'"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"S'ha fallat en registrar el mode d'actualització per al camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "Useu '.' si realment voleu desinicialitzar tots els submòduls"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "L'arbre de treball de submòdul '$displaypath' conté un directori .git"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"(useu 'rm -rf' si realment voleu eliminar-lo incloent tota la seva història)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11785,27 +11966,27 @@ msgstr ""
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11814,53 +11995,53 @@ msgstr ""
"Camí de submòdul '$displaypath' no inicialitzat\n"
"Potser voleu usar 'update --init'?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
@@ -11868,50 +12049,50 @@ msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul '$prefix"
"$sm_path'"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Camí de submòdul '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Sincronitzant l'url de submòdul per a '$displaypath'"