0d8e36f314 · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

8 "Project-Id-Version: Git\n"

9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

10 -"POT-Creation-Date: 2015-09-15 06:45+0800\n"

11 -"PO-Revision-Date: 2015-09-14 21:05-0600\n"

10 +"POT-Creation-Date: 2015-12-11 23:36+0800\n"

11 +"PO-Revision-Date: 2015-12-18 23:36-0700\n"

12 "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"

13 "Language-Team: Catalan\n"

14 "Language: ca\n"

@@ -16,7 +16,7 @@ msgstr ""

16 "Content-Type: text/plain; charset=UTF-8\n"

17 "Content-Transfer-Encoding: 8bit\n"

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19 -"X-Generator: Poedit 1.8.4\n"

19 +"X-Generator: Poedit 1.8.6\n"

20

21 #: advice.c:55

22 #, c-format

@@ -32,12 +32,12 @@ msgstr ""

32 "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"

33 "resolució i feu una comissió."

34

35 -#: advice.c:101 builtin/merge.c:1227

35 +#: advice.c:101 builtin/merge.c:1225

36 msgid "You have not concluded your merge (MERGE_HEAD exists)."

37 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."

38

39 #: advice.c:103

40 -msgid "Please, commit your changes before you can merge."

40 +msgid "Please, commit your changes before merging."

41 msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."

42

43 #: advice.c:104

@@ -63,78 +63,78 @@ msgstr ""

63 msgid "git archive --remote <repo> [--exec <cmd>] --list"

64 msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"

65

66 -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

66 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

67 #, c-format

68 msgid "pathspec '%s' did not match any files"

69 msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"

70

71 -#: archive.c:428

71 +#: archive.c:429

72 msgid "fmt"

73 msgstr "format"

74

75 -#: archive.c:428

75 +#: archive.c:429

76 msgid "archive format"

77 msgstr "format d'arxiu"

78

79 -#: archive.c:429 builtin/log.c:1229

79 +#: archive.c:430 builtin/log.c:1228

80 msgid "prefix"

81 msgstr "prefix"

82

83 -#: archive.c:430

83 +#: archive.c:431

84 msgid "prepend prefix to each pathname in the archive"

85 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"

86

87 -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517

87 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536

88 #: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989

89 -#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446

89 +#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446

90 #: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558

91 #: builtin/read-tree.c:109 parse-options.h:153

92 msgid "file"

93 msgstr "fitxer"

94

95 -#: archive.c:432 builtin/archive.c:89

95 +#: archive.c:433 builtin/archive.c:89

96 msgid "write the archive to this file"

97 msgstr "escriu l'arxiu a aquest fitxer"

98

99 -#: archive.c:434

99 +#: archive.c:435

100 msgid "read .gitattributes in working directory"

101 msgstr "llegeix .gitattributes en el directori de treball"

102

103 -#: archive.c:435

103 +#: archive.c:436

104 msgid "report archived files on stderr"

105 msgstr "informa de fitxers arxivats en stderr"

106

107 -#: archive.c:436

107 +#: archive.c:437

108 msgid "store only"

109 msgstr "només emmagatzema"

110

111 -#: archive.c:437

111 +#: archive.c:438

112 msgid "compress faster"

113 -msgstr "comprimeix més ràpid"

113 +msgstr "comprimeix més ràpidament"

114

115 -#: archive.c:445

115 +#: archive.c:446

116 msgid "compress better"

117 msgstr "comprimeix millor"

118

119 -#: archive.c:448

119 +#: archive.c:449

120 msgid "list supported archive formats"

121 msgstr "allista els formats d'arxiu admesos"

122

123 -#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

123 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

124 msgid "repo"

125 msgstr "dipòsit"

126

127 -#: archive.c:451 builtin/archive.c:91

127 +#: archive.c:452 builtin/archive.c:91

128 msgid "retrieve the archive from remote repository <repo>"

129 msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"

130

131 -#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

131 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

132 msgid "command"

133 msgstr "ordre"

134

135 -#: archive.c:453 builtin/archive.c:93

135 +#: archive.c:454 builtin/archive.c:93

136 msgid "path to the remote git-upload-archive command"

137 -msgstr "camí a l'ordre git-upload-archive remot"

137 +msgstr "camí a l'ordre git-upload-archive remota"

138

139 #: attr.c:265

140 msgid ""

@@ -144,90 +144,90 @@ msgstr ""

144 "Els patrons negatius s'ignoren en els atributs de git\n"

145 "Useu '\\!' per exclamació capdavantera literal."

146

147 -#: branch.c:60

147 +#: branch.c:61

148 #, c-format

149 msgid "Not setting branch %s as its own upstream."

150 msgstr "No establint la branca %s com a la seva pròpia font."

151

152 -#: branch.c:83

152 +#: branch.c:84

153 #, c-format

154 msgid "Branch %s set up to track remote branch %s from %s by rebasing."

155 msgstr ""

156 "La branca %s està configurada per a seguir la branca remota %s de %s per "

157 "rebasar."

158

159 -#: branch.c:84

159 +#: branch.c:85

160 #, c-format

161 msgid "Branch %s set up to track remote branch %s from %s."

162 msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."

163

164 -#: branch.c:88

164 +#: branch.c:89

165 #, c-format

166 msgid "Branch %s set up to track local branch %s by rebasing."

167 msgstr ""

168 "La branca %s està configurada per a seguir la branca local %s per rebasar."

169

170 -#: branch.c:89

170 +#: branch.c:90

171 #, c-format

172 msgid "Branch %s set up to track local branch %s."

173 msgstr "La branca %s està configurada per a seguir la branca local %s."

174

175 -#: branch.c:94

175 +#: branch.c:95

176 #, c-format

177 msgid "Branch %s set up to track remote ref %s by rebasing."

178 msgstr ""

179 "La branca %s està configurada per a seguir la referència remota %s per "

180 "rebasar."

181

182 -#: branch.c:95

182 +#: branch.c:96

183 #, c-format

184 msgid "Branch %s set up to track remote ref %s."

185 msgstr "La branca %s està configurada per a seguir la referència remota %s."

186

187 -#: branch.c:99

187 +#: branch.c:100

188 #, c-format

189 msgid "Branch %s set up to track local ref %s by rebasing."

190 msgstr ""

191 "La branca %s està configurada per a seguir la referència local %s per "

192 "rebasar."

193

194 -#: branch.c:100

194 +#: branch.c:101

195 #, c-format

196 msgid "Branch %s set up to track local ref %s."

197 msgstr "La branca %s està configurada per a seguir la referència local %s."

198

199 -#: branch.c:133

199 +#: branch.c:134

200 #, c-format

201 msgid "Not tracking: ambiguous information for ref %s"

202 msgstr "No seguint: informació ambigua per a la referència %s"

203

204 -#: branch.c:162

204 +#: branch.c:163

205 #, c-format

206 msgid "'%s' is not a valid branch name."

207 msgstr "'%s' no és un nom de branca vàlid."

208

209 -#: branch.c:167

209 +#: branch.c:168

210 #, c-format

211 msgid "A branch named '%s' already exists."

212 msgstr "Una branca amb nom '%s' ja existeix."

213

214 -#: branch.c:175

214 +#: branch.c:176

215 msgid "Cannot force update the current branch."

216 msgstr "No es pot actualitzar la branca actual a la força."

217

218 -#: branch.c:195

218 +#: branch.c:196

219 #, c-format

220 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

221 msgstr ""

222 "No es pot configurar la informació de seguiment; el punt inicial '%s' no és "

223 "una branca."

224

225 -#: branch.c:197

225 +#: branch.c:198

226 #, c-format

227 msgid "the requested upstream branch '%s' does not exist"

228 msgstr "la branca font demanada '%s' no existeix"

229

230 -#: branch.c:199

230 +#: branch.c:200

231 msgid ""

232 "\n"

233 "If you are planning on basing your work on an upstream\n"

@@ -248,22 +248,22 @@ msgstr ""

248 "\"git push -u\" per a establir la configuració font\n"

249 "mentre pugeu."

250

251 -#: branch.c:243

251 +#: branch.c:244

252 #, c-format

253 msgid "Not a valid object name: '%s'."

254 msgstr "No és un nom d'objecte vàlid: '%s'."

255

256 -#: branch.c:263

256 +#: branch.c:264

257 #, c-format

258 msgid "Ambiguous object name: '%s'."

259 msgstr "Nom d'objecte ambigu: '%s'."

260

261 -#: branch.c:268

261 +#: branch.c:269

262 #, c-format

263 msgid "Not a valid branch point: '%s'."

264 msgstr "No és un punt de ramificació vàlid: '%s'."

265

266 -#: branch.c:399

266 +#: branch.c:322

267 #, c-format

268 msgid "'%s' is already checked out at '%s'"

269 msgstr "'%s' ja s'ha agafat a '%s'"

@@ -278,7 +278,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2"

278 msgid "unrecognized header: %s%s (%d)"

279 msgstr "capçalera no reconeguda: %s%s (%d)"

280

281 -#: bundle.c:87 builtin/commit.c:765

281 +#: bundle.c:87 builtin/commit.c:766

282 #, c-format

283 msgid "could not open '%s'"

284 msgstr "no s'ha pogut obrir '%s'"

@@ -287,9 +287,9 @@ msgstr "no s'ha pogut obrir '%s'"

287 msgid "Repository lacks these prerequisite commits:"

288 msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"

289

290 -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

291 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

292 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

290 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

291 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

292 +#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358

293 #: builtin/shortlog.c:158

294 msgid "revision walk setup failed"

295 msgstr "la configuració del passeig per revisions ha fallat"

@@ -329,7 +329,7 @@ msgstr "El rev-list s'ha mort"

329 msgid "ref '%s' is excluded by the rev-list options"

330 msgstr "les opcions de la llista de revisions exclouen la referència '%s'"

331

332 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

332 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

333 #, c-format

334 msgid "unrecognized argument: %s"

335 msgstr "paràmetre no reconegut: %s"

@@ -347,13 +347,13 @@ msgstr "no es pot crear '%s'"

347 msgid "index-pack died"

348 msgstr "L'index-pack s'ha mort"

349

350 -#: color.c:260

350 +#: color.c:275

351 #, c-format

352 msgid "invalid color value: %.*s"

353 msgstr "valor de color no vàlid: %.*s"

354

355 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

356 -#: builtin/am.c:2128

355 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

356 +#: builtin/am.c:2149

357 #, c-format

358 msgid "could not parse %s"

359 msgstr "no s'ha pogut analitzar %s"

@@ -511,23 +511,23 @@ msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"

511 msgid "Performing inexact rename detection"

512 msgstr "Realitzant detecció inexacta de canvis de nom"

513

514 -#: diff.c:116

514 +#: diff.c:115

515 #, c-format

516 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

517 msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"

518

519 -#: diff.c:121

519 +#: diff.c:120

520 #, c-format

521 msgid " Unknown dirstat parameter '%s'\n"

522 msgstr " Paràmetre de dirstat desconegut '%s'\n"

523

524 -#: diff.c:216

524 +#: diff.c:215

525 #, c-format

526 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

527 msgstr ""

528 "Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"

529

530 -#: diff.c:268

530 +#: diff.c:267

531 #, c-format

532 msgid ""

533 "Found errors in 'diff.dirstat' config variable:\n"

@@ -536,16 +536,16 @@ msgstr ""

536 "Errors trobats en la variable de configuració 'diff.dirstat':\n"

537 "%s"

538

539 -#: diff.c:2998

539 +#: diff.c:3000

540 #, c-format

541 msgid "external diff died, stopping at %s"

542 msgstr "El diff external s'ha mort, aturant a %s"

543

544 -#: diff.c:3394

544 +#: diff.c:3396

545 msgid "--follow requires exactly one pathspec"

546 msgstr "--follow requereix exactament una especificació de camí"

547

548 -#: diff.c:3557

548 +#: diff.c:3559

549 #, c-format

550 msgid ""

551 "Failed to parse --dirstat/-X option parameter:\n"

@@ -554,16 +554,16 @@ msgstr ""

554 "S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"

555 "%s"

556

557 -#: diff.c:3571

557 +#: diff.c:3573

558 #, c-format

559 msgid "Failed to parse --submodule option parameter: '%s'"

560 msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"

561

562 -#: dir.c:1853

562 +#: dir.c:1915

563 msgid "failed to get kernel name and information"

564 msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"

565

566 -#: dir.c:1936

566 +#: dir.c:1998

567 msgid "Untracked cache is disabled on this system."

568 msgstr "La memòria cau no seguida està deshabilitada en aquest sistema."

569

@@ -615,7 +615,7 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"

615

616 #: help.c:246

617 msgid "These are common Git commands used in various situations:"

618 -msgstr "Aquests són ordres del Git comunament usats en diverses situacions:"

618 +msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"

619

620 #: help.c:311

621 #, c-format

@@ -623,7 +623,7 @@ msgid ""

623 "'%s' appears to be a git command, but we were not\n"

624 "able to execute it. Maybe git-%s is broken?"

625 msgstr ""

626 -"'%s' sembla una ordre git, però no hem pogut\n"

626 +"'%s' sembla una ordre de git, però no hem pogut\n"

627 "executar-la. Pot ser que git-%s estigui estropejat?"

628

629 #: help.c:368

@@ -672,8 +672,8 @@ msgstr "%s: %s - %s"

672 msgid "failed to read the cache"

673 msgstr "s'ha fallat en llegir la memòria cau"

674

675 -#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

676 -#: builtin/checkout.c:586 builtin/clone.c:715

675 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

676 +#: builtin/checkout.c:587 builtin/clone.c:722

677 msgid "unable to write new index file"

678 msgstr "no s'ha pogut escriure un fitxer d'índex nou"

679

@@ -691,64 +691,64 @@ msgstr "addinfo_cache ha fallat per al camí '%s'"

691 msgid "error building trees"

692 msgstr "error en construir arbres"

693

694 -#: merge-recursive.c:687

694 +#: merge-recursive.c:686

695 #, c-format

696 msgid "failed to create path '%s'%s"

697 msgstr "s'ha fallat en crear el camí '%s' %s"

698

699 -#: merge-recursive.c:698

699 +#: merge-recursive.c:697

700 #, c-format

701 msgid "Removing %s to make room for subdirectory\n"

702 msgstr "Eliminant %s per a fer espai per al subdirectori\n"

703

704 -#: merge-recursive.c:712 merge-recursive.c:733

704 +#: merge-recursive.c:711 merge-recursive.c:732

705 msgid ": perhaps a D/F conflict?"

706 msgstr ": potser un conflicte D/F?"

707

708 -#: merge-recursive.c:723

708 +#: merge-recursive.c:722

709 #, c-format

710 msgid "refusing to lose untracked file at '%s'"

711 msgstr "refusant perdre el fitxer no seguit a '%s'"

712

713 -#: merge-recursive.c:763

713 +#: merge-recursive.c:762

714 #, c-format

715 msgid "cannot read object %s '%s'"

716 msgstr "no es pot llegir l'objecte %s '%s'"

717

718 -#: merge-recursive.c:765

718 +#: merge-recursive.c:764

719 #, c-format

720 msgid "blob expected for %s '%s'"

721 msgstr "blob esperat per a %s '%s'"

722

723 -#: merge-recursive.c:788 builtin/clone.c:364

723 +#: merge-recursive.c:787 builtin/clone.c:369

724 #, c-format

725 msgid "failed to open '%s'"

726 msgstr "s'ha fallat en obrir '%s'"

727

728 -#: merge-recursive.c:796

728 +#: merge-recursive.c:795

729 #, c-format

730 msgid "failed to symlink '%s'"

731 msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'"

732

733 -#: merge-recursive.c:799

733 +#: merge-recursive.c:798

734 #, c-format

735 msgid "do not know what to do with %06o %s '%s'"

736 msgstr "no se sap què fer amb %06o %s '%s'"

737

738 -#: merge-recursive.c:937

738 +#: merge-recursive.c:936

739 msgid "Failed to execute internal merge"

740 msgstr "S'ha fallat en executar la fusió interna"

741

742 -#: merge-recursive.c:941

742 +#: merge-recursive.c:940

743 #, c-format

744 msgid "Unable to add %s to database"

745 msgstr "no s'ha pogut afegir %s a la base de dades"

746

747 -#: merge-recursive.c:957

747 +#: merge-recursive.c:956

748 msgid "unsupported object type in the tree"

749 msgstr "tipus d'objecte no compatible en l'arbre"

750

751 -#: merge-recursive.c:1032 merge-recursive.c:1046

751 +#: merge-recursive.c:1031 merge-recursive.c:1045

752 #, c-format

753 msgid ""

754 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -757,7 +757,7 @@ msgstr ""

757 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "

758 "s'ha deixat en l'arbre."

759

760 -#: merge-recursive.c:1038 merge-recursive.c:1051

760 +#: merge-recursive.c:1037 merge-recursive.c:1050

761 #, c-format

762 msgid ""

763 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -766,20 +766,20 @@ msgstr ""

766 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "

767 "s'ha deixat en l'arbre a %s."

768

769 -#: merge-recursive.c:1092

769 +#: merge-recursive.c:1091

770 msgid "rename"

771 msgstr "canvia de nom"

772

773 -#: merge-recursive.c:1092

773 +#: merge-recursive.c:1091

774 msgid "renamed"

775 msgstr "canviat de nom"

776

777 -#: merge-recursive.c:1148

777 +#: merge-recursive.c:1147

778 #, c-format

779 msgid "%s is a directory in %s adding as %s instead"

780 msgstr "%s és un directori en %s; afegint com a %s en lloc"

781

782 -#: merge-recursive.c:1170

782 +#: merge-recursive.c:1169

783 #, c-format

784 msgid ""

785 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -788,147 +788,147 @@ msgstr ""

788 "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "

789 "branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"

790

791 -#: merge-recursive.c:1175

791 +#: merge-recursive.c:1174

792 msgid " (left unresolved)"

793 msgstr " (deixat sense resolució)"

794

795 -#: merge-recursive.c:1229

795 +#: merge-recursive.c:1228

796 #, c-format

797 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

798 msgstr ""

799 "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "

800 "nom %s->%s en %s"

801

802 -#: merge-recursive.c:1259

802 +#: merge-recursive.c:1258

803 #, c-format

804 msgid "Renaming %s to %s and %s to %s instead"

805 msgstr "Canviant el nom de %s a %s i %s a %s en lloc d'això"

806

807 -#: merge-recursive.c:1458

807 +#: merge-recursive.c:1457

808 #, c-format

809 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

810 msgstr ""

811 "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "

812 "%s"

813

814 -#: merge-recursive.c:1468

814 +#: merge-recursive.c:1467

815 #, c-format

816 msgid "Adding merged %s"

817 msgstr "Afegint %s fusionat"

818

819 -#: merge-recursive.c:1473 merge-recursive.c:1671

819 +#: merge-recursive.c:1472 merge-recursive.c:1674

820 #, c-format

821 msgid "Adding as %s instead"

822 msgstr "Afegint com a %s en lloc d'això"

823

824 -#: merge-recursive.c:1524

824 +#: merge-recursive.c:1523

825 #, c-format

826 msgid "cannot read object %s"

827 msgstr "no es pot llegir l'objecte %s"

828

829 -#: merge-recursive.c:1527

829 +#: merge-recursive.c:1526

830 #, c-format

831 msgid "object %s is not a blob"

832 msgstr "L'objecte %s no és un blob"

833

834 -#: merge-recursive.c:1575

834 +#: merge-recursive.c:1578

835 msgid "modify"

836 msgstr "modifica"

837

838 -#: merge-recursive.c:1575

838 +#: merge-recursive.c:1578

839 msgid "modified"

840 msgstr "modificat"

841

842 -#: merge-recursive.c:1585

842 +#: merge-recursive.c:1588

843 msgid "content"

844 msgstr "contingut"

845

846 -#: merge-recursive.c:1592

846 +#: merge-recursive.c:1595

847 msgid "add/add"

848 msgstr "afegiment/afegiment"

849

850 -#: merge-recursive.c:1626

850 +#: merge-recursive.c:1629

851 #, c-format

852 msgid "Skipped %s (merged same as existing)"

853 msgstr "%s saltat (el fusionat és igual a l'existent)"

854

855 -#: merge-recursive.c:1640

855 +#: merge-recursive.c:1643

856 #, c-format

857 msgid "Auto-merging %s"

858 msgstr "Autofusionant %s"

859

860 -#: merge-recursive.c:1644 git-submodule.sh:1150

860 +#: merge-recursive.c:1647 git-submodule.sh:1025

861 msgid "submodule"

862 msgstr "submòdul"

863

864 -#: merge-recursive.c:1645

864 +#: merge-recursive.c:1648

865 #, c-format

866 msgid "CONFLICT (%s): Merge conflict in %s"

867 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"

868

869 -#: merge-recursive.c:1731

869 +#: merge-recursive.c:1734

870 #, c-format

871 msgid "Removing %s"

872 msgstr "Eliminant %s"

873

874 -#: merge-recursive.c:1756

874 +#: merge-recursive.c:1759

875 msgid "file/directory"

876 msgstr "fitxer/directori"

877

878 -#: merge-recursive.c:1762

878 +#: merge-recursive.c:1765

879 msgid "directory/file"

880 msgstr "directori/fitxer"

881

882 -#: merge-recursive.c:1767

882 +#: merge-recursive.c:1770

883 #, c-format

884 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

885 msgstr ""

886 "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. Afegint %s com a %s"

887

888 -#: merge-recursive.c:1777

888 +#: merge-recursive.c:1780

889 #, c-format

890 msgid "Adding %s"

891 msgstr "Afegint %s"

892

893 -#: merge-recursive.c:1794

893 +#: merge-recursive.c:1797

894 msgid "Fatal merge failure, shouldn't happen."

895 msgstr "Fallat de fusió fatal; això no ha de passar."

896

897 -#: merge-recursive.c:1813

897 +#: merge-recursive.c:1816

898 msgid "Already up-to-date!"

899 msgstr "Ja al dia!"

900

901 -#: merge-recursive.c:1822

901 +#: merge-recursive.c:1825

902 #, c-format

903 msgid "merging of trees %s and %s failed"

904 msgstr "la fusió dels arbres %s i %s ha fallat"

905

906 -#: merge-recursive.c:1852

906 +#: merge-recursive.c:1855

907 #, c-format

908 msgid "Unprocessed path??? %s"

909 msgstr "Camí no processat??? %s"

910

911 -#: merge-recursive.c:1900

911 +#: merge-recursive.c:1903

912 msgid "Merging:"

913 msgstr "Fusionant:"

914

915 -#: merge-recursive.c:1913

915 +#: merge-recursive.c:1916

916 #, c-format

917 msgid "found %u common ancestor:"

918 msgid_plural "found %u common ancestors:"

919 msgstr[0] "s'ha trobat %u avantpassat:"

920 msgstr[1] "s'han trobat %u avantpassats:"

921

922 -#: merge-recursive.c:1950

922 +#: merge-recursive.c:1953

923 msgid "merge returned no commit"

924 msgstr "la fusió no ha retornat cap comissió"

925

926 -#: merge-recursive.c:2007

926 +#: merge-recursive.c:2010

927 #, c-format

928 msgid "Could not parse object '%s'"

929 msgstr "No s'ha pogut analitzar l'objecte '%s'"

930

931 -#: merge-recursive.c:2018 builtin/merge.c:645

931 +#: merge-recursive.c:2021 builtin/merge.c:645

932 msgid "Unable to write index."

933 msgstr "No s'ha pogut escriure l'índex."

934

@@ -958,31 +958,41 @@ msgstr "Valor dolent de %s: '%s'"

958 msgid "unable to parse object: %s"

959 msgstr "no s'ha pogut analitzar l'objecte: %s"

960

961 -#: parse-options.c:563

961 +#: parse-options.c:570

962 msgid "..."

963 msgstr "..."

964

965 -#: parse-options.c:581

965 +#: parse-options.c:588

966 #, c-format

967 msgid "usage: %s"

968 msgstr "ús: %s"

969

970 #. TRANSLATORS: the colon here should align with the

971 #. one in "usage: %s" translation

972 -#: parse-options.c:585

972 +#: parse-options.c:592

973 #, c-format

974 msgid " or: %s"

975 msgstr " o: %s"

976

977 -#: parse-options.c:588

977 +#: parse-options.c:595

978 #, c-format

979 msgid " %s"

980 msgstr " %s"

981

982 -#: parse-options.c:622

982 +#: parse-options.c:629

983 msgid "-NUM"

984 msgstr "-NUM"

985

986 +#: parse-options-cb.c:108

987 +#, c-format

988 +msgid "malformed object name '%s'"

989 +msgstr "nom d'objecte mal format '%s'"

990 +

991 +#: path.c:752

992 +#, c-format

993 +msgid "Could not make %s writable by group"

994 +msgstr "No s'ha pogut fer %s escrivible pel grup"

995 +

996 #: pathspec.c:133

997 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

998 msgstr ""

@@ -1054,11 +1064,11 @@ msgstr ""

1064 msgid "unable to parse --pretty format"

1065 msgstr "no s'ha pogut analitzar el format --pretty"

1066

1057 -#: progress.c:236

1067 +#: progress.c:235

1068 msgid "done"

1069 msgstr "fet"

1070

1061 -#: read-cache.c:1296

1071 +#: read-cache.c:1281

1072 #, c-format

1073 msgid ""

1074 "index.version set, but the value is invalid.\n"

@@ -1067,7 +1077,7 @@ msgstr ""

1077 "index.version establert, però el valor no és vàlid.\n"

1078 "Usant la versió %i"

1079

1070 -#: read-cache.c:1306

1080 +#: read-cache.c:1291

1081 #, c-format

1082 msgid ""

1083 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -1076,119 +1086,164 @@ msgstr ""

1086 "GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"

1087 "Usant la versió %i"

1088

1079 -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1089 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1090 #: builtin/merge.c:983

1091 #, c-format

1092 msgid "Could not open '%s' for writing"

1093 msgstr "No s'ha pogut obrir '%s' per a escriptura"

1094

1085 -#: refs.c:3001

1095 +#: refs/files-backend.c:2359

1096 #, c-format

1097 msgid "could not delete reference %s: %s"

1098 msgstr "no s'ha pogut suprimir la referència %s: %s"

1099

1090 -#: refs.c:3004

1100 +#: refs/files-backend.c:2362

1101 #, c-format

1102 msgid "could not delete references: %s"

1103 msgstr "no s'ha pogut suprimir les referències: %s"

1104

1095 -#: refs.c:3013

1105 +#: refs/files-backend.c:2371

1106 #, c-format

1107 msgid "could not remove reference %s"

1108 msgstr "no s'ha pogut eliminar la referència %s"

1109

1100 -#: ref-filter.c:660

1110 +#: ref-filter.c:245

1111 +#, c-format

1112 +msgid "format: %%(end) atom used without corresponding atom"

1113 +msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"

1114 +

1115 +#: ref-filter.c:704

1116 +#, c-format

1117 +msgid "positive value expected contents:lines=%s"

1118 +msgstr "valor positiu esperat contents:lines=%s"

1119 +

1120 +#: ref-filter.c:833

1121 +#, c-format

1122 +msgid "expected format: %%(color:<color>)"

1123 +msgstr "format esperat: %%(color:<color>)"

1124 +

1125 +#: ref-filter.c:835

1126 msgid "unable to parse format"

1127 msgstr "no s'ha pogut analitzar el format"

1128

1104 -#: remote.c:792

1129 +#: ref-filter.c:870

1130 +#, c-format

1131 +msgid "expected format: %%(align:<width>,<position>)"

1132 +msgstr "format esperat: %%(align:<amplada>,<posició>)"

1133 +

1134 +#: ref-filter.c:893

1135 +#, c-format

1136 +msgid "improper format entered align:%s"

1137 +msgstr "format impropi introduït align:%s"

1138 +

1139 +#: ref-filter.c:898

1140 +#, c-format

1141 +msgid "positive width expected with the %%(align) atom"

1142 +msgstr "amplada positiva esperada amb l'àtom %%(align)"

1143 +

1144 +#: ref-filter.c:1219

1145 +#, c-format

1146 +msgid "malformed object at '%s'"

1147 +msgstr "objecte mal format a '%s'"

1148 +

1149 +#: ref-filter.c:1561

1150 +#, c-format

1151 +msgid "format: %%(end) atom missing"

1152 +msgstr "format: manca l'àtom %%(end)"

1153 +

1154 +#: ref-filter.c:1615

1155 +#, c-format

1156 +msgid "malformed object name %s"

1157 +msgstr "nom d'objecte %s mal format"

1158 +

1159 +#: remote.c:756

1160 #, c-format

1161 msgid "Cannot fetch both %s and %s to %s"

1162 msgstr "No es pot obtenir ambdós %s i %s a %s"

1163

1109 -#: remote.c:796

1164 +#: remote.c:760

1165 #, c-format

1166 msgid "%s usually tracks %s, not %s"

1167 msgstr "%s generalment segueix %s, no %s"

1168

1114 -#: remote.c:800

1169 +#: remote.c:764

1170 #, c-format

1171 msgid "%s tracks both %s and %s"

1172 msgstr "%s segueix ambdós %s i %s"

1173

1119 -#: remote.c:808

1174 +#: remote.c:772

1175 msgid "Internal error"

1176 msgstr "Error intern"

1177

1123 -#: remote.c:1723 remote.c:1766

1178 +#: remote.c:1687 remote.c:1730

1179 msgid "HEAD does not point to a branch"

1180 msgstr "HEAD no assenyala cap branca"

1181

1127 -#: remote.c:1732

1182 +#: remote.c:1696

1183 #, c-format

1184 msgid "no such branch: '%s'"

1185 msgstr "no hi ha tal branca: '%s'"

1186

1132 -#: remote.c:1735

1187 +#: remote.c:1699

1188 #, c-format

1189 msgid "no upstream configured for branch '%s'"

1190 msgstr "cap font configurada per a la branca '%s'"

1191

1137 -#: remote.c:1741

1192 +#: remote.c:1705

1193 #, c-format

1194 msgid "upstream branch '%s' not stored as a remote-tracking branch"

1195 msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot"

1196

1142 -#: remote.c:1756

1197 +#: remote.c:1720

1198 #, c-format

1199 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1200 msgstr ""

1201 "el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local"

1202

1148 -#: remote.c:1771

1203 +#: remote.c:1735

1204 #, c-format

1205 msgid "branch '%s' has no remote for pushing"

1206 msgstr "la branca '%s' no té cap remot al qual pujar"

1207

1153 -#: remote.c:1782

1208 +#: remote.c:1746

1209 #, c-format

1210 msgid "push refspecs for '%s' do not include '%s'"

1211 msgstr "les especificacions de referència de '%s' no inclouen '%s'"

1212

1158 -#: remote.c:1795

1213 +#: remote.c:1759

1214 msgid "push has no destination (push.default is 'nothing')"

1215 msgstr "push no té destí (push.default és 'nothing')"

1216

1162 -#: remote.c:1817

1217 +#: remote.c:1781

1218 msgid "cannot resolve 'simple' push to a single destination"

1219 msgstr "no es pot resoldre una pujada 'simple' a un sol destí"

1220

1166 -#: remote.c:2124

1221 +#: remote.c:2083

1222 #, c-format

1223 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1224 msgstr "La vostra branca està basada en '%s', però la font no hi és.\n"

1225

1171 -#: remote.c:2128

1226 +#: remote.c:2087

1227 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1228 msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"

1229

1175 -#: remote.c:2131

1230 +#: remote.c:2090

1231 #, c-format

1232 msgid "Your branch is up-to-date with '%s'.\n"

1233 msgstr "La vostra branca està al dia amb '%s'.\n"

1234

1180 -#: remote.c:2135

1235 +#: remote.c:2094

1236 #, c-format

1237 msgid "Your branch is ahead of '%s' by %d commit.\n"

1238 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1239 msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n"

1240 msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"

1241

1187 -#: remote.c:2141

1242 +#: remote.c:2100

1243 msgid " (use \"git push\" to publish your local commits)\n"

1244 msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"

1245

1191 -#: remote.c:2144

1246 +#: remote.c:2103

1247 #, c-format

1248 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1249 msgid_plural ""

@@ -1200,11 +1255,11 @@ msgstr[1] ""

1255 "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "

1256 "ràpidament.\n"

1257

1203 -#: remote.c:2152

1258 +#: remote.c:2111

1259 msgid " (use \"git pull\" to update your local branch)\n"

1260 msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"

1261

1207 -#: remote.c:2155

1262 +#: remote.c:2114

1263 #, c-format

1264 msgid ""

1265 "Your branch and '%s' have diverged,\n"

@@ -1219,28 +1274,28 @@ msgstr[1] ""

1274 "La vostra branca i '%s' s'han divergit,\n"

1275 "i tenen %d i %d comissions distintes cada una, respectivament.\n"

1276

1222 -#: remote.c:2165

1277 +#: remote.c:2124

1278 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1279 msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"

1280

1226 -#: revision.c:2198

1281 +#: revision.c:2191

1282 msgid "your current branch appears to be broken"

1283 msgstr "la vostra branca actual sembla trencada"

1284

1230 -#: revision.c:2201

1285 +#: revision.c:2194

1286 #, c-format

1287 msgid "your current branch '%s' does not have any commits yet"

1288 msgstr "la vostra branca actual '%s' encara no té cap comissió"

1289

1235 -#: revision.c:2395

1290 +#: revision.c:2388

1291 msgid "--first-parent is incompatible with --bisect"

1292 msgstr "--first-parent és incompatible amb --bisect"

1293

1239 -#: run-command.c:83

1294 +#: run-command.c:90

1295 msgid "open /dev/null failed"

1296 msgstr "s'ha fallat en obrir /dev/null"

1297

1243 -#: run-command.c:85

1298 +#: run-command.c:92

1299 #, c-format

1300 msgid "dup2(%d,%d) failed"

1301 msgstr "dup2(%d,%d) ha fallat"

@@ -1459,7 +1514,7 @@ msgstr "no es pot resoldre HEAD"

1514 msgid "cannot abort from a branch yet to be born"

1515 msgstr "no es pot avortar des d'una branca que encara ha de nàixer"

1516

1462 -#: sequencer.c:887 builtin/apply.c:4291

1517 +#: sequencer.c:887 builtin/apply.c:4287

1518 #, c-format

1519 msgid "cannot open %s: %s"

1520 msgstr "no es pot obrir %s: %s"

@@ -1501,12 +1556,12 @@ msgstr "No es pot revertir com a comissió inicial"

1556 msgid "Can't cherry-pick into empty head"

1557 msgstr "No es pot recollir cireres en un cap buit"

1558

1504 -#: setup.c:243

1559 +#: setup.c:248

1560 #, c-format

1561 msgid "failed to read %s"

1562 msgstr "s'ha fallat en llegir %s"

1563

1509 -#: sha1_name.c:453

1564 +#: sha1_name.c:463

1565 msgid ""

1566 "Git normally never creates a ref that ends with 40 hex characters\n"

1567 "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"

1610 msgid "staging updated .gitmodules failed"

1611 msgstr "L'allistament del .gitmodules actualitzat ha fallat"

1612

1558 -#: submodule.c:1045

1613 +#: submodule.c:1040

1614 #, c-format

1615 msgid "Could not set core.worktree in %s"

1616 msgstr "No s'ha pogut establir core.worktree en %s"

@@ -1566,7 +1621,7 @@ msgstr "No s'ha pogut establir core.worktree en %s"

1621 msgid "unknown value '%s' for key '%s'"

1622 msgstr "valor desconegut '%s' per a la clau '%s'"

1623

1569 -#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1624 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1625 #, c-format

1626 msgid "more than one %s"

1627 msgstr "més d'un %s"

@@ -1633,8 +1688,8 @@ msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"

1688 msgid "could not open '%s' for writing"

1689 msgstr "no s'ha pogut obrir '%s' per a escriptura"

1690

1636 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1637 -#: builtin/merge.c:1076 builtin/pull.c:380

1691 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1692 +#: builtin/merge.c:1074 builtin/pull.c:380

1693 #, c-format

1694 msgid "could not open '%s' for reading"

1695 msgstr "no s'ha pogut obrir '%s' per a lectura"

@@ -1662,17 +1717,17 @@ msgstr "no hi ha tal usuari"

1717 msgid "unable to get current working directory"

1718 msgstr "no s'ha pogut obtenir el directori de treball actual"

1719

1665 -#: wrapper.c:631

1720 +#: wrapper.c:647

1721 #, c-format

1722 msgid "could not open %s for writing"

1723 msgstr "no s'ha pogut obrir '%s' per a escriptura"

1724

1670 -#: wrapper.c:642 builtin/am.c:424

1725 +#: wrapper.c:658 builtin/am.c:425

1726 #, c-format

1727 msgid "could not write to %s"

1728 msgstr "no s'ha pogut escriure a %s"

1729

1675 -#: wrapper.c:648

1730 +#: wrapper.c:664

1731 #, c-format

1732 msgid "could not close %s"

1733 msgstr "no s'ha pogut tancar %s"

@@ -1879,8 +1934,8 @@ msgstr "No s'ha fet cap ordre."

1934 #, c-format

1935 msgid "Last command done (%d command done):"

1936 msgid_plural "Last commands done (%d commands done):"

1882 -msgstr[0] "Últim ordre fet (%d ordre fet):"

1883 -msgstr[1] "Últims ordres fets (%d ordres fets):"

1937 +msgstr[0] "Última ordre fet (%d ordre feta):"

1938 +msgstr[1] "Últimes ordres fetes (%d ordres fetes):"

1939

1940 #: wt-status.c:1119

1941 #, c-format

@@ -2018,27 +2073,27 @@ msgstr "Actualment esteu bisecant."

2073 msgid " (use \"git bisect reset\" to get back to the original branch)"

2074 msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"

2075

2021 -#: wt-status.c:1437

2076 +#: wt-status.c:1438

2077 msgid "On branch "

2078 msgstr "En la branca "

2079

2025 -#: wt-status.c:1445

2080 +#: wt-status.c:1444

2081 msgid "interactive rebase in progress; onto "

2082 msgstr "rebasament interactiu en progrés; sobre "

2083

2029 -#: wt-status.c:1447

2084 +#: wt-status.c:1446

2085 msgid "rebase in progress; onto "

2086 msgstr "rebasament en progrés; sobre "

2087

2033 -#: wt-status.c:1452

2088 +#: wt-status.c:1451

2089 msgid "HEAD detached at "

2090 msgstr "HEAD separat a "

2091

2037 -#: wt-status.c:1454

2092 +#: wt-status.c:1453

2093 msgid "HEAD detached from "

2094 msgstr "HEAD separat de "

2095

2041 -#: wt-status.c:1457

2096 +#: wt-status.c:1456

2097 msgid "Not currently on any branch."

2098 msgstr "Actualment no en cap branca."

2099

@@ -2127,23 +2182,23 @@ msgstr ""

2182 msgid "nothing to commit, working directory clean\n"

2183 msgstr "no hi ha res a cometre, directori de treball net\n"

2184

2130 -#: wt-status.c:1644

2131 -msgid "HEAD (no branch)"

2132 -msgstr "HEAD (sense branca)"

2133 -

2134 -#: wt-status.c:1650

2185 +#: wt-status.c:1642

2186 msgid "Initial commit on "

2187 msgstr "Comissió inicial en "

2188

2138 -#: wt-status.c:1677

2189 +#: wt-status.c:1646

2190 +msgid "HEAD (no branch)"

2191 +msgstr "HEAD (sense branca)"

2192 +

2193 +#: wt-status.c:1675

2194 msgid "gone"

2195 msgstr "no hi és"

2196

2142 -#: wt-status.c:1679 wt-status.c:1687

2197 +#: wt-status.c:1677 wt-status.c:1685

2198 msgid "behind "

2199 msgstr "darrere "

2200

2146 -#: compat/precompose_utf8.c:55 builtin/clone.c:403

2201 +#: compat/precompose_utf8.c:56 builtin/clone.c:408

2202 #, c-format

2203 msgid "failed to unlink '%s'"

2204 msgstr "s'ha fallat en desenllaçar '%s'"

@@ -2157,7 +2212,7 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..."

2212 msgid "unexpected diff status %c"

2213 msgstr "estat de diff inesperat %c"

2214

2160 -#: builtin/add.c:70 builtin/commit.c:277

2215 +#: builtin/add.c:70 builtin/commit.c:278

2216 msgid "updating files failed"

2217 msgstr "s'ha fallat en actualitzar els fitxers"

2218

@@ -2170,7 +2225,7 @@ msgstr "elimina '%s'\n"

2225 msgid "Unstaged changes after refreshing the index:"

2226 msgstr "Canvis no allistats després d'actualitzar l'índex:"

2227

2173 -#: builtin/add.c:194 builtin/rev-parse.c:799

2228 +#: builtin/add.c:194 builtin/rev-parse.c:796

2229 msgid "Could not read the index"

2230 msgstr "No s'ha pogut llegir l'índex"

2231

@@ -2206,15 +2261,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2261 msgstr ""

2262 "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"

2263

2209 -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2264 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2265 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2211 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

2266 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2267 msgid "dry run"

2268 msgstr "marxa en sec"

2269

2215 -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2216 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2217 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

2270 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2271 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2272 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2273 msgid "be verbose"

2274 msgstr "sigues detallat"

2275

@@ -2222,7 +2277,7 @@ msgstr "sigues detallat"

2277 msgid "interactive picking"

2278 msgstr "recull interactiu"

2279

2225 -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2280 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2281 msgid "select hunks interactively"

2282 msgstr "selecciona els trossos interactivament"

2283

@@ -2281,148 +2336,149 @@ msgstr "-A i -u són mutualment incompatibles"

2336 msgid "Option --ignore-missing can only be used together with --dry-run"

2337 msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"

2338

2284 -#: builtin/add.c:358

2339 +#: builtin/add.c:352

2340 #, c-format

2341 msgid "Nothing specified, nothing added.\n"

2342 msgstr "Res especificat, res afegit.\n"

2343

2289 -#: builtin/add.c:359

2344 +#: builtin/add.c:353

2345 #, c-format

2346 msgid "Maybe you wanted to say 'git add .'?\n"

2347 msgstr "Potser volíeu dir 'git add .'?\n"

2348

2294 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2295 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2349 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2350 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2351 +#: builtin/submodule--helper.c:40

2352 msgid "index file corrupt"

2353 msgstr "fitxer d'índex malmès"

2354

2299 -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2355 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2356 msgid "Unable to write new index file"

2357 msgstr "no s'ha pogut escriure un fitxer d'índex nou"

2358

2303 -#: builtin/am.c:41

2359 +#: builtin/am.c:42

2360 #, c-format

2361 msgid "could not stat %s"

2362 msgstr "no s'ha pogut fer stat a '%s'"

2363

2308 -#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079

2364 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2365 #, c-format

2366 msgid "could not read '%s'"

2367 msgstr "no s'ha pogut llegir '%s'"

2368

2313 -#: builtin/am.c:444

2369 +#: builtin/am.c:445

2370 msgid "could not parse author script"

2371 msgstr "no s'ha pogut analitzar l'script d'autor"

2372

2317 -#: builtin/am.c:521

2373 +#: builtin/am.c:522

2374 #, c-format

2375 msgid "'%s' was deleted by the applypatch-msg hook"

2376 msgstr "s'ha suprimit '%s' per el ganxo applypatch-msg"

2377

2322 -#: builtin/am.c:562 builtin/notes.c:300

2378 +#: builtin/am.c:563 builtin/notes.c:300

2379 #, c-format

2380 msgid "Malformed input line: '%s'."

2381 msgstr "Línia d'entrada mal formada: '%s'."

2382

2327 -#: builtin/am.c:599 builtin/notes.c:315

2383 +#: builtin/am.c:600 builtin/notes.c:315

2384 #, c-format

2385 msgid "Failed to copy notes from '%s' to '%s'"

2386 msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"

2387

2332 -#: builtin/am.c:625

2388 +#: builtin/am.c:626

2389 msgid "fseek failed"

2390 msgstr "fseek ha fallat"

2391

2336 -#: builtin/am.c:786 builtin/am.c:874

2392 +#: builtin/am.c:787 builtin/am.c:875

2393 #, c-format

2394 msgid "could not open '%s' for reading: %s"

2395 msgstr "no s'ha pogut obrir '%s' per a lectura: %s"

2396

2341 -#: builtin/am.c:793

2397 +#: builtin/am.c:794

2398 #, c-format

2399 msgid "could not open '%s' for writing: %s"

2400 msgstr "no s'ha pogut obrir '%s' per a escriptura: %s"

2401

2346 -#: builtin/am.c:802

2402 +#: builtin/am.c:803

2403 #, c-format

2404 msgid "could not parse patch '%s'"

2405 msgstr "no s'ha pogut analitzar el pedaç '%s'"

2406

2351 -#: builtin/am.c:867

2407 +#: builtin/am.c:868

2408 msgid "Only one StGIT patch series can be applied at once"

2409 msgstr "només una sèrie de pedaços StGIT es pot aplicar a la vegada"

2410

2355 -#: builtin/am.c:915

2411 +#: builtin/am.c:916

2412 msgid "invalid timestamp"

2413 msgstr "marca de temps no vàlida"

2414

2359 -#: builtin/am.c:918 builtin/am.c:926

2415 +#: builtin/am.c:919 builtin/am.c:927

2416 msgid "invalid Date line"

2417 msgstr "línia Date no vàlida"

2418

2363 -#: builtin/am.c:923

2419 +#: builtin/am.c:924

2420 msgid "invalid timezone offset"

2421 msgstr "desplaçament de zona de temps no vàlid"

2422

2367 -#: builtin/am.c:1010

2423 +#: builtin/am.c:1011

2424 msgid "Patch format detection failed."

2425 msgstr "La detecció de format de pedaç ha fallat."

2426

2371 -#: builtin/am.c:1015 builtin/clone.c:368

2427 +#: builtin/am.c:1016 builtin/clone.c:373

2428 #, c-format

2429 msgid "failed to create directory '%s'"

2430 msgstr "s'ha fallat en crear el directori '%s'"

2431

2376 -#: builtin/am.c:1019

2432 +#: builtin/am.c:1020

2433 msgid "Failed to split patches."

2434 msgstr "S'ha fallat en dividir els pedaços."

2435

2380 -#: builtin/am.c:1151 builtin/commit.c:362

2436 +#: builtin/am.c:1152 builtin/commit.c:363

2437 msgid "unable to write index file"

2438 msgstr "no s'ha pogut escriure el fitxer d'índex"

2439

2384 -#: builtin/am.c:1202

2440 +#: builtin/am.c:1203

2441 #, c-format

2442 msgid "When you have resolved this problem, run \"%s --continue\"."

2443 msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."

2444

2389 -#: builtin/am.c:1203

2445 +#: builtin/am.c:1204

2446 #, c-format

2447 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2448 msgstr "Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc."

2449

2394 -#: builtin/am.c:1204

2450 +#: builtin/am.c:1205

2451 #, c-format

2452 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2453 msgstr ""

2454 "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"

2455 "\"."

2456

2401 -#: builtin/am.c:1339

2457 +#: builtin/am.c:1343

2458 msgid "Patch is empty. Was it split wrong?"

2459 msgstr "El pedaç és buit. S'ha dividit malament?"

2460

2405 -#: builtin/am.c:1413 builtin/log.c:1345

2461 +#: builtin/am.c:1417 builtin/log.c:1344

2462 #, c-format

2463 msgid "invalid ident line: %s"

2464 msgstr "línia d'identitat no vàlida: %s"

2465

2410 -#: builtin/am.c:1440

2466 +#: builtin/am.c:1444

2467 #, c-format

2468 msgid "unable to parse commit %s"

2469 msgstr "no s'ha pogut analitzar la comissió %s"

2470

2415 -#: builtin/am.c:1614

2471 +#: builtin/am.c:1646

2472 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2473 msgstr ""

2474 "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "

2475 "vies."

2476

2421 -#: builtin/am.c:1616

2477 +#: builtin/am.c:1648

2478 msgid "Using index info to reconstruct a base tree..."

2479 msgstr "Usant la informació d'índex per a reconstruir un arbre base..."

2480

2425 -#: builtin/am.c:1635

2481 +#: builtin/am.c:1667

2482 msgid ""

2483 "Did you hand edit your patch?\n"

2484 "It does not apply to blobs recorded in its index."

@@ -2430,38 +2486,38 @@ msgstr ""

2486 "Heu editat el vostre pedaç a mà?\n"

2487 "No s'aplica als blobs recordats en el seu índex."

2488

2433 -#: builtin/am.c:1641

2489 +#: builtin/am.c:1673

2490 msgid "Falling back to patching base and 3-way merge..."

2491 msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..."

2492

2437 -#: builtin/am.c:1666

2493 +#: builtin/am.c:1688

2494 msgid "Failed to merge in the changes."

2495 msgstr "S'ha fallat en fusionar els canvis."

2496

2441 -#: builtin/am.c:1691 builtin/merge.c:632

2497 +#: builtin/am.c:1712 builtin/merge.c:632

2498 msgid "git write-tree failed to write a tree"

2499 msgstr "git write-tree ha fallat en escriure un arbre"

2500

2445 -#: builtin/am.c:1698

2501 +#: builtin/am.c:1719

2502 msgid "applying to an empty history"

2503 msgstr "aplicant a una història buida"

2504

2449 -#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2505 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2506 #: builtin/merge.c:854

2507 msgid "failed to write commit object"

2508 msgstr "s'ha fallat en escriure l'objecte de comissió"

2509

2454 -#: builtin/am.c:1743 builtin/am.c:1747

2510 +#: builtin/am.c:1764 builtin/am.c:1768

2511 #, c-format

2512 msgid "cannot resume: %s does not exist."

2513 msgstr "no es pot reprendre: %s no existeix."

2514

2459 -#: builtin/am.c:1763

2515 +#: builtin/am.c:1784

2516 msgid "cannot be interactive without stdin connected to a terminal."

2517 msgstr ""

2518 "no es pot ser interactiu sense que stdin sigui connectat a un terminal."

2519

2464 -#: builtin/am.c:1768

2520 +#: builtin/am.c:1789

2521 msgid "Commit Body is:"

2522 msgstr "El cos de la comissió és:"

2523

@@ -2469,37 +2525,37 @@ msgstr "El cos de la comissió és:"

2525 #. in your translation. The program will only accept English

2526 #. input at this point.

2527 #.

2472 -#: builtin/am.c:1778

2528 +#: builtin/am.c:1799

2529 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2530 msgstr ""

2531 "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "

2532 "tots: "

2533

2478 -#: builtin/am.c:1828

2534 +#: builtin/am.c:1849

2535 #, c-format

2536 msgid "Dirty index: cannot apply patches (dirty: %s)"

2537 msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)"

2538

2483 -#: builtin/am.c:1863 builtin/am.c:1934

2539 +#: builtin/am.c:1884 builtin/am.c:1955

2540 #, c-format

2541 msgid "Applying: %.*s"

2542 msgstr "Aplicant: %.*s"

2543

2488 -#: builtin/am.c:1879

2544 +#: builtin/am.c:1900

2545 msgid "No changes -- Patch already applied."

2546 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."

2547

2492 -#: builtin/am.c:1887

2548 +#: builtin/am.c:1908

2549 #, c-format

2550 msgid "Patch failed at %s %.*s"

2551 msgstr "El pedaç ha fallat a %s %.*s"

2552

2497 -#: builtin/am.c:1893

2553 +#: builtin/am.c:1914

2554 #, c-format

2555 msgid "The copy of the patch that failed is found in: %s"

2556 msgstr "La còpia del pedaç que ha fallat es troba en: %s"

2557

2502 -#: builtin/am.c:1937

2558 +#: builtin/am.c:1958

2559 msgid ""

2560 "No changes - did you forget to use 'git add'?\n"

2561 "If there is nothing left to stage, chances are that something else\n"

@@ -2509,7 +2565,7 @@ msgstr ""

2565 "Si no hi ha res a allistar, probablement alguna altra cosa\n"

2566 "ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç."

2567

2512 -#: builtin/am.c:1944

2568 +#: builtin/am.c:1965

2569 msgid ""

2570 "You still have unmerged paths in your index.\n"

2571 "Did you forget to use 'git add'?"

@@ -2517,17 +2573,17 @@ msgstr ""

2573 "Encara teniu camins sense fusionar en el vostre índex.\n"

2574 "Heu oblidat d'usar 'git add'?"

2575

2520 -#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2576 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2577 #: builtin/reset.c:316

2578 #, c-format

2579 msgid "Could not parse object '%s'."

2580 msgstr "No s'ha pogut analitzar l'objecte '%s'."

2581

2526 -#: builtin/am.c:2104

2582 +#: builtin/am.c:2125

2583 msgid "failed to clean index"

2584 msgstr "s'ha fallat en netejar l'índex"

2585

2530 -#: builtin/am.c:2138

2586 +#: builtin/am.c:2159

2587 msgid ""

2588 "You seem to have moved HEAD since the last 'am' failure.\n"

2589 "Not rewinding to ORIG_HEAD"

@@ -2535,152 +2591,154 @@ msgstr ""

2591 "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"

2592 "No rebobinant a ORIG_HEAD"

2593

2538 -#: builtin/am.c:2199

2594 +#: builtin/am.c:2220

2595 #, c-format

2596 msgid "Invalid value for --patch-format: %s"

2597 msgstr "Valor no vàlid per a --patch-format: %s"

2598

2543 -#: builtin/am.c:2221

2544 -msgid "git am [options] [(<mbox>|<Maildir>)...]"

2545 -msgstr "git am [opcions] [(<bústia>|<directori-de-correu>)...]"

2599 +#: builtin/am.c:2253

2600 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2601 +msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"

2602

2547 -#: builtin/am.c:2222

2548 -msgid "git am [options] (--continue | --skip | --abort)"

2549 -msgstr "git am [opcions] (--continue | --skip | --abort)"

2603 +#: builtin/am.c:2254

2604 +msgid "git am [<options>] (--continue | --skip | --abort)"

2605 +msgstr "git am [<opcions>] (--continue | --skip | --abort)"

2606

2551 -#: builtin/am.c:2228

2607 +#: builtin/am.c:2260

2608 msgid "run interactively"

2609 msgstr "executa interactivament"

2610

2555 -#: builtin/am.c:2230

2611 +#: builtin/am.c:2262

2612 msgid "historical option -- no-op"

2613 msgstr "opció històrica -- no-op"

2614

2559 -#: builtin/am.c:2232

2615 +#: builtin/am.c:2264

2616 msgid "allow fall back on 3way merging if needed"

2617 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"

2618

2563 -#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

2619 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2620 #: builtin/repack.c:171

2621 msgid "be quiet"

2622 msgstr "calla"

2623

2568 -#: builtin/am.c:2235

2624 +#: builtin/am.c:2267

2625 msgid "add a Signed-off-by line to the commit message"

2626 msgstr "afegeix una línia Signed-off-by al missatge de comissió"

2627

2572 -#: builtin/am.c:2238

2628 +#: builtin/am.c:2270

2629 msgid "recode into utf8 (default)"

2630 msgstr "recodifica en utf8 (per defecte)"

2631

2576 -#: builtin/am.c:2240

2632 +#: builtin/am.c:2272

2633 msgid "pass -k flag to git-mailinfo"

2634 msgstr "passa la bandera -k al git-mailinfo"

2635

2580 -#: builtin/am.c:2242

2636 +#: builtin/am.c:2274

2637 msgid "pass -b flag to git-mailinfo"

2638 msgstr "passa la bandera -b al git-mailinfo"

2639

2584 -#: builtin/am.c:2244

2640 +#: builtin/am.c:2276

2641 msgid "pass -m flag to git-mailinfo"

2642 msgstr "passa la bandera -m al git-mailinfo"

2643

2588 -#: builtin/am.c:2246

2644 +#: builtin/am.c:2278

2645 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2646 msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"

2647

2592 -#: builtin/am.c:2249

2648 +#: builtin/am.c:2281

2649 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2650 msgstr ""

2651 "no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"

2652

2597 -#: builtin/am.c:2252

2653 +#: builtin/am.c:2284

2654 msgid "strip everything before a scissors line"

2655 msgstr "despulla tot abans d'una línia de tissores"

2656

2601 -#: builtin/am.c:2253 builtin/apply.c:4563

2657 +#: builtin/am.c:2285 builtin/apply.c:4554

2658 msgid "action"

2659 msgstr "acció"

2660

2605 -#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2606 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2607 -#: builtin/am.c:2281

2661 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2662 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2663 +#: builtin/am.c:2313

2664 msgid "pass it through git-apply"

2665 msgstr "passa-ho a través del git-apply"

2666

2611 -#: builtin/am.c:2262 builtin/apply.c:4587

2667 +#: builtin/am.c:2294 builtin/apply.c:4578

2668 msgid "root"

2669 msgstr "arrel"

2670

2615 -#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2616 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2617 -#: builtin/pull.c:167

2671 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2672 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2673 +#: builtin/pull.c:167 builtin/submodule--helper.c:78

2674 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2675 msgid "path"

2676 msgstr "camí"

2677

2621 -#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2622 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2623 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2624 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2625 -#: parse-options.h:134 parse-options.h:243

2678 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2679 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2680 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2681 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2682 +#: parse-options.h:134 parse-options.h:244

2683 msgid "n"

2684 msgstr "n"

2685

2629 -#: builtin/am.c:2274 builtin/apply.c:4531

2686 +#: builtin/am.c:2306 builtin/apply.c:4522

2687 msgid "num"

2688 msgstr "número"

2689

2633 -#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

2690 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2691 +#: builtin/tag.c:372

2692 msgid "format"

2693 msgstr "format"

2694

2637 -#: builtin/am.c:2278

2695 +#: builtin/am.c:2310

2696 msgid "format the patch(es) are in"

2697 msgstr "el format en el qual estan els pedaços"

2698

2641 -#: builtin/am.c:2284

2699 +#: builtin/am.c:2316

2700 msgid "override error message when patch failure occurs"

2701 msgstr ""

2702 "passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"

2703

2646 -#: builtin/am.c:2286

2704 +#: builtin/am.c:2318

2705 msgid "continue applying patches after resolving a conflict"

2706 msgstr "segueix aplicant pedaços després de resoldre un conflicte"

2707

2650 -#: builtin/am.c:2289

2708 +#: builtin/am.c:2321

2709 msgid "synonyms for --continue"

2710 msgstr "sinònims de --continue"

2711

2654 -#: builtin/am.c:2292

2712 +#: builtin/am.c:2324

2713 msgid "skip the current patch"

2714 msgstr "salta el pedaç actual"

2715

2658 -#: builtin/am.c:2295

2716 +#: builtin/am.c:2327

2717 msgid "restore the original branch and abort the patching operation."

2718 msgstr "restaura la branca original i avorta l'operació d'apedaçament."

2719

2662 -#: builtin/am.c:2299

2720 +#: builtin/am.c:2331

2721 msgid "lie about committer date"

2722 msgstr "menteix sobre la data del comitent"

2723

2666 -#: builtin/am.c:2301

2724 +#: builtin/am.c:2333

2725 msgid "use current timestamp for author date"

2726 msgstr "usa el marc de temps actual per la data d'autor"

2727

2670 -#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2671 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2728 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2729 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2730 msgid "key-id"

2731 msgstr "ID de clau"

2732

2675 -#: builtin/am.c:2304

2733 +#: builtin/am.c:2336

2734 msgid "GPG-sign commits"

2735 msgstr "firma les comissions amb GPG"

2736

2679 -#: builtin/am.c:2307

2737 +#: builtin/am.c:2339

2738 msgid "(internal use for git-rebase)"

2739 msgstr "(ús intern per al git-rebase)"

2740

2683 -#: builtin/am.c:2322

2741 +#: builtin/am.c:2354

2742 msgid ""

2743 "The -b/--binary option has been a no-op for long time, and\n"

2744 "it will be removed. Please do not use it anymore."

@@ -2688,18 +2746,18 @@ msgstr ""

2746 "Fa molt que l'opció -b/--binary no ha fet res, i\n"

2747 "s'eliminarà. Si us plau, no l'useu més."

2748

2691 -#: builtin/am.c:2329

2749 +#: builtin/am.c:2361

2750 msgid "failed to read the index"

2751 msgstr "s'ha fallat en llegir l'índex"

2752

2695 -#: builtin/am.c:2344

2753 +#: builtin/am.c:2376

2754 #, c-format

2755 msgid "previous rebase directory %s still exists but mbox given."

2756 msgstr ""

2757 "un directori de rebasament anterior %s encara existeix però s'ha donat una "

2758 "bústia."

2759

2702 -#: builtin/am.c:2368

2760 +#: builtin/am.c:2400

2761 #, c-format

2762 msgid ""

2763 "Stray %s directory found.\n"

@@ -2708,7 +2766,7 @@ msgstr ""

2766 "Directori %s extraviat trobat.\n"

2767 "Useu \"git am --abort\" per a eliminar-lo."

2768

2711 -#: builtin/am.c:2374

2769 +#: builtin/am.c:2406

2770 msgid "Resolve operation not in progress, we are not resuming."

2771 msgstr "Operació de resolució no en curs; no reprenem."

2772

@@ -2716,65 +2774,65 @@ msgstr "Operació de resolució no en curs; no reprenem."

2774 msgid "git apply [<options>] [<patch>...]"

2775 msgstr "git apply [<opcions>] [<pedaç>...]"

2776

2719 -#: builtin/apply.c:112

2777 +#: builtin/apply.c:111

2778 #, c-format

2779 msgid "unrecognized whitespace option '%s'"

2780 msgstr "opció d'espai en blanc '%s' no reconeguda"

2781

2724 -#: builtin/apply.c:127

2782 +#: builtin/apply.c:126

2783 #, c-format

2784 msgid "unrecognized whitespace ignore option '%s'"

2785 msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"

2786

2729 -#: builtin/apply.c:822

2787 +#: builtin/apply.c:818

2788 #, c-format

2789 msgid "Cannot prepare timestamp regexp %s"

2790 msgstr "No es pot preparar l'expressió regular de marca de temps %s"

2791

2734 -#: builtin/apply.c:831

2792 +#: builtin/apply.c:827

2793 #, c-format

2794 msgid "regexec returned %d for input: %s"

2795 msgstr "regexec ha retornat %d per l'entrada: %s"

2796

2739 -#: builtin/apply.c:912

2797 +#: builtin/apply.c:908

2798 #, c-format

2799 msgid "unable to find filename in patch at line %d"

2800 msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"

2801

2744 -#: builtin/apply.c:944

2802 +#: builtin/apply.c:940

2803 #, c-format

2804 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

2805 msgstr ""

2806 "git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"

2807

2750 -#: builtin/apply.c:948

2808 +#: builtin/apply.c:944

2809 #, c-format

2810 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

2811 msgstr ""

2812 "git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"

2813

2756 -#: builtin/apply.c:949

2814 +#: builtin/apply.c:945

2815 #, c-format

2816 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

2817 msgstr ""

2818 "git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"

2819

2762 -#: builtin/apply.c:956

2820 +#: builtin/apply.c:952

2821 #, c-format

2822 msgid "git apply: bad git-diff - expected /dev/null on line %d"

2823 msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"

2824

2767 -#: builtin/apply.c:1419

2825 +#: builtin/apply.c:1415

2826 #, c-format

2827 msgid "recount: unexpected line: %.*s"

2828 msgstr "recompte: línia inesperada: %.*s"

2829

2772 -#: builtin/apply.c:1476

2830 +#: builtin/apply.c:1472

2831 #, c-format

2832 msgid "patch fragment without header at line %d: %.*s"

2833 msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"

2834

2777 -#: builtin/apply.c:1493

2835 +#: builtin/apply.c:1489

2836 #, c-format

2837 msgid ""

2838 "git diff header lacks filename information when removing %d leading pathname "

@@ -2789,77 +2847,77 @@ msgstr[1] ""

2847 "a la capçalera de git diff li manca informació de nom de fitxer en eliminar "

2848 "%d components de nom de camí inicial (línia %d)"

2849

2792 -#: builtin/apply.c:1659

2850 +#: builtin/apply.c:1655

2851 msgid "new file depends on old contents"

2852 msgstr "el fitxer nou depèn dels continguts antics"

2853

2796 -#: builtin/apply.c:1661

2854 +#: builtin/apply.c:1657

2855 msgid "deleted file still has contents"

2856 msgstr "el fitxer suprimit encara té continguts"

2857

2800 -#: builtin/apply.c:1687

2858 +#: builtin/apply.c:1683

2859 #, c-format

2860 msgid "corrupt patch at line %d"

2861 msgstr "el pedaç és malmès a la línia %d"

2862

2805 -#: builtin/apply.c:1723

2863 +#: builtin/apply.c:1719

2864 #, c-format

2865 msgid "new file %s depends on old contents"

2866 msgstr "el fitxer nou %s depèn dels continguts antics"

2867

2810 -#: builtin/apply.c:1725

2868 +#: builtin/apply.c:1721

2869 #, c-format

2870 msgid "deleted file %s still has contents"

2871 msgstr "el fitxer suprimit %s encara té continguts"

2872

2815 -#: builtin/apply.c:1728

2873 +#: builtin/apply.c:1724

2874 #, c-format

2875 msgid "** warning: file %s becomes empty but is not deleted"

2876 msgstr "** avís: el fitxer %s queda buit però no se suprimeix"

2877

2820 -#: builtin/apply.c:1874

2878 +#: builtin/apply.c:1870

2879 #, c-format

2880 msgid "corrupt binary patch at line %d: %.*s"

2881 msgstr "pedaç binari malmès a la línia %d: %.*s"

2882

2825 -#: builtin/apply.c:1903

2883 +#: builtin/apply.c:1899

2884 #, c-format

2885 msgid "unrecognized binary patch at line %d"

2886 msgstr "pedaç binari no reconegut a la línia %d"

2887

2830 -#: builtin/apply.c:2054

2888 +#: builtin/apply.c:2050

2889 #, c-format

2890 msgid "patch with only garbage at line %d"

2891 msgstr "pedaç amb només escombraries a la línia %d"

2892

2835 -#: builtin/apply.c:2144

2893 +#: builtin/apply.c:2140

2894 #, c-format

2895 msgid "unable to read symlink %s"

2896 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"

2897

2840 -#: builtin/apply.c:2148

2898 +#: builtin/apply.c:2144

2899 #, c-format

2900 msgid "unable to open or read %s"

2901 msgstr "no s'ha pogut obrir o llegir %s"

2902

2845 -#: builtin/apply.c:2781

2903 +#: builtin/apply.c:2777

2904 #, c-format

2905 msgid "invalid start of line: '%c'"

2906 msgstr "inici de línia no vàlid: '%c'"

2907

2850 -#: builtin/apply.c:2900

2908 +#: builtin/apply.c:2896

2909 #, c-format

2910 msgid "Hunk #%d succeeded at %d (offset %d line)."

2911 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

2912 msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."

2913 msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."

2914

2857 -#: builtin/apply.c:2912

2915 +#: builtin/apply.c:2908

2916 #, c-format

2917 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

2918 msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"

2919

2862 -#: builtin/apply.c:2918

2920 +#: builtin/apply.c:2914

2921 #, c-format

2922 msgid ""

2923 "while searching for:\n"

@@ -2868,326 +2926,326 @@ msgstr ""

2926 "tot cercant:\n"

2927 "%.*s"

2928

2871 -#: builtin/apply.c:2938

2929 +#: builtin/apply.c:2934

2930 #, c-format

2931 msgid "missing binary patch data for '%s'"

2932 msgstr "manquen les dades de pedaç binari de '%s'"

2933

2876 -#: builtin/apply.c:3039

2934 +#: builtin/apply.c:3035

2935 #, c-format

2936 msgid "binary patch does not apply to '%s'"

2937 msgstr "el pedaç binari no s'aplica a '%s'"

2938

2881 -#: builtin/apply.c:3045

2939 +#: builtin/apply.c:3041

2940 #, c-format

2941 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

2942 msgstr ""

2943 "el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"

2944

2887 -#: builtin/apply.c:3066

2945 +#: builtin/apply.c:3062

2946 #, c-format

2947 msgid "patch failed: %s:%ld"

2948 msgstr "el pedaç ha fallat: %s:%ld"

2949

2892 -#: builtin/apply.c:3190

2950 +#: builtin/apply.c:3186

2951 #, c-format

2952 msgid "cannot checkout %s"

2953 msgstr "no es pot agafar %s"

2954

2897 -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2955 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

2956 #, c-format

2957 msgid "read of %s failed"

2958 msgstr "la lectura de %s ha fallat"

2959

2902 -#: builtin/apply.c:3243

2960 +#: builtin/apply.c:3239

2961 #, c-format

2962 msgid "reading from '%s' beyond a symbolic link"

2963 msgstr "llegint de '%s' més enllà d'un enllaç simbòlic"

2964

2907 -#: builtin/apply.c:3271 builtin/apply.c:3493

2965 +#: builtin/apply.c:3267 builtin/apply.c:3489

2966 #, c-format

2967 msgid "path %s has been renamed/deleted"

2968 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"

2969

2912 -#: builtin/apply.c:3352 builtin/apply.c:3507

2970 +#: builtin/apply.c:3348 builtin/apply.c:3503

2971 #, c-format

2972 msgid "%s: does not exist in index"

2973 msgstr "%s: no existeix en l'índex"

2974

2917 -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2975 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

2976 #, c-format

2977 msgid "%s: %s"

2978 msgstr "%s: %s"

2979

2922 -#: builtin/apply.c:3361 builtin/apply.c:3515

2980 +#: builtin/apply.c:3357 builtin/apply.c:3511

2981 #, c-format

2982 msgid "%s: does not match index"

2983 msgstr "%s: no coincideix amb l'índex"

2984

2927 -#: builtin/apply.c:3463

2985 +#: builtin/apply.c:3459

2986 msgid "removal patch leaves file contents"

2987 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"

2988

2931 -#: builtin/apply.c:3532

2989 +#: builtin/apply.c:3528

2990 #, c-format

2991 msgid "%s: wrong type"

2992 msgstr "%s: tipus erroni"

2993

2936 -#: builtin/apply.c:3534

2994 +#: builtin/apply.c:3530

2995 #, c-format

2996 msgid "%s has type %o, expected %o"

2997 msgstr "%s és del tipus %o, s'esperava %o"

2998

2941 -#: builtin/apply.c:3693 builtin/apply.c:3695

2999 +#: builtin/apply.c:3689 builtin/apply.c:3691

3000 #, c-format

3001 msgid "invalid path '%s'"

3002 msgstr "camí no vàlid: %s"

3003

2946 -#: builtin/apply.c:3750

3004 +#: builtin/apply.c:3746

3005 #, c-format

3006 msgid "%s: already exists in index"

3007 msgstr "%s: ja existeix en l'índex"

3008

2951 -#: builtin/apply.c:3753

3009 +#: builtin/apply.c:3749

3010 #, c-format

3011 msgid "%s: already exists in working directory"

3012 msgstr "%s: ja existeix en el directori de treball"

3013

2956 -#: builtin/apply.c:3773

3014 +#: builtin/apply.c:3769

3015 #, c-format

3016 msgid "new mode (%o) of %s does not match old mode (%o)"

3017 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"

3018

2961 -#: builtin/apply.c:3778

3019 +#: builtin/apply.c:3774

3020 #, c-format

3021 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

3022 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"

3023

2966 -#: builtin/apply.c:3798

3024 +#: builtin/apply.c:3794

3025 #, c-format

3026 msgid "affected file '%s' is beyond a symbolic link"

3027 msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"

3028

2971 -#: builtin/apply.c:3802

3029 +#: builtin/apply.c:3798

3030 #, c-format

3031 msgid "%s: patch does not apply"

3032 msgstr "%s: el pedaç no s'aplica"

3033

2976 -#: builtin/apply.c:3816

3034 +#: builtin/apply.c:3812

3035 #, c-format

3036 msgid "Checking patch %s..."

3037 msgstr "Comprovant el pedaç %s..."

3038

2981 -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3039 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3040 #, c-format

3041 msgid "make_cache_entry failed for path '%s'"

3042 msgstr "make_cache_entry ha fallat per al camí '%s'"

3043

2986 -#: builtin/apply.c:4052

3044 +#: builtin/apply.c:4048

3045 #, c-format

3046 msgid "unable to remove %s from index"

3047 msgstr "no s'ha pogut eliminar %s de l'índex"

3048

2991 -#: builtin/apply.c:4081

3049 +#: builtin/apply.c:4077

3050 #, c-format

3051 msgid "corrupt patch for submodule %s"

3052 msgstr "pedaç malmès per al submòdul %s"

3053

2996 -#: builtin/apply.c:4085

3054 +#: builtin/apply.c:4081

3055 #, c-format

3056 msgid "unable to stat newly created file '%s'"

3057 msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"

3058

3001 -#: builtin/apply.c:4090

3059 +#: builtin/apply.c:4086

3060 #, c-format

3061 msgid "unable to create backing store for newly created file %s"

3062 msgstr ""

3063 "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "

3064 "%s"

3065

3008 -#: builtin/apply.c:4093 builtin/apply.c:4201

3066 +#: builtin/apply.c:4089 builtin/apply.c:4197

3067 #, c-format

3068 msgid "unable to add cache entry for %s"

3069 msgstr "no s'ha pogut afegir una entrada de cau per a %s"

3070

3013 -#: builtin/apply.c:4126

3071 +#: builtin/apply.c:4122

3072 #, c-format

3073 msgid "closing file '%s'"

3074 msgstr "tancant el fitxer '%s'"

3075

3018 -#: builtin/apply.c:4175

3076 +#: builtin/apply.c:4171

3077 #, c-format

3078 msgid "unable to write file '%s' mode %o"

3079 msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"

3080

3023 -#: builtin/apply.c:4262

3081 +#: builtin/apply.c:4258

3082 #, c-format

3083 msgid "Applied patch %s cleanly."

3084 msgstr "El pedaç %s s'ha aplicat netament."

3085

3028 -#: builtin/apply.c:4270

3086 +#: builtin/apply.c:4266

3087 msgid "internal error"

3088 msgstr "error intern"

3089

3032 -#: builtin/apply.c:4273

3090 +#: builtin/apply.c:4269

3091 #, c-format

3092 msgid "Applying patch %%s with %d reject..."

3093 msgid_plural "Applying patch %%s with %d rejects..."

3094 msgstr[0] "Aplicant el pedaç %%s amb %d rebuig"

3095 msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos"

3096

3039 -#: builtin/apply.c:4283

3097 +#: builtin/apply.c:4279

3098 #, c-format

3099 msgid "truncating .rej filename to %.*s.rej"

3100 msgstr "truncant el nom del fitxer .rej a %.*s.rej"

3101

3044 -#: builtin/apply.c:4304

3102 +#: builtin/apply.c:4300

3103 #, c-format

3104 msgid "Hunk #%d applied cleanly."

3105 msgstr "El tros #%d s'ha aplicat netament."

3106

3049 -#: builtin/apply.c:4307

3107 +#: builtin/apply.c:4303

3108 #, c-format

3109 msgid "Rejected hunk #%d."

3110 msgstr "S'ha rebutjat el tros #%d."

3111

3054 -#: builtin/apply.c:4397

3112 +#: builtin/apply.c:4393

3113 msgid "unrecognized input"

3114 msgstr "entrada no reconeguda"

3115

3058 -#: builtin/apply.c:4408

3116 +#: builtin/apply.c:4404

3117 msgid "unable to read index file"

3118 msgstr "no es pot llegir el fitxer d'índex"

3119

3062 -#: builtin/apply.c:4526

3120 +#: builtin/apply.c:4517

3121 msgid "don't apply changes matching the given path"

3122 msgstr "no apliquis els canvis que coincideixin amb el camí donat"

3123

3066 -#: builtin/apply.c:4529

3124 +#: builtin/apply.c:4520

3125 msgid "apply changes matching the given path"

3126 msgstr "aplica els canvis que coincideixin amb el camí donat"

3127

3070 -#: builtin/apply.c:4532

3128 +#: builtin/apply.c:4523

3129 msgid "remove <num> leading slashes from traditional diff paths"

3130 msgstr ""

3131 "elimina <nombre> barres obliqües inicials dels camins de diferència "

3132 "tradicionals"

3133

3076 -#: builtin/apply.c:4535

3134 +#: builtin/apply.c:4526

3135 msgid "ignore additions made by the patch"

3136 msgstr "ignora afegiments fets pel pedaç"

3137

3080 -#: builtin/apply.c:4537

3138 +#: builtin/apply.c:4528

3139 msgid "instead of applying the patch, output diffstat for the input"

3140 msgstr ""

3141 "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"

3142

3085 -#: builtin/apply.c:4541

3143 +#: builtin/apply.c:4532

3144 msgid "show number of added and deleted lines in decimal notation"

3145 msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"

3146

3089 -#: builtin/apply.c:4543

3147 +#: builtin/apply.c:4534

3148 msgid "instead of applying the patch, output a summary for the input"

3149 msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"

3150

3093 -#: builtin/apply.c:4545

3151 +#: builtin/apply.c:4536

3152 msgid "instead of applying the patch, see if the patch is applicable"

3153 msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"

3154

3097 -#: builtin/apply.c:4547

3155 +#: builtin/apply.c:4538

3156 msgid "make sure the patch is applicable to the current index"

3157 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"

3158

3101 -#: builtin/apply.c:4549

3159 +#: builtin/apply.c:4540

3160 msgid "apply a patch without touching the working tree"

3161 msgstr "aplica un pedaç sense tocar l'arbre de treball"

3162

3105 -#: builtin/apply.c:4551

3163 +#: builtin/apply.c:4542

3164 msgid "accept a patch that touches outside the working area"

3165 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"

3166

3109 -#: builtin/apply.c:4553

3167 +#: builtin/apply.c:4544

3168 msgid "also apply the patch (use with --stat/--summary/--check)"

3169 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"

3170

3113 -#: builtin/apply.c:4555

3171 +#: builtin/apply.c:4546

3172 msgid "attempt three-way merge if a patch does not apply"

3173 msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"

3174

3117 -#: builtin/apply.c:4557

3175 +#: builtin/apply.c:4548

3176 msgid "build a temporary index based on embedded index information"

3177 msgstr "construeix un índex temporal basat en la informació d'índex incrustada"

3178

3121 -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

3179 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3180 msgid "paths are separated with NUL character"

3181 msgstr "els camins se separen amb el caràcter NUL"

3182

3125 -#: builtin/apply.c:4562

3183 +#: builtin/apply.c:4553

3184 msgid "ensure at least <n> lines of context match"

3185 msgstr "assegura't que almenys <n> línies de context coincideixin"

3186

3129 -#: builtin/apply.c:4564

3187 +#: builtin/apply.c:4555

3188 msgid "detect new or modified lines that have whitespace errors"

3189 msgstr ""

3190 "detecta les línies noves o modificades que tinguin errors d'espai en blanc"

3191

3134 -#: builtin/apply.c:4567 builtin/apply.c:4570

3192 +#: builtin/apply.c:4558 builtin/apply.c:4561

3193 msgid "ignore changes in whitespace when finding context"

3194 msgstr "ignora els canvis d'espai en blanc en cercar context"

3195

3138 -#: builtin/apply.c:4573

3196 +#: builtin/apply.c:4564

3197 msgid "apply the patch in reverse"

3198 msgstr "aplica el pedaç al revés"

3199

3142 -#: builtin/apply.c:4575

3200 +#: builtin/apply.c:4566

3201 msgid "don't expect at least one line of context"

3202 msgstr "no esperis almenys una línia de context"

3203

3146 -#: builtin/apply.c:4577

3204 +#: builtin/apply.c:4568

3205 msgid "leave the rejected hunks in corresponding *.rej files"

3206 msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"

3207

3150 -#: builtin/apply.c:4579

3208 +#: builtin/apply.c:4570

3209 msgid "allow overlapping hunks"

3210 msgstr "permet trossos encavalcants"

3211

3154 -#: builtin/apply.c:4582

3212 +#: builtin/apply.c:4573

3213 msgid "tolerate incorrectly detected missing new-line at the end of file"

3214 msgstr "tolera una línia nova incorrectament detectada al final del fitxer"

3215

3158 -#: builtin/apply.c:4585

3216 +#: builtin/apply.c:4576

3217 msgid "do not trust the line counts in the hunk headers"

3218 msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"

3219

3162 -#: builtin/apply.c:4588

3220 +#: builtin/apply.c:4579

3221 msgid "prepend <root> to all filenames"

3222 msgstr "anteposa <arrel> a tots els noms de fitxer"

3223

3166 -#: builtin/apply.c:4610

3224 +#: builtin/apply.c:4601

3225 msgid "--3way outside a repository"

3226 msgstr "--3way fora d'un dipòsit"

3227

3170 -#: builtin/apply.c:4618

3228 +#: builtin/apply.c:4609

3229 msgid "--index outside a repository"

3230 msgstr "--index fora d'un dipòsit"

3231

3174 -#: builtin/apply.c:4621

3232 +#: builtin/apply.c:4612

3233 msgid "--cached outside a repository"

3234 msgstr "--cached fora d'un dipòsit"

3235

3178 -#: builtin/apply.c:4640

3236 +#: builtin/apply.c:4631

3237 #, c-format

3238 msgid "can't open patch '%s'"

3239 msgstr "no es pot obrir el pedaç '%s'"

3240

3183 -#: builtin/apply.c:4654

3241 +#: builtin/apply.c:4645

3242 #, c-format

3243 msgid "squelched %d whitespace error"

3244 msgid_plural "squelched %d whitespace errors"

3245 msgstr[0] "%d error d'espai en blanc omès"

3246 msgstr[1] "%d errors d'espai en blanc omesos"

3247

3190 -#: builtin/apply.c:4660 builtin/apply.c:4670

3248 +#: builtin/apply.c:4651 builtin/apply.c:4661

3249 #, c-format

3250 msgid "%d line adds whitespace errors."

3251 msgid_plural "%d lines add whitespace errors."

@@ -3249,101 +3307,101 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"

3307 msgid "<rev-opts> are documented in git-rev-list(1)"

3308 msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"

3309

3252 -#: builtin/blame.c:2500

3310 +#: builtin/blame.c:2519

3311 msgid "Show blame entries as we find them, incrementally"

3312 msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"

3313

3256 -#: builtin/blame.c:2501

3314 +#: builtin/blame.c:2520

3315 msgid "Show blank SHA-1 for boundary commits (Default: off)"

3316 msgstr ""

3317 "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "

3318 "desactivat)"

3319

3262 -#: builtin/blame.c:2502

3320 +#: builtin/blame.c:2521

3321 msgid "Do not treat root commits as boundaries (Default: off)"

3322 msgstr ""

3323 "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"

3324

3267 -#: builtin/blame.c:2503

3325 +#: builtin/blame.c:2522

3326 msgid "Show work cost statistics"

3327 msgstr "Mostra les estadístiques de preu de treball"

3328

3271 -#: builtin/blame.c:2504

3329 +#: builtin/blame.c:2523

3330 msgid "Show output score for blame entries"

3331 msgstr "Mostra la puntuació de sortida de les entrades de culpa"

3332

3275 -#: builtin/blame.c:2505

3333 +#: builtin/blame.c:2524

3334 msgid "Show original filename (Default: auto)"

3335 msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"

3336

3279 -#: builtin/blame.c:2506

3337 +#: builtin/blame.c:2525

3338 msgid "Show original linenumber (Default: off)"

3339 msgstr "Mostra el número de línia original (Per defecte: desactivat)"

3340

3283 -#: builtin/blame.c:2507

3341 +#: builtin/blame.c:2526

3342 msgid "Show in a format designed for machine consumption"

3343 msgstr "Presenta en un format dissenyat per consumpció per màquina"

3344

3287 -#: builtin/blame.c:2508

3345 +#: builtin/blame.c:2527

3346 msgid "Show porcelain format with per-line commit information"

3347 msgstr "Mostra el format de porcellana amb informació de comissió per línia"

3348

3291 -#: builtin/blame.c:2509

3349 +#: builtin/blame.c:2528

3350 msgid "Use the same output mode as git-annotate (Default: off)"

3351 msgstr ""

3352 "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"

3353

3296 -#: builtin/blame.c:2510

3354 +#: builtin/blame.c:2529

3355 msgid "Show raw timestamp (Default: off)"

3356 msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"

3357

3300 -#: builtin/blame.c:2511

3358 +#: builtin/blame.c:2530

3359 msgid "Show long commit SHA1 (Default: off)"

3360 msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"

3361

3304 -#: builtin/blame.c:2512

3362 +#: builtin/blame.c:2531

3363 msgid "Suppress author name and timestamp (Default: off)"

3364 msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"

3365

3308 -#: builtin/blame.c:2513

3366 +#: builtin/blame.c:2532

3367 msgid "Show author email instead of name (Default: off)"

3368 msgstr ""

3369 "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "

3370 "defecte: desactivat)"

3371

3314 -#: builtin/blame.c:2514

3372 +#: builtin/blame.c:2533

3373 msgid "Ignore whitespace differences"

3374 msgstr "Ignora les diferències d'espai en blanc"

3375

3318 -#: builtin/blame.c:2515

3376 +#: builtin/blame.c:2534

3377 msgid "Spend extra cycles to find better match"

3378 msgstr "Gasta cicles extres per a trobar una coincidència millor"

3379

3322 -#: builtin/blame.c:2516

3380 +#: builtin/blame.c:2535

3381 msgid "Use revisions from <file> instead of calling git-rev-list"

3382 msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"

3383

3326 -#: builtin/blame.c:2517

3384 +#: builtin/blame.c:2536

3385 msgid "Use <file>'s contents as the final image"

3386 msgstr "Usa els continguts de <fitxer> com a la imatge final"

3387

3330 -#: builtin/blame.c:2518 builtin/blame.c:2519

3388 +#: builtin/blame.c:2537 builtin/blame.c:2538

3389 msgid "score"

3390 msgstr "puntuació"

3391

3334 -#: builtin/blame.c:2518

3392 +#: builtin/blame.c:2537

3393 msgid "Find line copies within and across files"

3394 msgstr "Troba còpies de línia dins i a través dels fitxers"

3395

3338 -#: builtin/blame.c:2519

3396 +#: builtin/blame.c:2538

3397 msgid "Find line movements within and across files"

3398 msgstr "Troba moviments de línia dins i a través dels fitxers"

3399

3342 -#: builtin/blame.c:2520

3400 +#: builtin/blame.c:2539

3401 msgid "n,m"

3402 msgstr "n,m"

3403

3346 -#: builtin/blame.c:2520

3404 +#: builtin/blame.c:2539

3405 msgid "Process only line range n,m, counting from 1"

3406 msgstr "Processa només el rang de línies n,m, comptant des d'1"

3407

@@ -3353,27 +3411,31 @@ msgstr "Processa només el rang de línies n,m, comptant des d'1"

3411 #. takes 22 places, is the longest among various forms of

3412 #. relative timestamps, but your language may need more or

3413 #. fewer display columns.

3356 -#: builtin/blame.c:2601

3414 +#: builtin/blame.c:2620

3415 msgid "4 years, 11 months ago"

3416 msgstr "fa 4 anys i 11 mesos"

3417

3360 -#: builtin/branch.c:24

3418 +#: builtin/branch.c:25

3419 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3420 msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"

3421

3364 -#: builtin/branch.c:25

3422 +#: builtin/branch.c:26

3423 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3424 msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"

3425

3368 -#: builtin/branch.c:26

3426 +#: builtin/branch.c:27

3427 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3428 msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."

3429

3372 -#: builtin/branch.c:27

3430 +#: builtin/branch.c:28

3431 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3432 msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"

3433

3376 -#: builtin/branch.c:150

3434 +#: builtin/branch.c:29

3435 +msgid "git branch [<options>] [-r | -a] [--points-at]"

3436 +msgstr "git branch [<opcions>] [-r | -a] [--points-at]"

3437 +

3438 +#: builtin/branch.c:142

3439 #, c-format

3440 msgid ""

3441 "deleting branch '%s' that has been merged to\n"

@@ -3383,7 +3445,7 @@ msgstr ""

3445 " '%s', però encara no s'ha fusionat\n"

3446 " a HEAD."

3447

3386 -#: builtin/branch.c:154

3448 +#: builtin/branch.c:146

3449 #, c-format

3450 msgid ""

3451 "not deleting branch '%s' that is not yet merged to\n"

@@ -3393,12 +3455,12 @@ msgstr ""

3455 " fusionat a '%s', encara que està\n"

3456 " fusionada a HEAD."

3457

3396 -#: builtin/branch.c:168

3458 +#: builtin/branch.c:160

3459 #, c-format

3460 msgid "Couldn't look up commit object for '%s'"

3461 msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"

3462

3401 -#: builtin/branch.c:172

3463 +#: builtin/branch.c:164

3464 #, c-format

3465 msgid ""

3466 "The branch '%s' is not fully merged.\n"

@@ -3407,348 +3469,340 @@ msgstr ""

3469 "La branca '%s' no està totalment fusionada.\n"

3470 "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."

3471

3410 -#: builtin/branch.c:185

3472 +#: builtin/branch.c:177

3473 msgid "Update of config-file failed"

3474 msgstr "L'actualització del fitxer de configuració ha fallat"

3475

3414 -#: builtin/branch.c:213

3476 +#: builtin/branch.c:205

3477 msgid "cannot use -a with -d"

3478 msgstr "no es pot usar -a amb -d"

3479

3418 -#: builtin/branch.c:219

3480 +#: builtin/branch.c:211

3481 msgid "Couldn't look up commit object for HEAD"

3482 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"

3483

3422 -#: builtin/branch.c:227

3484 +#: builtin/branch.c:219

3485 #, c-format

3486 msgid "Cannot delete the branch '%s' which you are currently on."

3487 msgstr "No es pot suprimir la branca '%s', en la qual sou actualment."

3488

3427 -#: builtin/branch.c:243

3489 +#: builtin/branch.c:235

3490 #, c-format

3491 msgid "remote-tracking branch '%s' not found."

3492 msgstr "no s'ha trobat la branca amb seguiment remot '%s'."

3493

3432 -#: builtin/branch.c:244

3494 +#: builtin/branch.c:236

3495 #, c-format

3496 msgid "branch '%s' not found."

3497 msgstr "no s'ha trobat la branca '%s'."

3498

3437 -#: builtin/branch.c:259

3499 +#: builtin/branch.c:251

3500 #, c-format

3501 msgid "Error deleting remote-tracking branch '%s'"

3502 msgstr "Error en suprimir la branca amb seguiment remot '%s'"

3503

3442 -#: builtin/branch.c:260

3504 +#: builtin/branch.c:252

3505 #, c-format

3506 msgid "Error deleting branch '%s'"

3507 msgstr "Error en suprimir la branca '%s'"

3508

3447 -#: builtin/branch.c:267

3509 +#: builtin/branch.c:259

3510 #, c-format

3511 msgid "Deleted remote-tracking branch %s (was %s).\n"

3512 msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"

3513

3452 -#: builtin/branch.c:268

3514 +#: builtin/branch.c:260

3515 #, c-format

3516 msgid "Deleted branch %s (was %s).\n"

3517 msgstr "S'ha suprimit la branca %s (era %s).\n"

3518

3457 -#: builtin/branch.c:369

3458 -#, c-format

3459 -msgid "branch '%s' does not point at a commit"

3460 -msgstr "la branca '%s' no assenyala cap comissió"

3461 -

3462 -#: builtin/branch.c:452

3519 +#: builtin/branch.c:303

3520 #, c-format

3521 msgid "[%s: gone]"

3522 msgstr "[%s: no hi és]"

3523

3467 -#: builtin/branch.c:457

3524 +#: builtin/branch.c:308

3525 #, c-format

3526 msgid "[%s]"

3527 msgstr "[%s]"

3528

3472 -#: builtin/branch.c:462

3529 +#: builtin/branch.c:313

3530 #, c-format

3531 msgid "[%s: behind %d]"

3532 msgstr "[%s: darrere per %d]"

3533

3477 -#: builtin/branch.c:464

3534 +#: builtin/branch.c:315

3535 #, c-format

3536 msgid "[behind %d]"

3537 msgstr "[darrere de %d]"

3538

3482 -#: builtin/branch.c:468

3539 +#: builtin/branch.c:319

3540 #, c-format

3541 msgid "[%s: ahead %d]"

3542 msgstr "[%s: davant per %d]"

3543

3487 -#: builtin/branch.c:470

3544 +#: builtin/branch.c:321

3545 #, c-format

3546 msgid "[ahead %d]"

3547 msgstr "[davant de %d]"

3548

3492 -#: builtin/branch.c:473

3549 +#: builtin/branch.c:324

3550 #, c-format

3551 msgid "[%s: ahead %d, behind %d]"

3552 msgstr "[%s: davant per %d, darrere per %d]"

3553

3497 -#: builtin/branch.c:476

3554 +#: builtin/branch.c:327

3555 #, c-format

3556 msgid "[ahead %d, behind %d]"

3557 msgstr "[davant %d, darrere %d]"

3558

3502 -#: builtin/branch.c:489

3559 +#: builtin/branch.c:340

3560 msgid " **** invalid ref ****"

3561 msgstr " **** referència no vàlida ****"

3562

3506 -#: builtin/branch.c:580

3563 +#: builtin/branch.c:366

3564 #, c-format

3565 msgid "(no branch, rebasing %s)"

3566 msgstr "(cap branca, rebasant %s)"

3567

3511 -#: builtin/branch.c:583

3568 +#: builtin/branch.c:369

3569 #, c-format

3570 msgid "(no branch, bisect started on %s)"

3571 msgstr "(cap branca, bisecció començada en %s)"

3572

3516 -#: builtin/branch.c:589

3573 +#: builtin/branch.c:375

3574 #, c-format

3575 msgid "(HEAD detached at %s)"

3576 msgstr "(HEAD separat a %s)"

3577

3521 -#: builtin/branch.c:592

3578 +#: builtin/branch.c:378

3579 #, c-format

3580 msgid "(HEAD detached from %s)"

3581 msgstr "(HEAD separat de %s)"

3582

3526 -#: builtin/branch.c:596

3583 +#: builtin/branch.c:382

3584 msgid "(no branch)"

3585 msgstr "(cap branca)"

3586

3530 -#: builtin/branch.c:643

3531 -#, c-format

3532 -msgid "object '%s' does not point to a commit"

3533 -msgstr "l'objecte '%s' no assenyala cap comissió"

3534 -

3535 -#: builtin/branch.c:691

3536 -msgid "some refs could not be read"

3537 -msgstr "no s'han pogut llegir algunes referències"

3538 -

3539 -#: builtin/branch.c:704

3587 +#: builtin/branch.c:524

3588 msgid "cannot rename the current branch while not on any."

3589 msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."

3590

3543 -#: builtin/branch.c:714

3591 +#: builtin/branch.c:534

3592 #, c-format

3593 msgid "Invalid branch name: '%s'"

3594 msgstr "Nom de branca no vàlid: '%s'"

3595

3548 -#: builtin/branch.c:729

3596 +#: builtin/branch.c:549

3597 msgid "Branch rename failed"

3598 msgstr "El canvi de nom de branca ha fallat"

3599

3552 -#: builtin/branch.c:733

3600 +#: builtin/branch.c:553

3601 #, c-format

3602 msgid "Renamed a misnamed branch '%s' away"

3603 msgstr "S'ha canviat el nom de la branca malanomenada '%s'"

3604

3557 -#: builtin/branch.c:737

3605 +#: builtin/branch.c:557

3606 #, c-format

3607 msgid "Branch renamed to %s, but HEAD is not updated!"

3608 msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"

3609

3562 -#: builtin/branch.c:744

3610 +#: builtin/branch.c:564

3611 msgid "Branch is renamed, but update of config-file failed"

3612 msgstr ""

3613 "La branca està canviada de nom, però l'actualització del fitxer de "

3614 "configuració ha fallat"

3615

3568 -#: builtin/branch.c:759

3569 -#, c-format

3570 -msgid "malformed object name %s"

3571 -msgstr "nom d'objecte %s mal format"

3572 -

3573 -#: builtin/branch.c:781

3616 +#: builtin/branch.c:587

3617 #, c-format

3618 msgid "could not write branch description template: %s"

3619 msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s"

3620

3578 -#: builtin/branch.c:811

3621 +#: builtin/branch.c:616

3622 msgid "Generic options"

3623 msgstr "Opcions genèriques"

3624

3582 -#: builtin/branch.c:813

3625 +#: builtin/branch.c:618

3626 msgid "show hash and subject, give twice for upstream branch"

3627 msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"

3628

3586 -#: builtin/branch.c:814

3629 +#: builtin/branch.c:619

3630 msgid "suppress informational messages"

3631 msgstr "omet els missatges informatius"

3632

3590 -#: builtin/branch.c:815

3633 +#: builtin/branch.c:620

3634 msgid "set up tracking mode (see git-pull(1))"

3635 msgstr "configura el mode de seguiment (vegeu git-pull(1))"

3636

3594 -#: builtin/branch.c:817

3637 +#: builtin/branch.c:622

3638 msgid "change upstream info"

3639 msgstr "canvia la informació de font"

3640

3598 -#: builtin/branch.c:821

3641 +#: builtin/branch.c:626

3642 msgid "use colored output"

3643 msgstr "usa sortida colorada"

3644

3602 -#: builtin/branch.c:822

3645 +#: builtin/branch.c:627

3646 msgid "act on remote-tracking branches"

3647 msgstr "actua en branques amb seguiment remot"

3648

3606 -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3607 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3608 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3609 -#: builtin/tag.c:624

3610 -msgid "commit"

3611 -msgstr "comissió"

3612 -

3613 -#: builtin/branch.c:826 builtin/branch.c:832

3649 +#: builtin/branch.c:629 builtin/branch.c:630

3650 msgid "print only branches that contain the commit"

3651 msgstr "imprimeix només les branques que continguin la comissió"

3652

3617 -#: builtin/branch.c:838

3653 +#: builtin/branch.c:633

3654 msgid "Specific git-branch actions:"

3655 msgstr "Accions de git-branch específiques:"

3656

3621 -#: builtin/branch.c:839

3657 +#: builtin/branch.c:634

3658 msgid "list both remote-tracking and local branches"

3659 msgstr "llista les branques amb seguiment remot i les locals"

3660

3625 -#: builtin/branch.c:841

3661 +#: builtin/branch.c:636

3662 msgid "delete fully merged branch"

3663 msgstr "suprimeix la branca si està completament fusionada"

3664

3629 -#: builtin/branch.c:842

3665 +#: builtin/branch.c:637

3666 msgid "delete branch (even if not merged)"

3667 msgstr "suprimeix la branca (encara que no estigui fusionada)"

3668

3633 -#: builtin/branch.c:843

3669 +#: builtin/branch.c:638

3670 msgid "move/rename a branch and its reflog"

3671 msgstr "mou/canvia de nom una branca i el seu registre de referència"

3672

3637 -#: builtin/branch.c:844

3673 +#: builtin/branch.c:639

3674 msgid "move/rename a branch, even if target exists"

3675 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"

3676

3641 -#: builtin/branch.c:845

3677 +#: builtin/branch.c:640

3678 msgid "list branch names"

3679 msgstr "llista els noms de branca"

3680

3645 -#: builtin/branch.c:846

3681 +#: builtin/branch.c:641

3682 msgid "create the branch's reflog"

3683 msgstr "crea el registre de referència de la branca"

3684

3649 -#: builtin/branch.c:848

3685 +#: builtin/branch.c:643

3686 msgid "edit the description for the branch"

3687 msgstr "edita la descripció de la branca"

3688

3653 -#: builtin/branch.c:849

3689 +#: builtin/branch.c:644

3690 msgid "force creation, move/rename, deletion"

3691 msgstr "força creació, moviment/canvi de nom, supressió"

3692

3657 -#: builtin/branch.c:852

3658 -msgid "print only not merged branches"

3659 -msgstr "imprimeix només les branques sense fusionar"

3693 +#: builtin/branch.c:645

3694 +msgid "print only branches that are merged"

3695 +msgstr "imprimeix només les branques que s'han fusionat"

3696

3661 -#: builtin/branch.c:858

3662 -msgid "print only merged branches"

3663 -msgstr "imprimeix només les branques fusionades"

3697 +#: builtin/branch.c:646

3698 +msgid "print only branches that are not merged"

3699 +msgstr "imprimeix només les branques que no s'han fusionat"

3700

3665 -#: builtin/branch.c:862

3701 +#: builtin/branch.c:647

3702 msgid "list branches in columns"

3703 msgstr "llista les branques en columnes"

3704

3669 -#: builtin/branch.c:875

3705 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3706 +msgid "key"

3707 +msgstr "clau"

3708 +

3709 +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3710 +msgid "field name to sort on"

3711 +msgstr "nom del camp en el qual ordenar"

3712 +

3713 +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3714 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3715 +#: builtin/tag.c:369

3716 +msgid "object"

3717 +msgstr "objecte"

3718 +

3719 +#: builtin/branch.c:652

3720 +msgid "print only branches of the object"

3721 +msgstr "imprimeix només les branques de l'objecte"

3722 +

3723 +#: builtin/branch.c:670

3724 msgid "Failed to resolve HEAD as a valid ref."

3725 msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."

3726

3673 -#: builtin/branch.c:879 builtin/clone.c:690

3727 +#: builtin/branch.c:674 builtin/clone.c:697

3728 msgid "HEAD not found below refs/heads!"

3729 msgstr "HEAD no trobat sota refs/heads!"

3730

3677 -#: builtin/branch.c:901

3731 +#: builtin/branch.c:694

3732 msgid "--column and --verbose are incompatible"

3733 msgstr "--column i --verbose són incompatibles"

3734

3681 -#: builtin/branch.c:912 builtin/branch.c:951

3735 +#: builtin/branch.c:705 builtin/branch.c:747

3736 msgid "branch name required"

3737 msgstr "cal el nom de branca"

3738

3685 -#: builtin/branch.c:927

3739 +#: builtin/branch.c:723

3740 msgid "Cannot give description to detached HEAD"

3741 msgstr "No es pot donar descripció a un HEAD separat"

3742

3689 -#: builtin/branch.c:932

3743 +#: builtin/branch.c:728

3744 msgid "cannot edit description of more than one branch"

3745 msgstr "no es pot editar la descripció de més d'una branca"

3746

3693 -#: builtin/branch.c:939

3747 +#: builtin/branch.c:735

3748 #, c-format

3749 msgid "No commit on branch '%s' yet."

3750 msgstr "Encara no hi ha comissió en la branca '%s'."

3751

3698 -#: builtin/branch.c:942

3752 +#: builtin/branch.c:738

3753 #, c-format

3754 msgid "No branch named '%s'."

3755 msgstr "No hi ha branca amb nom '%s'."

3756

3703 -#: builtin/branch.c:957

3757 +#: builtin/branch.c:753

3758 msgid "too many branches for a rename operation"

3759 msgstr "hi ha massa branques per a una operació de canvi de nom"

3760

3707 -#: builtin/branch.c:962

3761 +#: builtin/branch.c:758

3762 msgid "too many branches to set new upstream"

3763 msgstr "hi ha massa branques per a establir una nova font"

3764

3711 -#: builtin/branch.c:966

3765 +#: builtin/branch.c:762

3766 #, c-format

3767 msgid ""

3768 "could not set upstream of HEAD to %s when it does not point to any branch."

3769 msgstr ""

3770 "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."

3771

3718 -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3772 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3773 #, c-format

3774 msgid "no such branch '%s'"

3775 msgstr "no hi ha tal branca '%s'"

3776

3723 -#: builtin/branch.c:973

3777 +#: builtin/branch.c:769

3778 #, c-format

3779 msgid "branch '%s' does not exist"

3780 msgstr "la branca '%s' no existeix"

3781

3728 -#: builtin/branch.c:985

3782 +#: builtin/branch.c:781

3783 msgid "too many branches to unset upstream"

3784 msgstr "hi ha massa branques per a desestablir la font"

3785

3732 -#: builtin/branch.c:989

3786 +#: builtin/branch.c:785

3787 msgid "could not unset upstream of HEAD when it does not point to any branch."

3788 msgstr ""

3789 "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."

3790

3737 -#: builtin/branch.c:995

3791 +#: builtin/branch.c:791

3792 #, c-format

3793 msgid "Branch '%s' has no upstream information"

3794 msgstr "La branca '%s' no té informació de font"

3795

3742 -#: builtin/branch.c:1009

3796 +#: builtin/branch.c:805

3797 msgid "it does not make sense to create 'HEAD' manually"

3798 msgstr "no té sentit crear 'HEAD' manualment"

3799

3746 -#: builtin/branch.c:1015

3800 +#: builtin/branch.c:811

3801 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3802 msgstr ""

3803 "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"

3804

3751 -#: builtin/branch.c:1018

3805 +#: builtin/branch.c:814

3806 #, c-format

3807 msgid ""

3808 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3757,7 +3811,7 @@ msgstr ""

3811 "La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --"

3812 "track o --set-upstream-to\n"

3813

3760 -#: builtin/branch.c:1035

3814 +#: builtin/branch.c:831

3815 #, c-format

3816 msgid ""

3817 "\n"

@@ -3768,12 +3822,12 @@ msgstr ""

3822 "Si volíeu fer '%s' seguir '%s', feu això:\n"

3823 "\n"

3824

3771 -#: builtin/branch.c:1036

3825 +#: builtin/branch.c:832

3826 #, c-format

3827 msgid " git branch -d %s\n"

3828 msgstr " git branch -d %s\n"

3829

3776 -#: builtin/branch.c:1037

3830 +#: builtin/branch.c:833

3831 #, c-format

3832 msgid " git branch --set-upstream-to %s\n"

3833 msgstr " git branch --set-upstream-to %s\n"

@@ -3800,12 +3854,8 @@ msgstr ""

3854 "<tipus>|--textconv) <objecte>"

3855

3856 #: builtin/cat-file.c:429

3803 -msgid ""

3804 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3805 -"objects>"

3806 -msgstr ""

3807 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <llista-"

3808 -"d'objectes>"

3857 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3858 +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3859

3860 #: builtin/cat-file.c:466

3861 msgid "<type> can be one of: blob, tree, commit, tag"

@@ -3862,9 +3912,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3912 msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."

3913

3914 #: builtin/check-attr.c:12

3865 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3866 -msgstr ""

3867 -"git check-attr --stdin [-z] [-a | --all | <atribut>...] < <llista-de-camins>"

3915 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

3916 +msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"

3917

3918 #: builtin/check-attr.c:19

3919 msgid "report all attributes set on file"

@@ -3882,7 +3931,7 @@ msgstr "llegeix els noms de fitxer d'stdin"

3931 msgid "terminate input and output records by a NUL character"

3932 msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"

3933

3885 -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3934 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

3935 msgid "suppress progress reporting"

3936 msgstr "omet el reportatge de progrés"

3937

@@ -3968,6 +4017,8 @@ msgid "write the content to temporary files"

4017 msgstr "escriu el contingut a fitxers temporals"

4018

4019 #: builtin/checkout-index.c:204 builtin/column.c:30

4020 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4021 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4022 msgid "string"

4023 msgstr "cadena"

4024

@@ -3987,106 +4038,106 @@ msgstr "git checkout [<opcions>] <branca>"

4038 msgid "git checkout [<options>] [<branch>] -- <file>..."

4039 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."

4040

3990 -#: builtin/checkout.c:133 builtin/checkout.c:166

4041 +#: builtin/checkout.c:134 builtin/checkout.c:167

4042 #, c-format

4043 msgid "path '%s' does not have our version"

4044 msgstr "el camí '%s' no té la versió nostra"

4045

3995 -#: builtin/checkout.c:135 builtin/checkout.c:168

4046 +#: builtin/checkout.c:136 builtin/checkout.c:169

4047 #, c-format

4048 msgid "path '%s' does not have their version"

4049 msgstr "el camí '%s' no té la versió seva"

4050

4000 -#: builtin/checkout.c:151

4051 +#: builtin/checkout.c:152

4052 #, c-format

4053 msgid "path '%s' does not have all necessary versions"

4054 msgstr "el camí '%s' no té totes les versions necessàries"

4055

4005 -#: builtin/checkout.c:195

4056 +#: builtin/checkout.c:196

4057 #, c-format

4058 msgid "path '%s' does not have necessary versions"

4059 msgstr "el camí '%s' no té les versions necessàries"

4060

4010 -#: builtin/checkout.c:212

4061 +#: builtin/checkout.c:213

4062 #, c-format

4063 msgid "path '%s': cannot merge"

4064 msgstr "camí '%s': no es pot fusionar"

4065

4015 -#: builtin/checkout.c:229

4066 +#: builtin/checkout.c:230

4067 #, c-format

4068 msgid "Unable to add merge result for '%s'"

4069 msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"

4070

4020 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4021 -#: builtin/checkout.c:259

4071 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4072 +#: builtin/checkout.c:260

4073 #, c-format

4074 msgid "'%s' cannot be used with updating paths"

4075 msgstr "'%s' no es pot usar amb actualització de camins"

4076

4026 -#: builtin/checkout.c:262 builtin/checkout.c:265

4077 +#: builtin/checkout.c:263 builtin/checkout.c:266

4078 #, c-format

4079 msgid "'%s' cannot be used with %s"

4080 msgstr "'%s' no es pot usar amb %s"

4081

4031 -#: builtin/checkout.c:268

4082 +#: builtin/checkout.c:269

4083 #, c-format

4084 msgid "Cannot update paths and switch to branch '%s' at the same time."

4085 msgstr ""

4086 "No es pot actualitzar els camins i canviar a la branca '%s' a la vegada."

4087

4037 -#: builtin/checkout.c:279 builtin/checkout.c:473

4088 +#: builtin/checkout.c:280 builtin/checkout.c:474

4089 msgid "corrupt index file"

4090 msgstr "fitxer d'índex malmès"

4091

4041 -#: builtin/checkout.c:339 builtin/checkout.c:346

4092 +#: builtin/checkout.c:340 builtin/checkout.c:347

4093 #, c-format

4094 msgid "path '%s' is unmerged"

4095 msgstr "el camí '%s' està sense fusionar"

4096

4046 -#: builtin/checkout.c:495

4097 +#: builtin/checkout.c:496

4098 msgid "you need to resolve your current index first"

4099 msgstr "heu de resoldre el vostre índex actual primer"

4100

4050 -#: builtin/checkout.c:622

4101 +#: builtin/checkout.c:623

4102 #, c-format

4103 msgid "Can not do reflog for '%s': %s\n"

4104 msgstr "No es pot fer reflog per a '%s': %s\n"

4105

4055 -#: builtin/checkout.c:660

4106 +#: builtin/checkout.c:661

4107 msgid "HEAD is now at"

4108 msgstr "HEAD ara és a"

4109

4059 -#: builtin/checkout.c:667

4110 +#: builtin/checkout.c:668

4111 #, c-format

4112 msgid "Reset branch '%s'\n"

4113 msgstr "Restableix la branca '%s'\n"

4114

4064 -#: builtin/checkout.c:670

4115 +#: builtin/checkout.c:671

4116 #, c-format

4117 msgid "Already on '%s'\n"

4118 msgstr "Ja en '%s'\n"

4119

4069 -#: builtin/checkout.c:674

4120 +#: builtin/checkout.c:675

4121 #, c-format

4122 msgid "Switched to and reset branch '%s'\n"

4123 msgstr "S'ha agafat i restablert la branca '%s'\n"

4124

4074 -#: builtin/checkout.c:676 builtin/checkout.c:1065

4125 +#: builtin/checkout.c:677 builtin/checkout.c:1066

4126 #, c-format

4127 msgid "Switched to a new branch '%s'\n"

4128 msgstr "S'ha agafat la branca nova '%s'\n"

4129

4079 -#: builtin/checkout.c:678

4130 +#: builtin/checkout.c:679

4131 #, c-format

4132 msgid "Switched to branch '%s'\n"

4133 msgstr "S'ha agafat la branca '%s'\n"

4134

4084 -#: builtin/checkout.c:730

4135 +#: builtin/checkout.c:731

4136 #, c-format

4137 msgid " ... and %d more.\n"

4138 msgstr " ... i %d més.\n"

4139

4089 -#: builtin/checkout.c:736

4140 +#: builtin/checkout.c:737

4141 #, c-format

4142 msgid ""

4143 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -4109,7 +4160,7 @@ msgstr[1] ""

4160 "\n"

4161 "%s\n"

4162

4112 -#: builtin/checkout.c:755

4163 +#: builtin/checkout.c:756

4164 #, c-format

4165 msgid ""

4166 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4136,144 +4187,150 @@ msgstr[1] ""

4187 " git branch <nom-de-branca-nova> %s\n"

4188 "\n"

4189

4139 -#: builtin/checkout.c:791

4190 +#: builtin/checkout.c:792

4191 msgid "internal error in revision walk"

4192 msgstr "error intern en el passeig per revisions"

4193

4143 -#: builtin/checkout.c:795

4194 +#: builtin/checkout.c:796

4195 msgid "Previous HEAD position was"

4196 msgstr "La posició de HEAD anterior era"

4197

4147 -#: builtin/checkout.c:822 builtin/checkout.c:1060

4198 +#: builtin/checkout.c:823 builtin/checkout.c:1061

4199 msgid "You are on a branch yet to be born"

4200 msgstr "Sou en una branca que encara ha de nàixer"

4201

4151 -#: builtin/checkout.c:967

4202 +#: builtin/checkout.c:968

4203 #, c-format

4204 msgid "only one reference expected, %d given."

4205 msgstr "només una referència esperada, %d donades."

4206

4156 -#: builtin/checkout.c:1006 builtin/worktree.c:210

4207 +#: builtin/checkout.c:1007 builtin/worktree.c:213

4208 #, c-format

4209 msgid "invalid reference: %s"

4210 msgstr "referència no vàlida: %s"

4211

4161 -#: builtin/checkout.c:1035

4212 +#: builtin/checkout.c:1036

4213 #, c-format

4214 msgid "reference is not a tree: %s"

4215 msgstr "la referència no és un arbre: %s"

4216

4166 -#: builtin/checkout.c:1074

4217 +#: builtin/checkout.c:1075

4218 msgid "paths cannot be used with switching branches"

4219 msgstr "els camins no es poden usar amb canvi de branca"

4220

4170 -#: builtin/checkout.c:1077 builtin/checkout.c:1081

4221 +#: builtin/checkout.c:1078 builtin/checkout.c:1082

4222 #, c-format

4223 msgid "'%s' cannot be used with switching branches"

4224 msgstr "'%s' no es pot usar amb canvi de branca"

4225

4175 -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4176 -#: builtin/checkout.c:1096

4226 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4227 +#: builtin/checkout.c:1097

4228 #, c-format

4229 msgid "'%s' cannot be used with '%s'"

4230 msgstr "'%s' no es pot usar amb '%s'"

4231

4181 -#: builtin/checkout.c:1101

4232 +#: builtin/checkout.c:1102

4233 #, c-format

4234 msgid "Cannot switch branch to a non-commit '%s'"

4235 msgstr "No es pot canviar la branca a la no comissió '%s'"

4236

4186 -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4187 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4188 -#: builtin/worktree.c:319

4237 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4238 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4239 +#: builtin/worktree.c:322

4240 msgid "branch"

4241 msgstr "branca"

4242

4192 -#: builtin/checkout.c:1135

4243 +#: builtin/checkout.c:1136

4244 msgid "create and checkout a new branch"

4245 msgstr "crea i agafa una branca nova"

4246

4196 -#: builtin/checkout.c:1137

4247 +#: builtin/checkout.c:1138

4248 msgid "create/reset and checkout a branch"

4249 msgstr "crea/restableix i agafa una branca"

4250

4200 -#: builtin/checkout.c:1138

4251 +#: builtin/checkout.c:1139

4252 msgid "create reflog for new branch"

4253 msgstr "crea un registre de referència per a la branca nova"

4254

4204 -#: builtin/checkout.c:1139

4255 +#: builtin/checkout.c:1140

4256 msgid "detach the HEAD at named commit"

4257 msgstr "separa el HEAD a la comissió anomenada"

4258

4208 -#: builtin/checkout.c:1140

4259 +#: builtin/checkout.c:1141

4260 msgid "set upstream info for new branch"

4261 msgstr "estableix la informació de font de la branca nova"

4262

4212 -#: builtin/checkout.c:1142

4263 +#: builtin/checkout.c:1143

4264 msgid "new-branch"

4265 msgstr "branca-nova"

4266

4216 -#: builtin/checkout.c:1142

4267 +#: builtin/checkout.c:1143

4268 msgid "new unparented branch"

4269 msgstr "branca òrfena nova"

4270

4220 -#: builtin/checkout.c:1143

4271 +#: builtin/checkout.c:1144

4272 msgid "checkout our version for unmerged files"

4273 msgstr "agafa la versió nostra dels fitxers sense fusionar"

4274

4224 -#: builtin/checkout.c:1145

4275 +#: builtin/checkout.c:1146

4276 msgid "checkout their version for unmerged files"

4277 msgstr "agafa la versió seva dels fitxers sense fusionar"

4278

4228 -#: builtin/checkout.c:1147

4279 +#: builtin/checkout.c:1148

4280 msgid "force checkout (throw away local modifications)"

4281 msgstr "agafa a la força (descarta qualsevulla modificació local)"

4282

4232 -#: builtin/checkout.c:1148

4283 +#: builtin/checkout.c:1149

4284 msgid "perform a 3-way merge with the new branch"

4285 msgstr "realitza una fusió de 3 vies amb la branca nova"

4286

4236 -#: builtin/checkout.c:1149 builtin/merge.c:227

4287 +#: builtin/checkout.c:1150 builtin/merge.c:227

4288 msgid "update ignored files (default)"

4289 msgstr "actualitza els fitxers ignorats (per defecte)"

4290

4240 -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4291 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4292 msgid "style"

4293 msgstr "estil"

4294

4244 -#: builtin/checkout.c:1151

4295 +#: builtin/checkout.c:1152

4296 msgid "conflict style (merge or diff3)"

4297 msgstr "estil de conflicte (fusió o diff3)"

4298

4248 -#: builtin/checkout.c:1154

4299 +#: builtin/checkout.c:1155

4300 msgid "do not limit pathspecs to sparse entries only"

4301 msgstr "no limitis les especificacions de camí només a entrades disperses"

4302

4252 -#: builtin/checkout.c:1156

4303 +#: builtin/checkout.c:1157

4304 msgid "second guess 'git checkout <no-such-branch>'"

4305 msgstr "dubta 'git checkout <cap-branca-així>'"

4306

4256 -#: builtin/checkout.c:1158

4307 +#: builtin/checkout.c:1159

4308 msgid "do not check if another worktree is holding the given ref"

4309 msgstr "no comprovis si altre arbre de treball té la referència donada"

4310

4260 -#: builtin/checkout.c:1181

4311 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4312 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4313 +#: builtin/send-pack.c:168

4314 +msgid "force progress reporting"

4315 +msgstr "força l'informe de progrés"

4316 +

4317 +#: builtin/checkout.c:1191

4318 msgid "-b, -B and --orphan are mutually exclusive"

4319 msgstr "-b, -B i --orphan són mutualment exclusius"

4320

4264 -#: builtin/checkout.c:1198

4321 +#: builtin/checkout.c:1208

4322 msgid "--track needs a branch name"

4323 msgstr "--track necessita un nom de branca"

4324

4268 -#: builtin/checkout.c:1203

4325 +#: builtin/checkout.c:1213

4326 msgid "Missing branch name; try -b"

4327 msgstr "Manca el nom de branca; proveu -b"

4328

4272 -#: builtin/checkout.c:1239

4329 +#: builtin/checkout.c:1249

4330 msgid "invalid path specification"

4331 msgstr "especificació de camí no vàlida"

4332

4276 -#: builtin/checkout.c:1246

4333 +#: builtin/checkout.c:1256

4334 #, c-format

4335 msgid ""

4336 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4282,12 +4339,12 @@ msgstr ""

4339 "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"

4340 "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"

4341

4285 -#: builtin/checkout.c:1251

4342 +#: builtin/checkout.c:1261

4343 #, c-format

4344 msgid "git checkout: --detach does not take a path argument '%s'"

4345 msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"

4346

4290 -#: builtin/checkout.c:1255

4347 +#: builtin/checkout.c:1265

4348 msgid ""

4349 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4350 "checking out of the index."

@@ -4326,7 +4383,7 @@ msgstr "Saltaria el dipòsit %s\n"

4383 msgid "failed to remove %s"

4384 msgstr "s'ha fallat en eliminar %s"

4385

4329 -#: builtin/clean.c:317

4386 +#: builtin/clean.c:315

4387 msgid ""

4388 "Prompt help:\n"

4389 "1 - select a numbered item\n"

@@ -4338,7 +4395,7 @@ msgstr ""

4395 "foo - selecciona un ítem basat en un prefix únic\n"

4396 " - (buit) no seleccionis res"

4397

4341 -#: builtin/clean.c:321

4398 +#: builtin/clean.c:319

4399 msgid ""

4400 "Prompt help:\n"

4401 "1 - select a single item\n"

@@ -4358,36 +4415,36 @@ msgstr ""

4415 "* - tria tots els ítems\n"

4416 " - (buit) finalitza la selecció"

4417

4361 -#: builtin/clean.c:537

4418 +#: builtin/clean.c:535

4419 #, c-format

4420 msgid "Huh (%s)?"

4421 msgstr "Perdó (%s)?"

4422

4366 -#: builtin/clean.c:679

4423 +#: builtin/clean.c:677

4424 #, c-format

4425 msgid "Input ignore patterns>> "

4426 msgstr "Introduïu els patrons a ignorar>> "

4427

4371 -#: builtin/clean.c:716

4428 +#: builtin/clean.c:714

4429 #, c-format

4430 msgid "WARNING: Cannot find items matched by: %s"

4431 msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s"

4432

4376 -#: builtin/clean.c:737

4433 +#: builtin/clean.c:735

4434 msgid "Select items to delete"

4435 msgstr "Selecciona els ítems a suprimir"

4436

4437 #. TRANSLATORS: Make sure to keep [y/N] as is

4381 -#: builtin/clean.c:778

4438 +#: builtin/clean.c:776

4439 #, c-format

4440 msgid "Remove %s [y/N]? "

4441 msgstr "Voleu eliminar %s [y/N]? "

4442

4386 -#: builtin/clean.c:803

4443 +#: builtin/clean.c:801

4444 msgid "Bye."

4445 msgstr "Adéu."

4446

4390 -#: builtin/clean.c:811

4447 +#: builtin/clean.c:809

4448 msgid ""

4449 "clean - start cleaning\n"

4450 "filter by pattern - exclude items from deletion\n"

@@ -4405,62 +4462,62 @@ msgstr ""

4462 "help - aquesta pantalla\n"

4463 "? - ajuda de selecció de l'avís"

4464

4408 -#: builtin/clean.c:838

4465 +#: builtin/clean.c:836

4466 msgid "*** Commands ***"

4467 msgstr "*** Ordres ***"

4468

4412 -#: builtin/clean.c:839

4469 +#: builtin/clean.c:837

4470 msgid "What now"

4471 msgstr "I ara què"

4472

4416 -#: builtin/clean.c:847

4473 +#: builtin/clean.c:845

4474 msgid "Would remove the following item:"

4475 msgid_plural "Would remove the following items:"

4476 msgstr[0] "Eliminaria l'ítem següent:"

4477 msgstr[1] "Eliminaria els ítems següents:"

4478

4422 -#: builtin/clean.c:864

4479 +#: builtin/clean.c:862

4480 msgid "No more files to clean, exiting."

4481 msgstr "No hi ha més fitxers a netejar; sortint."

4482

4426 -#: builtin/clean.c:895

4483 +#: builtin/clean.c:893

4484 msgid "do not print names of files removed"

4485 msgstr "no imprimeixis els noms dels fitxers eliminats"

4486

4430 -#: builtin/clean.c:897

4487 +#: builtin/clean.c:895

4488 msgid "force"

4489 msgstr "força"

4490

4434 -#: builtin/clean.c:898

4491 +#: builtin/clean.c:896

4492 msgid "interactive cleaning"

4493 msgstr "neteja interactiva"

4494

4438 -#: builtin/clean.c:900

4495 +#: builtin/clean.c:898

4496 msgid "remove whole directories"

4497 msgstr "elimina directoris sencers"

4498

4442 -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4443 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4499 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4500 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4501 msgid "pattern"

4502 msgstr "patró"

4503

4447 -#: builtin/clean.c:902

4504 +#: builtin/clean.c:900

4505 msgid "add <pattern> to ignore rules"

4506 msgstr "afegiu <patró> per a ignorar les regles"

4507

4451 -#: builtin/clean.c:903

4508 +#: builtin/clean.c:901

4509 msgid "remove ignored files, too"

4510 msgstr "elimina els fitxers ignorats, també"

4511

4455 -#: builtin/clean.c:905

4512 +#: builtin/clean.c:903

4513 msgid "remove only ignored files"

4514 msgstr "elimina només els fitxers ignorats"

4515

4459 -#: builtin/clean.c:923

4516 +#: builtin/clean.c:921

4517 msgid "-x and -X cannot be used together"

4518 msgstr "-x i -X no es poden usar junts"

4519

4463 -#: builtin/clean.c:927

4520 +#: builtin/clean.c:925

4521 msgid ""

4522 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4523 "clean"

@@ -4468,7 +4525,7 @@ msgstr ""

4525 "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; "

4526 "refusant netejar"

4527

4471 -#: builtin/clean.c:930

4528 +#: builtin/clean.c:928

4529 msgid ""

4530 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4531 "refusing to clean"

@@ -4480,16 +4537,11 @@ msgstr ""

4537 msgid "git clone [<options>] [--] <repo> [<dir>]"

4538 msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"

4539

4483 -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4484 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4485 -msgid "force progress reporting"

4486 -msgstr "força l'informe de progrés"

4487 -

4540 #: builtin/clone.c:59

4541 msgid "don't create a checkout"

4490 -msgstr "no facis cap agafada"

4542 +msgstr "no facis cap agafament"

4543

4492 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4544 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4545 msgid "create a bare repository"

4546 msgstr "crea un dipòsit nu"

4547

@@ -4513,15 +4565,15 @@ msgstr "configura com a dipòsit compartit"

4565 msgid "initialize submodules in the clone"

4566 msgstr "inicialitza els submòduls en el clon"

4567

4516 -#: builtin/clone.c:75 builtin/init-db.c:501

4568 +#: builtin/clone.c:75 builtin/init-db.c:466

4569 msgid "template-directory"

4570 msgstr "directori-de-plantilla"

4571

4520 -#: builtin/clone.c:76 builtin/init-db.c:502

4572 +#: builtin/clone.c:76 builtin/init-db.c:467

4573 msgid "directory from which templates will be used"

4574 msgstr "directori del qual les plantilles s'usaran"

4575

4524 -#: builtin/clone.c:78

4576 +#: builtin/clone.c:78 builtin/submodule--helper.c:179

4577 msgid "reference repository"

4578 msgstr "dipòsit de referència"

4579

@@ -4545,7 +4597,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot"

4597 msgid "path to git-upload-pack on the remote"

4598 msgstr "camí a git-upload-pack en el remot"

4599

4548 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186

4600 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186

4601 msgid "depth"

4602 msgstr "profunditat"

4603

@@ -4557,11 +4609,11 @@ msgstr "crea un clon superficial de tal profunditat"

4609 msgid "clone only one branch, HEAD or --branch"

4610 msgstr "clona només una branca, HEAD o --branch"

4611

4560 -#: builtin/clone.c:91 builtin/init-db.c:510

4612 +#: builtin/clone.c:91 builtin/init-db.c:475

4613 msgid "gitdir"

4614 msgstr "directori de git"

4615

4564 -#: builtin/clone.c:92 builtin/init-db.c:511

4616 +#: builtin/clone.c:92 builtin/init-db.c:476

4617 msgid "separate git dir from working tree"

4618 msgstr "separa el directori de git de l'arbre de treball"

4619

@@ -4573,178 +4625,181 @@ msgstr "clau=valor"

4625 msgid "set config inside the new repository"

4626 msgstr "estableix la configuració dins del dipòsit nou"

4627

4576 -#: builtin/clone.c:298

4628 +#: builtin/clone.c:300

4629 +#, c-format

4630 +msgid "reference repository '%s' as a linked checkout is not supported yet."

4631 +msgstr ""

4632 +"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."

4633 +

4634 +#: builtin/clone.c:302

4635 #, c-format

4636 msgid "reference repository '%s' is not a local repository."

4637 msgstr "el dipòsit de referència '%s' no és un dipòsit local."

4638

4581 -#: builtin/clone.c:302

4639 +#: builtin/clone.c:307

4640 #, c-format

4641 msgid "reference repository '%s' is shallow"

4642 msgstr "el dipòsit de referència '%s' és superficial"

4643

4586 -#: builtin/clone.c:305

4644 +#: builtin/clone.c:310

4645 #, c-format

4646 msgid "reference repository '%s' is grafted"

4647 msgstr "el dipòsit de referència '%s' és empeltat"

4648

4591 -#: builtin/clone.c:370 builtin/diff.c:84

4649 +#: builtin/clone.c:375 builtin/diff.c:84

4650 #, c-format

4651 msgid "failed to stat '%s'"

4652 msgstr "s'ha fallat en fer stat a '%s'"

4653

4596 -#: builtin/clone.c:372

4654 +#: builtin/clone.c:377

4655 #, c-format

4656 msgid "%s exists and is not a directory"

4657 msgstr "%s existeix i no és directori"

4658

4601 -#: builtin/clone.c:386

4659 +#: builtin/clone.c:391

4660 #, c-format

4661 msgid "failed to stat %s\n"

4662 msgstr "s'ha fallat en fer stat a '%s'\n"

4663

4606 -#: builtin/clone.c:408

4664 +#: builtin/clone.c:413

4665 #, c-format

4666 msgid "failed to create link '%s'"

4667 msgstr "s'ha fallat en crear l'enllaç '%s'"

4668

4611 -#: builtin/clone.c:412

4669 +#: builtin/clone.c:417

4670 #, c-format

4671 msgid "failed to copy file to '%s'"

4672 msgstr "s'ha fallat en copiar el fitxer a '%s'"

4673

4616 -#: builtin/clone.c:435 builtin/clone.c:619

4674 +#: builtin/clone.c:442 builtin/clone.c:626

4675 #, c-format

4676 msgid "done.\n"

4677 msgstr "fet.\n"

4678

4621 -#: builtin/clone.c:447

4679 +#: builtin/clone.c:454

4680 msgid ""

4681 "Clone succeeded, but checkout failed.\n"

4682 "You can inspect what was checked out with 'git status'\n"

4683 "and retry the checkout with 'git checkout -f HEAD'\n"

4684 msgstr ""

4627 -"La clonació ha tingut èxit, però l'agafada ha fallat.\n"

4628 -"Podeu inspeccionar què s'ha agafat amb 'git status' i\n"

4629 -"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"

4685 +"La clonació ha tingut èxit, però l'agafament ha\n"

4686 +"fallat. Podeu inspeccionar què s'ha agafat amb\n"

4687 +"'git status' i tornar a intentar l'agafament amb\n"

4688 +"'git checkout -f HEAD'\n"

4689

4631 -#: builtin/clone.c:524

4690 +#: builtin/clone.c:531

4691 #, c-format

4692 msgid "Could not find remote branch %s to clone."

4693 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."

4694

4636 -#: builtin/clone.c:614

4695 +#: builtin/clone.c:621

4696 #, c-format

4697 msgid "Checking connectivity... "

4698 msgstr "Provant connectivitat... "

4699

4641 -#: builtin/clone.c:617

4700 +#: builtin/clone.c:624

4701 msgid "remote did not send all necessary objects"

4702 msgstr "el remot no ha enviat tots els objectes necessaris"

4703

4645 -#: builtin/clone.c:681

4704 +#: builtin/clone.c:688

4705 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4706 msgstr ""

4707 "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "

4708 "agafar.\n"

4709

4651 -#: builtin/clone.c:712

4710 +#: builtin/clone.c:719

4711 msgid "unable to checkout working tree"

4712 msgstr "no s'ha pogut agafar l'arbre de treball"

4713

4655 -#: builtin/clone.c:799

4714 +#: builtin/clone.c:808

4715 msgid "cannot repack to clean up"

4716 msgstr "no es pot reempaquetar per a netejar"

4717

4659 -#: builtin/clone.c:801

4718 +#: builtin/clone.c:810

4719 msgid "cannot unlink temporary alternates file"

4720 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"

4721

4663 -#: builtin/clone.c:831

4722 +#: builtin/clone.c:842

4723 msgid "Too many arguments."

4724 msgstr "Hi ha massa paràmetres."

4725

4667 -#: builtin/clone.c:835

4726 +#: builtin/clone.c:846

4727 msgid "You must specify a repository to clone."

4728 msgstr "Heu d'especificar un dipòsit per a clonar."

4729

4671 -#: builtin/clone.c:846

4730 +#: builtin/clone.c:857

4731 #, c-format

4732 msgid "--bare and --origin %s options are incompatible."

4733 msgstr "les opcions --bare i --origin %s són incompatibles."

4734

4676 -#: builtin/clone.c:849

4735 +#: builtin/clone.c:860

4736 msgid "--bare and --separate-git-dir are incompatible."

4737 msgstr "--bare i --separate-git-dir són incompatibles."

4738

4680 -#: builtin/clone.c:862

4739 +#: builtin/clone.c:873

4740 #, c-format

4741 msgid "repository '%s' does not exist"

4742 msgstr "el dipòsit '%s' no existeix"

4743

4685 -#: builtin/clone.c:868 builtin/fetch.c:1168

4744 +#: builtin/clone.c:879 builtin/fetch.c:1166

4745 #, c-format

4746 msgid "depth %s is not a positive number"

4747 msgstr "la profunditat %s no és nombre positiu"

4748

4690 -#: builtin/clone.c:878

4749 +#: builtin/clone.c:889

4750 #, c-format

4751 msgid "destination path '%s' already exists and is not an empty directory."

4752 msgstr "el camí destí '%s' ja existeix i no és un directori buit."

4753

4695 -#: builtin/clone.c:888

4754 +#: builtin/clone.c:899

4755 #, c-format

4756 msgid "working tree '%s' already exists."

4757 msgstr "l'arbre de treball '%s' ja existeix."

4758

4700 -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4701 -#: builtin/worktree.c:245

4759 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4760 +#: builtin/worktree.c:221 builtin/worktree.c:248

4761 #, c-format

4762 msgid "could not create leading directories of '%s'"

4763 msgstr "no s'ha pogut crear els directoris inicials de '%s'"

4764

4706 -#: builtin/clone.c:906

4765 +#: builtin/clone.c:917

4766 #, c-format

4767 msgid "could not create work tree dir '%s'"

4768 msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"

4769

4711 -#: builtin/clone.c:924

4770 +#: builtin/clone.c:935

4771 #, c-format

4772 msgid "Cloning into bare repository '%s'...\n"

4773 msgstr "Clonant al dipòsit nu '%s'...\n"

4774

4716 -#: builtin/clone.c:926

4775 +#: builtin/clone.c:937

4776 #, c-format

4777 msgid "Cloning into '%s'...\n"

4778 msgstr "Clonant a '%s'...\n"

4779

4721 -#: builtin/clone.c:951

4722 -msgid "--dissociate given, but there is no --reference"

4723 -msgstr "s'ha donat --dissociate, però no hi ha --reference"

4724 -

4725 -#: builtin/clone.c:968

4780 +#: builtin/clone.c:975

4781 msgid "--depth is ignored in local clones; use file:// instead."

4782 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."

4783

4729 -#: builtin/clone.c:971

4784 +#: builtin/clone.c:978

4785 msgid "source repository is shallow, ignoring --local"

4786 msgstr "el dipòsit font és superficial, ignorant --local"

4787

4733 -#: builtin/clone.c:976

4788 +#: builtin/clone.c:983

4789 msgid "--local is ignored"

4790 msgstr "--local s'ignora"

4791

4737 -#: builtin/clone.c:980

4792 +#: builtin/clone.c:987

4793 #, c-format

4794 msgid "Don't know how to clone %s"

4795 msgstr "No se sap com clonar %s"

4796

4742 -#: builtin/clone.c:1029 builtin/clone.c:1037

4797 +#: builtin/clone.c:1036 builtin/clone.c:1044

4798 #, c-format

4799 msgid "Remote branch %s not found in upstream %s"

4800 msgstr "La branca remota %s no es troba en la font %s"

4801

4747 -#: builtin/clone.c:1040

4802 +#: builtin/clone.c:1047

4803 msgid "You appear to have cloned an empty repository."

4804 msgstr "Sembla que heu clonat un dipòsit buit."

4805

@@ -4780,15 +4835,15 @@ msgstr "Espai d'encoixinada entre columnes"

4835 msgid "--command must be the first argument"

4836 msgstr "--command ha de ser el primer paràmetre"

4837

4783 -#: builtin/commit.c:37

4838 +#: builtin/commit.c:38

4839 msgid "git commit [<options>] [--] <pathspec>..."

4840 msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."

4841

4787 -#: builtin/commit.c:42

4842 +#: builtin/commit.c:43

4843 msgid "git status [<options>] [--] <pathspec>..."

4844 msgstr "git status [<opcions>] [--] <especificació-de-camí>..."

4845

4791 -#: builtin/commit.c:47

4846 +#: builtin/commit.c:48

4847 msgid ""

4848 "Your name and email address were configured automatically based\n"

4849 "on your username and hostname. Please check that they are accurate.\n"

@@ -4815,7 +4870,7 @@ msgstr ""

4870 "\n"

4871 " git commit --amend --reset-author\n"

4872

4818 -#: builtin/commit.c:60

4873 +#: builtin/commit.c:61

4874 msgid ""

4875 "Your name and email address were configured automatically based\n"

4876 "on your username and hostname. Please check that they are accurate.\n"

@@ -4841,7 +4896,7 @@ msgstr ""

4896 "\n"

4897 " git commit --amend --reset-author\n"

4898

4844 -#: builtin/commit.c:72

4899 +#: builtin/commit.c:73

4900 msgid ""

4901 "You asked to amend the most recent commit, but doing so would make\n"

4902 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4851,7 +4906,7 @@ msgstr ""

4906 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"

4907 "podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"

4908

4854 -#: builtin/commit.c:77

4909 +#: builtin/commit.c:78

4910 msgid ""

4911 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4912 "If you wish to commit it anyway, use:\n"

@@ -4866,11 +4921,11 @@ msgstr ""

4921 " git commit --allow-empty\n"

4922 "\n"

4923

4869 -#: builtin/commit.c:84

4924 +#: builtin/commit.c:85

4925 msgid "Otherwise, please use 'git reset'\n"

4926 msgstr "D'altra manera, si us plau, useu 'git reset'\n"

4927

4873 -#: builtin/commit.c:87

4928 +#: builtin/commit.c:88

4929 msgid ""

4930 "If you wish to skip this commit, use:\n"

4931 "\n"

@@ -4886,66 +4941,66 @@ msgstr ""

4941 "Llavors \"git cherry-pick --continue\" reprendrà recollint\n"

4942 "com a cireres les comissions restants.\n"

4943

4889 -#: builtin/commit.c:304

4944 +#: builtin/commit.c:305

4945 msgid "failed to unpack HEAD tree object"

4946 msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"

4947

4893 -#: builtin/commit.c:345

4948 +#: builtin/commit.c:346

4949 msgid "unable to create temporary index"

4950 msgstr "no s'ha pogut crear un índex temporal"

4951

4897 -#: builtin/commit.c:351

4952 +#: builtin/commit.c:352

4953 msgid "interactive add failed"

4954 msgstr "l'afegiment interactiu ha fallat"

4955

4901 -#: builtin/commit.c:364

4956 +#: builtin/commit.c:365

4957 msgid "unable to update temporary index"

4958 msgstr "no s'ha pogut actualitzar l'índex temporal"

4959

4905 -#: builtin/commit.c:366

4960 +#: builtin/commit.c:367

4961 msgid "Failed to update main cache tree"

4962 msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"

4963

4909 -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4964 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

4965 msgid "unable to write new_index file"

4966 msgstr "no s'ha pogut escriure el fitxer new_index"

4967

4913 -#: builtin/commit.c:444

4968 +#: builtin/commit.c:445

4969 msgid "cannot do a partial commit during a merge."

4970 msgstr "no es pot fer una comissió parcial durant una fusió."

4971

4917 -#: builtin/commit.c:446

4972 +#: builtin/commit.c:447

4973 msgid "cannot do a partial commit during a cherry-pick."

4974 msgstr "no es pot fer una comissió parcial durant un recull de cireres."

4975

4921 -#: builtin/commit.c:455

4976 +#: builtin/commit.c:456

4977 msgid "cannot read the index"

4978 msgstr "no es pot llegir l'índex"

4979

4925 -#: builtin/commit.c:474

4980 +#: builtin/commit.c:475

4981 msgid "unable to write temporary index file"

4982 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"

4983

4929 -#: builtin/commit.c:579

4984 +#: builtin/commit.c:580

4985 #, c-format

4986 msgid "commit '%s' lacks author header"

4987 msgstr "a la comissió '%s' li manca la capçalera d'autor"

4988

4934 -#: builtin/commit.c:581

4989 +#: builtin/commit.c:582

4990 #, c-format

4991 msgid "commit '%s' has malformed author line"

4992 msgstr "la comissió '%s' té una línia d'autor mal formada"

4993

4939 -#: builtin/commit.c:600

4994 +#: builtin/commit.c:601

4995 msgid "malformed --author parameter"

4996 msgstr "paràmetre --author mal format"

4997

4943 -#: builtin/commit.c:608

4998 +#: builtin/commit.c:609

4999 #, c-format

5000 msgid "invalid date format: %s"

5001 msgstr "format de data no vàlid: %s"

5002

4948 -#: builtin/commit.c:652

5003 +#: builtin/commit.c:653

5004 msgid ""

5005 "unable to select a comment character that is not used\n"

5006 "in the current commit message"

@@ -4953,38 +5008,38 @@ msgstr ""

5008 "no es pot seleccionar un caràcter de comentari que\n"

5009 "no sigui usat en el missatge de comissió actual"

5010

4956 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

5011 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5012 #, c-format

5013 msgid "could not lookup commit %s"

5014 msgstr "no s'ha pogut trobar la comissió %s"

5015

4961 -#: builtin/commit.c:701 builtin/shortlog.c:273

5016 +#: builtin/commit.c:702 builtin/shortlog.c:273

5017 #, c-format

5018 msgid "(reading log message from standard input)\n"

5019 msgstr "(llegint el missatge de registre des de l'entrada estàndard)\n"

5020

4966 -#: builtin/commit.c:703

5021 +#: builtin/commit.c:704

5022 msgid "could not read log from standard input"

5023 msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"

5024

4970 -#: builtin/commit.c:707

5025 +#: builtin/commit.c:708

5026 #, c-format

5027 msgid "could not read log file '%s'"

5028 msgstr "no s'ha pogut llegir el fitxer de registre '%s'"

5029

4975 -#: builtin/commit.c:729

5030 +#: builtin/commit.c:730

5031 msgid "could not read MERGE_MSG"

5032 msgstr "no s'ha pogut llegir MERGE_MSG"

5033

4979 -#: builtin/commit.c:733

5034 +#: builtin/commit.c:734

5035 msgid "could not read SQUASH_MSG"

5036 msgstr "no s'ha pogut llegir SQUASH_MSG"

5037

4983 -#: builtin/commit.c:784

5038 +#: builtin/commit.c:785

5039 msgid "could not write commit template"

5040 msgstr "no s'ha pogut escriure la plantilla de comissió"

5041

4987 -#: builtin/commit.c:802

5042 +#: builtin/commit.c:803

5043 #, c-format

5044 msgid ""

5045 "\n"

@@ -4999,7 +5054,7 @@ msgstr ""

5054 "\t%s\n"

5055 "i intenteu-ho de nou.\n"

5056

5002 -#: builtin/commit.c:807

5057 +#: builtin/commit.c:808

5058 #, c-format

5059 msgid ""

5060 "\n"

@@ -5014,7 +5069,7 @@ msgstr ""

5069 "\t%s\n"

5070 "i intenteu-ho de nou.\n"

5071

5017 -#: builtin/commit.c:820

5072 +#: builtin/commit.c:821

5073 #, c-format

5074 msgid ""

5075 "Please enter the commit message for your changes. Lines starting\n"

@@ -5024,7 +5079,7 @@ msgstr ""

5079 "S'ignoraran les línies començant amb '%c', i un missatge de\n"

5080 "comissió buit avorta la comissió.\n"

5081

5027 -#: builtin/commit.c:827

5082 +#: builtin/commit.c:828

5083 #, c-format

5084 msgid ""

5085 "Please enter the commit message for your changes. Lines starting\n"

@@ -5035,148 +5090,149 @@ msgstr ""

5090 "Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n"

5091 "mateix si voleu. Un missatge buit avorta la comissió.\n"

5092

5038 -#: builtin/commit.c:847

5093 +#: builtin/commit.c:848

5094 #, c-format

5095 msgid "%sAuthor: %.*s <%.*s>"

5096 msgstr "%sAutor: %.*s <%.*s>"

5097

5043 -#: builtin/commit.c:855

5098 +#: builtin/commit.c:856

5099 #, c-format

5100 msgid "%sDate: %s"

5101 msgstr "%sData: %s"

5102

5048 -#: builtin/commit.c:862

5103 +#: builtin/commit.c:863

5104 #, c-format

5105 msgid "%sCommitter: %.*s <%.*s>"

5106 msgstr "%sComitent: %.*s <%.*s>"

5107

5053 -#: builtin/commit.c:880

5108 +#: builtin/commit.c:881

5109 msgid "Cannot read index"

5110 msgstr "No es pot llegir l'índex"

5111

5057 -#: builtin/commit.c:937

5112 +#: builtin/commit.c:938

5113 msgid "Error building trees"

5114 msgstr "Error en construir arbres"

5115

5061 -#: builtin/commit.c:952 builtin/tag.c:495

5116 +#: builtin/commit.c:953 builtin/tag.c:266

5117 #, c-format

5118 msgid "Please supply the message using either -m or -F option.\n"

5119 msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"

5120

5066 -#: builtin/commit.c:1054

5121 +#: builtin/commit.c:1055

5122 #, c-format

5123 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5124 msgstr ""

5125 "--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"

5126 "cap autor existent"

5127

5073 -#: builtin/commit.c:1069 builtin/commit.c:1309

5128 +#: builtin/commit.c:1070 builtin/commit.c:1310

5129 #, c-format

5130 msgid "Invalid untracked files mode '%s'"

5131 msgstr "Mode de fitxers no seguits no vàlid '%s'"

5132

5078 -#: builtin/commit.c:1106

5133 +#: builtin/commit.c:1107

5134 msgid "--long and -z are incompatible"

5135 msgstr "--long i -z són incompatibles"

5136

5082 -#: builtin/commit.c:1136

5137 +#: builtin/commit.c:1137

5138 msgid "Using both --reset-author and --author does not make sense"

5139 msgstr "Usar ambdós --reset-author i --author no té sentit"

5140

5086 -#: builtin/commit.c:1145

5141 +#: builtin/commit.c:1146

5142 msgid "You have nothing to amend."

5143 msgstr "No teniu res a esmenar."

5144

5090 -#: builtin/commit.c:1148

5145 +#: builtin/commit.c:1149

5146 msgid "You are in the middle of a merge -- cannot amend."

5147 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."

5148

5094 -#: builtin/commit.c:1150

5149 +#: builtin/commit.c:1151

5150 msgid "You are in the middle of a cherry-pick -- cannot amend."

5151 msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar."

5152

5098 -#: builtin/commit.c:1153

5153 +#: builtin/commit.c:1154

5154 msgid "Options --squash and --fixup cannot be used together"

5155 msgstr "Les opcions --squash i --fixup no es poden usar juntes"

5156

5102 -#: builtin/commit.c:1163

5157 +#: builtin/commit.c:1164

5158 msgid "Only one of -c/-C/-F/--fixup can be used."

5159 msgstr "Només un de -c/-C/-F/--fixup es pot usar."

5160

5106 -#: builtin/commit.c:1165

5161 +#: builtin/commit.c:1166

5162 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5163 msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."

5164

5110 -#: builtin/commit.c:1173

5165 +#: builtin/commit.c:1174

5166 msgid "--reset-author can be used only with -C, -c or --amend."

5167 msgstr "--reset-author només es pot usar amb -C, -c o --amend."

5168

5114 -#: builtin/commit.c:1190

5169 +#: builtin/commit.c:1191

5170 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5171 msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."

5172

5118 -#: builtin/commit.c:1192

5173 +#: builtin/commit.c:1193

5174 msgid "No paths with --include/--only does not make sense."

5175 msgstr "--include/--only no té sentit sense camí."

5176

5122 -#: builtin/commit.c:1194

5177 +#: builtin/commit.c:1195

5178 msgid "Clever... amending the last one with dirty index."

5179 msgstr "Intel·ligent... esmenant l'últim amb índex brut."

5180

5126 -#: builtin/commit.c:1196

5181 +#: builtin/commit.c:1197

5182 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5183 msgstr ""

5184 "S'han especificat camins explícits sense -i o -o; presumint camins --only..."

5185

5131 -#: builtin/commit.c:1208 builtin/tag.c:730

5186 +#: builtin/commit.c:1209 builtin/tag.c:475

5187 #, c-format

5188 msgid "Invalid cleanup mode %s"

5189 msgstr "Mode de neteja no vàlid %s"

5190

5136 -#: builtin/commit.c:1213

5191 +#: builtin/commit.c:1214

5192 msgid "Paths with -a does not make sense."

5193 msgstr "-a no té sentit amb camins."

5194

5140 -#: builtin/commit.c:1323 builtin/commit.c:1602

5195 +#: builtin/commit.c:1324 builtin/commit.c:1605

5196 msgid "show status concisely"

5197 msgstr "mostra l'estat concisament"

5198

5144 -#: builtin/commit.c:1325 builtin/commit.c:1604

5199 +#: builtin/commit.c:1326 builtin/commit.c:1607

5200 msgid "show branch information"

5201 msgstr "mostra la informació de branca"

5202

5148 -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5203 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5204 +#: builtin/worktree.c:423

5205 msgid "machine-readable output"

5206 msgstr "sortida llegible per màquina"

5207

5152 -#: builtin/commit.c:1330 builtin/commit.c:1608

5208 +#: builtin/commit.c:1331 builtin/commit.c:1611

5209 msgid "show status in long format (default)"

5210 msgstr "mostra l'estat en format llarg (per defecte)"

5211

5156 -#: builtin/commit.c:1333 builtin/commit.c:1611

5212 +#: builtin/commit.c:1334 builtin/commit.c:1614

5213 msgid "terminate entries with NUL"

5214 msgstr "acaba les entrades amb NUL"

5215

5160 -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5161 -#: builtin/fast-export.c:984 builtin/tag.c:604

5216 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5217 +#: builtin/fast-export.c:984 builtin/tag.c:353

5218 msgid "mode"

5219 msgstr "mode"

5220

5165 -#: builtin/commit.c:1336 builtin/commit.c:1614

5221 +#: builtin/commit.c:1337 builtin/commit.c:1617

5222 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5223 msgstr ""

5224 "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "

5225 "defecte: all)"

5226

5171 -#: builtin/commit.c:1339

5227 +#: builtin/commit.c:1340

5228 msgid "show ignored files"

5229 msgstr "mostra els fitxers ignorats"

5230

5175 -#: builtin/commit.c:1340 parse-options.h:155

5231 +#: builtin/commit.c:1341 parse-options.h:155

5232 msgid "when"

5233 msgstr "quan"

5234

5179 -#: builtin/commit.c:1341

5235 +#: builtin/commit.c:1342

5236 msgid ""

5237 "ignore changes to submodules, optional when: all, dirty, untracked. "

5238 "(Default: all)"

@@ -5184,197 +5240,202 @@ msgstr ""

5240 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "

5241 "defecte: all)"

5242

5187 -#: builtin/commit.c:1343

5243 +#: builtin/commit.c:1344

5244 msgid "list untracked files in columns"

5245 msgstr "mostra els fitxers no seguits en columnes"

5246

5191 -#: builtin/commit.c:1429

5247 +#: builtin/commit.c:1430

5248 msgid "couldn't look up newly created commit"

5249 msgstr "no s'ha pogut trobar la comissió novament creada"

5250

5195 -#: builtin/commit.c:1431

5251 +#: builtin/commit.c:1432

5252 msgid "could not parse newly created commit"

5253 msgstr "no s'ha pogut analitzar la comissió novament creada"

5254

5199 -#: builtin/commit.c:1476

5255 +#: builtin/commit.c:1477

5256 msgid "detached HEAD"

5257 msgstr "HEAD separat"

5258

5203 -#: builtin/commit.c:1479

5259 +#: builtin/commit.c:1480

5260 msgid " (root-commit)"

5261 msgstr " (comissió d'arrel)"

5262

5207 -#: builtin/commit.c:1572

5263 +#: builtin/commit.c:1575

5264 msgid "suppress summary after successful commit"

5265 msgstr "omet el resum després d'una comissió reeixida"

5266

5211 -#: builtin/commit.c:1573

5267 +#: builtin/commit.c:1576

5268 msgid "show diff in commit message template"

5269 msgstr "mostra la diferència en la plantilla de missatge de comissió"

5270

5215 -#: builtin/commit.c:1575

5271 +#: builtin/commit.c:1578

5272 msgid "Commit message options"

5273 msgstr "Opcions de missatge de comissió"

5274

5219 -#: builtin/commit.c:1576 builtin/tag.c:602

5275 +#: builtin/commit.c:1579 builtin/tag.c:351

5276 msgid "read message from file"

5277 msgstr "llegiu el missatge des d'un fitxer"

5278

5223 -#: builtin/commit.c:1577

5279 +#: builtin/commit.c:1580

5280 msgid "author"

5281 msgstr "autor"

5282

5227 -#: builtin/commit.c:1577

5283 +#: builtin/commit.c:1580

5284 msgid "override author for commit"

5285 msgstr "autor corregit de la comissió"

5286

5231 -#: builtin/commit.c:1578 builtin/gc.c:268

5287 +#: builtin/commit.c:1581 builtin/gc.c:326

5288 msgid "date"

5289 msgstr "data"

5290

5235 -#: builtin/commit.c:1578

5291 +#: builtin/commit.c:1581

5292 msgid "override date for commit"

5293 msgstr "data corregida de la comissió"

5294

5239 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5240 -#: builtin/notes.c:555 builtin/tag.c:600

5295 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5296 +#: builtin/notes.c:555 builtin/tag.c:349

5297 msgid "message"

5298 msgstr "missatge"

5299

5244 -#: builtin/commit.c:1579

5300 +#: builtin/commit.c:1582

5301 msgid "commit message"

5302 msgstr "missatge de comissió"

5303

5248 -#: builtin/commit.c:1580

5304 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5305 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5306 +msgid "commit"

5307 +msgstr "comissió"

5308 +

5309 +#: builtin/commit.c:1583

5310 msgid "reuse and edit message from specified commit"

5311 msgstr "reusa i edita el missatge de la comissió especificada"

5312

5252 -#: builtin/commit.c:1581

5313 +#: builtin/commit.c:1584

5314 msgid "reuse message from specified commit"

5315 msgstr "reusa el missatge de la comissió especificada"

5316

5256 -#: builtin/commit.c:1582

5317 +#: builtin/commit.c:1585

5318 msgid "use autosquash formatted message to fixup specified commit"

5319 msgstr ""

5320 "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "

5321 "especificada"

5322

5262 -#: builtin/commit.c:1583

5323 +#: builtin/commit.c:1586

5324 msgid "use autosquash formatted message to squash specified commit"

5325 msgstr ""

5326 "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "

5327 "especificada"

5328

5268 -#: builtin/commit.c:1584

5329 +#: builtin/commit.c:1587

5330 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5331 msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"

5332

5272 -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5333 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5334 msgid "add Signed-off-by:"

5335 msgstr "afegeix Signed-off-by:"

5336

5276 -#: builtin/commit.c:1586

5337 +#: builtin/commit.c:1589

5338 msgid "use specified template file"

5339 msgstr "usa el fitxer de plantilla especificat"

5340

5280 -#: builtin/commit.c:1587

5341 +#: builtin/commit.c:1590

5342 msgid "force edit of commit"

5343 msgstr "força l'edició de la comissió"

5344

5284 -#: builtin/commit.c:1588

5345 +#: builtin/commit.c:1591

5346 msgid "default"

5347 msgstr "per defecte"

5348

5288 -#: builtin/commit.c:1588 builtin/tag.c:605

5349 +#: builtin/commit.c:1591 builtin/tag.c:354

5350 msgid "how to strip spaces and #comments from message"

5351 msgstr "com despullar els espais i #comentaris del missatge"

5352

5292 -#: builtin/commit.c:1589

5353 +#: builtin/commit.c:1592

5354 msgid "include status in commit message template"

5355 msgstr "inclou l'estat en la plantilla de missatge de comissió"

5356

5296 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5357 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5358 #: builtin/revert.c:93

5359 msgid "GPG sign commit"

5360 msgstr "firma la comissió amb GPG"

5361

5301 -#: builtin/commit.c:1594

5362 +#: builtin/commit.c:1597

5363 msgid "Commit contents options"

5364 msgstr "Opcions dels continguts de les comissions"

5365

5305 -#: builtin/commit.c:1595

5366 +#: builtin/commit.c:1598

5367 msgid "commit all changed files"

5368 msgstr "comet tots els fitxers canviats"

5369

5309 -#: builtin/commit.c:1596

5370 +#: builtin/commit.c:1599

5371 msgid "add specified files to index for commit"

5372 msgstr "afegeix els fitxers especificats a l'índex per a cometre"

5373

5313 -#: builtin/commit.c:1597

5374 +#: builtin/commit.c:1600

5375 msgid "interactively add files"

5376 msgstr "afegeix els fitxers interactivament"

5377

5317 -#: builtin/commit.c:1598

5378 +#: builtin/commit.c:1601

5379 msgid "interactively add changes"

5380 msgstr "afegeix els canvis interactivament"

5381

5321 -#: builtin/commit.c:1599

5382 +#: builtin/commit.c:1602

5383 msgid "commit only specified files"

5384 msgstr "comet només els fitxers especificats"

5385

5325 -#: builtin/commit.c:1600

5386 +#: builtin/commit.c:1603

5387 msgid "bypass pre-commit hook"

5388 msgstr "evita el ganxo de precomissió"

5389

5329 -#: builtin/commit.c:1601

5390 +#: builtin/commit.c:1604

5391 msgid "show what would be committed"

5392 msgstr "mostra què es cometria"

5393

5333 -#: builtin/commit.c:1612

5394 +#: builtin/commit.c:1615

5395 msgid "amend previous commit"

5396 msgstr "esmena la comissió anterior"

5397

5337 -#: builtin/commit.c:1613

5398 +#: builtin/commit.c:1616

5399 msgid "bypass post-rewrite hook"

5400 msgstr "evita el ganxo de postreescriure"

5401

5341 -#: builtin/commit.c:1618

5402 +#: builtin/commit.c:1621

5403 msgid "ok to record an empty change"

5404 msgstr "està bé registrar un canvi buit"

5405

5345 -#: builtin/commit.c:1620

5406 +#: builtin/commit.c:1623

5407 msgid "ok to record a change with an empty message"

5408 msgstr "està bé registrar un canvi amb missatge buit"

5409

5349 -#: builtin/commit.c:1649

5410 +#: builtin/commit.c:1652

5411 msgid "could not parse HEAD commit"

5412 msgstr "no s'ha pogut analitzar la comissió HEAD"

5413

5353 -#: builtin/commit.c:1695

5414 +#: builtin/commit.c:1698

5415 #, c-format

5416 msgid "Corrupt MERGE_HEAD file (%s)"

5417 msgstr "Fitxer MERGE_HEAD malmès (%s)"

5418

5358 -#: builtin/commit.c:1702

5419 +#: builtin/commit.c:1705

5420 msgid "could not read MERGE_MODE"

5421 msgstr "no s'ha pogut llegir MERGE_MODE"

5422

5362 -#: builtin/commit.c:1721

5423 +#: builtin/commit.c:1724

5424 #, c-format

5425 msgid "could not read commit message: %s"

5426 msgstr "no s'ha pogut llegir el missatge de comissió: %s"

5427

5367 -#: builtin/commit.c:1732

5428 +#: builtin/commit.c:1735

5429 #, c-format

5430 msgid "Aborting commit; you did not edit the message.\n"

5431 msgstr "Avortant la comissió; no heu editat el missatge.\n"

5432

5372 -#: builtin/commit.c:1737

5433 +#: builtin/commit.c:1740

5434 #, c-format

5435 msgid "Aborting commit due to empty commit message.\n"

5436 msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n"

5437

5377 -#: builtin/commit.c:1785

5438 +#: builtin/commit.c:1788

5439 msgid ""

5440 "Repository has been updated, but unable to write\n"

5441 "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"

5575 msgid "respect include directives on lookup"

5576 msgstr "respecta les directives d'inclusió en cercar"

5577

5517 -#: builtin/config.c:311

5578 +#: builtin/config.c:303

5579 msgid "unable to parse default color value"

5580 msgstr "no s'ha pogut analitzar el valor de color per defecte"

5581

5521 -#: builtin/config.c:449

5582 +#: builtin/config.c:441

5583 #, c-format

5584 msgid ""

5585 "# This is Git's per-user configuration file.\n"

@@ -5533,16 +5594,16 @@ msgstr ""

5594 "#\tname = %s\n"

5595 "#\temail = %s\n"

5596

5536 -#: builtin/config.c:583

5597 +#: builtin/config.c:575

5598 #, c-format

5599 msgid "cannot create configuration file %s"

5600 msgstr "no es pot crear el fitxer de configuració '%s'"

5601

5541 -#: builtin/count-objects.c:55

5602 +#: builtin/count-objects.c:77

5603 msgid "git count-objects [-v] [-H | --human-readable]"

5604 msgstr "git count-objects [-v] [-H | --human-readable]"

5605

5545 -#: builtin/count-objects.c:65

5606 +#: builtin/count-objects.c:87

5607 msgid "print sizes in human readable format"

5608 msgstr "imprimeix les mides en un format llegible pels humans"

5609

@@ -5662,7 +5723,7 @@ msgstr "considera les <n> etiquetes més recents (per defecte: 10)"

5723 msgid "only consider tags matching <pattern>"

5724 msgstr "només considera les etiquetes que coincideixen amb <patró>"

5725

5665 -#: builtin/describe.c:410 builtin/name-rev.c:318

5726 +#: builtin/describe.c:410 builtin/name-rev.c:314

5727 msgid "show abbreviated commit object as fallback"

5728 msgstr "mostra l'objecte de comissió abreviat com a retrocediment"

5729

@@ -5839,7 +5900,7 @@ msgstr "aprofundeix la història d'un clon superficial"

5900 msgid "convert to a complete repository"

5901 msgstr "converteix en un dipòsit complet"

5902

5842 -#: builtin/fetch.c:118 builtin/log.c:1233

5903 +#: builtin/fetch.c:118 builtin/log.c:1232

5904 msgid "dir"

5905 msgstr "directori"

5906

@@ -5881,7 +5942,7 @@ msgstr "[al dia]"

5942 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5943 msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)"

5944

5884 -#: builtin/fetch.c:478 builtin/fetch.c:564

5945 +#: builtin/fetch.c:478 builtin/fetch.c:566

5946 msgid "[rejected]"

5947 msgstr "[rebutjat]"

5948

@@ -5905,40 +5966,40 @@ msgstr "[branca nova]"

5966 msgid "[new ref]"

5967 msgstr "[referència nova]"

5968

5908 -#: builtin/fetch.c:560

5969 +#: builtin/fetch.c:561

5970 msgid "unable to update local ref"

5971 msgstr "no s'ha pogut actualitzar la referència local"

5972

5912 -#: builtin/fetch.c:560

5973 +#: builtin/fetch.c:561

5974 msgid "forced update"

5975 msgstr "actualització forçada"

5976

5916 -#: builtin/fetch.c:566

5977 +#: builtin/fetch.c:568

5978 msgid "(non-fast-forward)"

5979 msgstr "(sense avanç ràpid)"

5980

5920 -#: builtin/fetch.c:600 builtin/fetch.c:842

5981 +#: builtin/fetch.c:602 builtin/fetch.c:843

5982 #, c-format

5983 msgid "cannot open %s: %s\n"

5984 msgstr "no es pot obrir %s: %s\n"

5985

5925 -#: builtin/fetch.c:609

5986 +#: builtin/fetch.c:611

5987 #, c-format

5988 msgid "%s did not send all necessary objects\n"

5989 msgstr "%s no ha enviat tots els objectes necessaris\n"

5990

5930 -#: builtin/fetch.c:627

5991 +#: builtin/fetch.c:629

5992 #, c-format

5993 msgid "reject %s because shallow roots are not allowed to be updated"

5994 msgstr ""

5995 "rebutja %s perquè no es permet que les arrels superficials s'actualitzin"

5996

5936 -#: builtin/fetch.c:715 builtin/fetch.c:807

5997 +#: builtin/fetch.c:716 builtin/fetch.c:808

5998 #, c-format

5999 msgid "From %.*s\n"

6000 msgstr "De %.*s\n"

6001

5941 -#: builtin/fetch.c:726

6002 +#: builtin/fetch.c:727

6003 #, c-format

6004 msgid ""

6005 "some local refs could not be updated; try running\n"

@@ -5948,55 +6009,55 @@ msgstr ""

6009 " intenteu executar 'git remote prune %s' per a eliminar\n"

6010 " qualsevulla branca antiga o conflictiva"

6011

5951 -#: builtin/fetch.c:778

6012 +#: builtin/fetch.c:779

6013 #, c-format

6014 msgid " (%s will become dangling)"

6015 msgstr " (%s es tornarà penjant)"

6016

5956 -#: builtin/fetch.c:779

6017 +#: builtin/fetch.c:780

6018 #, c-format

6019 msgid " (%s has become dangling)"

6020 msgstr " (%s s'ha tornat penjant)"

6021

5961 -#: builtin/fetch.c:811

6022 +#: builtin/fetch.c:812

6023 msgid "[deleted]"

6024 msgstr "[suprimit]"

6025

5965 -#: builtin/fetch.c:812 builtin/remote.c:1034

6026 +#: builtin/fetch.c:813 builtin/remote.c:1040

6027 msgid "(none)"

6028 msgstr "(cap)"

6029

5969 -#: builtin/fetch.c:832

6030 +#: builtin/fetch.c:833

6031 #, c-format

6032 msgid "Refusing to fetch into current branch %s of non-bare repository"

6033 msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu"

6034

5974 -#: builtin/fetch.c:851

6035 +#: builtin/fetch.c:852

6036 #, c-format

6037 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6038 msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"

6039

5979 -#: builtin/fetch.c:854

6040 +#: builtin/fetch.c:855

6041 #, c-format

6042 msgid "Option \"%s\" is ignored for %s\n"

6043 msgstr "S'ignora l'opció \"%s\" per a %s\n"

6044

5984 -#: builtin/fetch.c:910

6045 +#: builtin/fetch.c:911

6046 #, c-format

6047 msgid "Don't know how to fetch from %s"

6048 msgstr "No se sap com obtenir de %s"

6049

5989 -#: builtin/fetch.c:1071

6050 +#: builtin/fetch.c:1072

6051 #, c-format

6052 msgid "Fetching %s\n"

6053 msgstr "Obtenint %s\n"

6054

5994 -#: builtin/fetch.c:1073 builtin/remote.c:90

6055 +#: builtin/fetch.c:1074 builtin/remote.c:96

6056 #, c-format

6057 msgid "Could not fetch %s"

6058 msgstr "No s'ha pogut obtenir %s"

6059

5999 -#: builtin/fetch.c:1091

6060 +#: builtin/fetch.c:1092

6061 msgid ""

6062 "No remote repository specified. Please, specify either a URL or a\n"

6063 "remote name from which new revisions should be fetched."

@@ -6004,32 +6065,32 @@ msgstr ""

6065 "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"

6066 "un nom remot del qual es deuen obtenir les revisions noves."

6067

6007 -#: builtin/fetch.c:1114

6068 +#: builtin/fetch.c:1115

6069 msgid "You need to specify a tag name."

6070 msgstr "Necessiteu especificar un nom d'etiqueta."

6071

6011 -#: builtin/fetch.c:1156

6072 +#: builtin/fetch.c:1157

6073 msgid "--depth and --unshallow cannot be used together"

6074 msgstr "--depth i --unshallow no es poden usar junts"

6075

6015 -#: builtin/fetch.c:1158

6076 +#: builtin/fetch.c:1159

6077 msgid "--unshallow on a complete repository does not make sense"

6078 msgstr "--unshallow en un dipòsit complet no té sentit"

6079

6019 -#: builtin/fetch.c:1181

6080 +#: builtin/fetch.c:1179

6081 msgid "fetch --all does not take a repository argument"

6082 msgstr "fetch --all no accepta un paràmetre de dipòsit"

6083

6023 -#: builtin/fetch.c:1183

6084 +#: builtin/fetch.c:1181

6085 msgid "fetch --all does not make sense with refspecs"

6086 msgstr "fetch --all no té sentit amb especificacions de referència"

6087

6027 -#: builtin/fetch.c:1194

6088 +#: builtin/fetch.c:1192

6089 #, c-format

6090 msgid "No such remote or remote group: %s"

6091 msgstr "No hi ha tal remot ni tal grup remot: %s"

6092

6032 -#: builtin/fetch.c:1202

6093 +#: builtin/fetch.c:1200

6094 msgid "Fetching a group and specifying refspecs does not make sense"

6095 msgstr "Obtenir un grup i especificar referències no té sentit"

6096

@@ -6039,23 +6100,23 @@ msgid ""

6100 msgstr ""

6101 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"

6102

6042 -#: builtin/fmt-merge-msg.c:670

6103 +#: builtin/fmt-merge-msg.c:667

6104 msgid "populate log with at most <n> entries from shortlog"

6105 msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"

6106

6046 -#: builtin/fmt-merge-msg.c:673

6107 +#: builtin/fmt-merge-msg.c:670

6108 msgid "alias for --log (deprecated)"

6109 msgstr "àlies per --log (desaprovat)"

6110

6050 -#: builtin/fmt-merge-msg.c:676

6111 +#: builtin/fmt-merge-msg.c:673

6112 msgid "text"

6113 msgstr "text"

6114

6054 -#: builtin/fmt-merge-msg.c:677

6115 +#: builtin/fmt-merge-msg.c:674

6116 msgid "use <text> as start of message"

6117 msgstr "usa <text> com a inici de missatge"

6118

6058 -#: builtin/fmt-merge-msg.c:678

6119 +#: builtin/fmt-merge-msg.c:675

6120 msgid "file to read from"

6121 msgstr "fitxer del qual llegir"

6122

@@ -6063,97 +6124,117 @@ msgstr "fitxer del qual llegir"

6124 msgid "git for-each-ref [<options>] [<pattern>]"

6125 msgstr "git for-each-ref [<opcions>] [<patró>]"

6126

6066 -#: builtin/for-each-ref.c:24

6127 +#: builtin/for-each-ref.c:10

6128 +msgid "git for-each-ref [--points-at <object>]"

6129 +msgstr "git for-each-ref [--points-at <objecte>]"

6130 +

6131 +#: builtin/for-each-ref.c:11

6132 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"

6133 +msgstr "git for-each-ref [(--merged | --no-merged) [<objecte>]]"

6134 +

6135 +#: builtin/for-each-ref.c:12

6136 +msgid "git for-each-ref [--contains [<object>]]"

6137 +msgstr "git for-each-ref [--contains [<objecte>]]"

6138 +

6139 +#: builtin/for-each-ref.c:27

6140 msgid "quote placeholders suitably for shells"

6141 msgstr ""

6142 "posa els marcadors de posició entre cometes de forma adequada per a "

6143 "intèrprets d'ordres"

6144

6072 -#: builtin/for-each-ref.c:26

6145 +#: builtin/for-each-ref.c:29

6146 msgid "quote placeholders suitably for perl"

6147 msgstr "posa els marcadors de posició entre cometes adequades per al perl"

6148

6076 -#: builtin/for-each-ref.c:28

6149 +#: builtin/for-each-ref.c:31

6150 msgid "quote placeholders suitably for python"

6151 msgstr "posa els marcadors de posició entre cometes adequades per al python"

6152

6080 -#: builtin/for-each-ref.c:30

6153 +#: builtin/for-each-ref.c:33

6154 msgid "quote placeholders suitably for Tcl"

6155 msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"

6156

6084 -#: builtin/for-each-ref.c:33

6157 +#: builtin/for-each-ref.c:36

6158 msgid "show only <n> matched refs"

6159 msgstr "mostra només <n> referències coincidents"

6160

6088 -#: builtin/for-each-ref.c:34

6161 +#: builtin/for-each-ref.c:37 builtin/tag.c:372

6162 msgid "format to use for the output"

6163 msgstr "format a usar en la sortida"

6164

6092 -#: builtin/for-each-ref.c:35

6093 -msgid "key"

6094 -msgstr "clau"

6165 +#: builtin/for-each-ref.c:41

6166 +msgid "print only refs which points at the given object"

6167 +msgstr "imprimeix només les referències que assenyalin l'objecte donat"

6168

6096 -#: builtin/for-each-ref.c:36

6097 -msgid "field name to sort on"

6098 -msgstr "nom de camp en el qual ordenar"

6169 +#: builtin/for-each-ref.c:43

6170 +msgid "print only refs that are merged"

6171 +msgstr "imprimeix només les referències que s'han fusionat"

6172 +

6173 +#: builtin/for-each-ref.c:44

6174 +msgid "print only refs that are not merged"

6175 +msgstr "imprimeix només les referències que no s'han fusionat"

6176

6100 -#: builtin/fsck.c:163 builtin/prune.c:137

6177 +#: builtin/for-each-ref.c:45

6178 +msgid "print only refs which contain the commit"

6179 +msgstr "imprimeix només les referències que continguin la comissió"

6180 +

6181 +#: builtin/fsck.c:156 builtin/prune.c:140

6182 msgid "Checking connectivity"

6183 msgstr "Comprovant connectivitat"

6184

6104 -#: builtin/fsck.c:568

6185 +#: builtin/fsck.c:486

6186 msgid "Checking object directories"

6187 msgstr "Comprovant els directoris d'objecte"

6188

6108 -#: builtin/fsck.c:631

6189 +#: builtin/fsck.c:553

6190 msgid "git fsck [<options>] [<object>...]"

6191 msgstr "git fsck [<opcions>] [<objecte>...]"

6192

6112 -#: builtin/fsck.c:637

6193 +#: builtin/fsck.c:559

6194 msgid "show unreachable objects"

6195 msgstr "mostra els objectes inabastables"

6196

6116 -#: builtin/fsck.c:638

6197 +#: builtin/fsck.c:560

6198 msgid "show dangling objects"

6199 msgstr "mostra els objectes penjants"

6200

6120 -#: builtin/fsck.c:639

6201 +#: builtin/fsck.c:561

6202 msgid "report tags"

6203 msgstr "informa de les etiquetes"

6204

6124 -#: builtin/fsck.c:640

6205 +#: builtin/fsck.c:562

6206 msgid "report root nodes"

6207 msgstr "informa dels nodes d'arrel"

6208

6128 -#: builtin/fsck.c:641

6209 +#: builtin/fsck.c:563

6210 msgid "make index objects head nodes"

6211 msgstr "fes els objectes d'índex nodes de cap"

6212

6132 -#: builtin/fsck.c:642

6213 +#: builtin/fsck.c:564

6214 msgid "make reflogs head nodes (default)"

6215 msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"

6216

6136 -#: builtin/fsck.c:643

6217 +#: builtin/fsck.c:565

6218 msgid "also consider packs and alternate objects"

6219 msgstr "també considera els paquets i els objectes alternatius"

6220

6140 -#: builtin/fsck.c:644

6221 +#: builtin/fsck.c:566

6222 msgid "check only connectivity"

6223 msgstr "comprova només la connectivitat"

6224

6144 -#: builtin/fsck.c:645

6225 +#: builtin/fsck.c:567

6226 msgid "enable more strict checking"

6227 msgstr "habilita la comprovació més estricta"

6228

6148 -#: builtin/fsck.c:647

6229 +#: builtin/fsck.c:569

6230 msgid "write dangling objects in .git/lost-found"

6231 msgstr "escriu objectes penjants a .git/lost-found"

6232

6152 -#: builtin/fsck.c:648 builtin/prune.c:107

6233 +#: builtin/fsck.c:570 builtin/prune.c:107

6234 msgid "show progress"

6235 msgstr "mostra el progrés"

6236

6156 -#: builtin/fsck.c:707

6237 +#: builtin/fsck.c:631

6238 msgid "Checking objects"

6239 msgstr "Comprovant els objectes"

6240

@@ -6161,56 +6242,71 @@ msgstr "Comprovant els objectes"

6242 msgid "git gc [<options>]"

6243 msgstr "git gc [<opcions>]"

6244

6164 -#: builtin/gc.c:55

6245 +#: builtin/gc.c:72

6246 #, c-format

6247 msgid "Invalid %s: '%s'"

6248 msgstr "%s no vàlid: %s"

6249

6169 -#: builtin/gc.c:100

6250 +#: builtin/gc.c:139

6251 #, c-format

6252 msgid "insanely long object directory %.*s"

6253 msgstr "directori d'objectes increïblement llarg %.*s"

6254

6174 -#: builtin/gc.c:269

6255 +#: builtin/gc.c:290

6256 +#, c-format

6257 +msgid ""

6258 +"The last gc run reported the following. Please correct the root cause\n"

6259 +"and remove %s.\n"

6260 +"Automatic cleanup will not be performed until the file is removed.\n"

6261 +"\n"

6262 +"%s"

6263 +msgstr ""

6264 +"L'última execució de gc ha informat d'ho següent. Si us plau, corregiu\n"

6265 +"la causa primordial i elimineu %s.\n"

6266 +"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"

6267 +"\n"

6268 +"%s"

6269 +

6270 +#: builtin/gc.c:327

6271 msgid "prune unreferenced objects"

6272 msgstr "poda objectes sense referència"

6273

6178 -#: builtin/gc.c:271

6274 +#: builtin/gc.c:329

6275 msgid "be more thorough (increased runtime)"

6276 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"

6277

6182 -#: builtin/gc.c:272

6278 +#: builtin/gc.c:330

6279 msgid "enable auto-gc mode"

6280 msgstr "habilita el mode de recollida d'escombraries automàtica"

6281

6186 -#: builtin/gc.c:273

6282 +#: builtin/gc.c:331

6283 msgid "force running gc even if there may be another gc running"

6284 msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"

6285

6190 -#: builtin/gc.c:315

6286 +#: builtin/gc.c:373

6287 #, c-format

6288 msgid "Auto packing the repository in background for optimum performance.\n"

6289 msgstr ""

6290 "Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n"

6291

6196 -#: builtin/gc.c:317

6292 +#: builtin/gc.c:375

6293 #, c-format

6294 msgid "Auto packing the repository for optimum performance.\n"

6295 msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n"

6296

6201 -#: builtin/gc.c:318

6297 +#: builtin/gc.c:376

6298 #, c-format

6299 msgid "See \"git help gc\" for manual housekeeping.\n"

6300 msgstr "Vegeu \"git help gc\" per neteja manual.\n"

6301

6206 -#: builtin/gc.c:336

6302 +#: builtin/gc.c:397

6303 #, c-format

6304 msgid ""

6305 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

6306 msgstr ""

6307 "gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"

6308

6213 -#: builtin/gc.c:364

6309 +#: builtin/gc.c:441

6310 msgid ""

6311 "There are too many unreachable loose objects; run 'git prune' to remove them."

6312 msgstr ""

@@ -6246,203 +6342,199 @@ msgstr "l'opció `%c' espera un valor numèric"

6342 msgid "cannot open '%s'"

6343 msgstr "no es pot obrir '%s'"

6344

6249 -#: builtin/grep.c:638

6345 +#: builtin/grep.c:633

6346 msgid "search in index instead of in the work tree"

6347 msgstr "cerca en l'índex en lloc de l'arbre de treball"

6348

6253 -#: builtin/grep.c:640

6349 +#: builtin/grep.c:635

6350 msgid "find in contents not managed by git"

6351 msgstr "cerca en continguts no gestionats per git"

6352

6257 -#: builtin/grep.c:642

6353 +#: builtin/grep.c:637

6354 msgid "search in both tracked and untracked files"

6355 msgstr "cerca tant en fitxers seguits com en no seguits"

6356

6261 -#: builtin/grep.c:644

6357 +#: builtin/grep.c:639

6358 msgid "ignore files specified via '.gitignore'"

6359 msgstr "ignora els fitxers especificats mitjançant '.gitignore'"

6360

6265 -#: builtin/grep.c:647

6361 +#: builtin/grep.c:642

6362 msgid "show non-matching lines"

6363 msgstr "mostra les línies no coincidents"

6364

6269 -#: builtin/grep.c:649

6365 +#: builtin/grep.c:644

6366 msgid "case insensitive matching"

6367 msgstr "coincidència insensible a majúscula i minúscula"

6368

6273 -#: builtin/grep.c:651

6369 +#: builtin/grep.c:646

6370 msgid "match patterns only at word boundaries"

6371 msgstr "coincideix amb els patrons només als límits de paraula"

6372

6277 -#: builtin/grep.c:653

6373 +#: builtin/grep.c:648

6374 msgid "process binary files as text"

6375 msgstr "processa els fitxers binaris com a text"

6376

6281 -#: builtin/grep.c:655

6377 +#: builtin/grep.c:650

6378 msgid "don't match patterns in binary files"

6379 msgstr "no coincideixis amb els patrons en els fitxers binaris"

6380

6285 -#: builtin/grep.c:658

6381 +#: builtin/grep.c:653

6382 msgid "process binary files with textconv filters"

6383 msgstr "processa els fitxers binaris amb filtres de textconv"

6384

6289 -#: builtin/grep.c:660

6385 +#: builtin/grep.c:655

6386 msgid "descend at most <depth> levels"

6387 msgstr "descendeix com a màxim <profunditat> nivells"

6388

6293 -#: builtin/grep.c:664

6389 +#: builtin/grep.c:659

6390 msgid "use extended POSIX regular expressions"

6391 msgstr "usa les expressions regulars POSIX esteses"

6392

6297 -#: builtin/grep.c:667

6393 +#: builtin/grep.c:662

6394 msgid "use basic POSIX regular expressions (default)"

6395 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"

6396

6301 -#: builtin/grep.c:670

6397 +#: builtin/grep.c:665

6398 msgid "interpret patterns as fixed strings"

6399 msgstr "interpreta els patrons com a cadenes fixes"

6400

6305 -#: builtin/grep.c:673

6401 +#: builtin/grep.c:668

6402 msgid "use Perl-compatible regular expressions"

6403 msgstr "usa les expressions regulars compatibles amb Perl"

6404

6309 -#: builtin/grep.c:676

6405 +#: builtin/grep.c:671

6406 msgid "show line numbers"

6407 msgstr "mostra els números de línia"

6408

6313 -#: builtin/grep.c:677

6409 +#: builtin/grep.c:672

6410 msgid "don't show filenames"

6411 msgstr "no mostris els noms de fitxer"

6412

l10n: ca.po: update translation