cdab3cacf6 · 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-06-27 19:17+0800\n"

11 -"PO-Revision-Date: 2015-07-01 22:21-0700\n"

10 +"POT-Creation-Date: 2015-07-14 07:19+0800\n"

11 +"PO-Revision-Date: 2015-07-20 11:54-0600\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.1\n"

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

20

21 #: advice.c:55

22 #, c-format

@@ -662,8 +662,8 @@ msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès"

662 msgid "failed to read the cache"

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

664

665 -#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

666 -#: builtin/clone.c:654

665 +#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

666 +#: builtin/clone.c:647

667 msgid "unable to write new index file"

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

669

@@ -710,7 +710,7 @@ msgstr "no es pot llegir l'objecte %s '%s'"

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

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

712

713 -#: merge-recursive.c:788 builtin/clone.c:313

713 +#: merge-recursive.c:788 builtin/clone.c:306

714 #, c-format

715 msgid "failed to open '%s'"

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

@@ -2047,7 +2047,7 @@ msgstr "no hi és"

2047 msgid "behind "

2048 msgstr "darrere "

2049

2050 -#: compat/precompose_utf8.c:55 builtin/clone.c:352

2050 +#: compat/precompose_utf8.c:55 builtin/clone.c:345

2051 #, c-format

2052 msgid "failed to unlink '%s'"

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

@@ -2126,7 +2126,7 @@ msgstr "sigues detallat"

2126 msgid "interactive picking"

2127 msgstr "recull interactiu"

2128

2129 -#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2129 +#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2130 msgid "select hunks interactively"

2131 msgstr "selecciona els trossos interactivament"

2132

@@ -2470,7 +2470,7 @@ msgstr "%s: el pedaç no aplica"

2470 msgid "Checking patch %s..."

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

2472

2473 -#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2473 +#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

2474 #, c-format

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

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

@@ -3179,7 +3179,7 @@ msgstr "llista les branques en columnes"

3179 msgid "Failed to resolve HEAD as a valid ref."

3180 msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."

3181

3182 -#: builtin/branch.c:878 builtin/clone.c:629

3182 +#: builtin/branch.c:878 builtin/clone.c:622

3183 msgid "HEAD not found below refs/heads!"

3184 msgstr "HEAD no trobat sota refs/heads!"

3185

@@ -3383,7 +3383,7 @@ msgstr "llegeix els noms de fitxer d'stdin"

3383 msgid "terminate input and output records by a NUL character"

3384 msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"

3385

3386 -#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3386 +#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3387 msgid "suppress progress reporting"

3388 msgstr "omet el reportatge de progrés"

3389

@@ -3480,114 +3480,114 @@ msgstr "en crear fitxers, anteposa <cadena>"

3480 msgid "copy out the files from named stage"

3481 msgstr "copia els fitxers des de l'etapa anomenada"

3482

3483 -#: builtin/checkout.c:26

3483 +#: builtin/checkout.c:24

3484 msgid "git checkout [<options>] <branch>"

3485 msgstr "git checkout [<opcions>] <branca>"

3486

3487 -#: builtin/checkout.c:27

3487 +#: builtin/checkout.c:25

3488 msgid "git checkout [<options>] [<branch>] -- <file>..."

3489 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."

3490

3491 -#: builtin/checkout.c:138 builtin/checkout.c:171

3491 +#: builtin/checkout.c:134 builtin/checkout.c:167

3492 #, c-format

3493 msgid "path '%s' does not have our version"

3494 msgstr "el camí '%s' no té la versió nostra"

3495

3496 -#: builtin/checkout.c:140 builtin/checkout.c:173

3496 +#: builtin/checkout.c:136 builtin/checkout.c:169

3497 #, c-format

3498 msgid "path '%s' does not have their version"

3499 msgstr "el camí '%s' no té la versió seva"

3500

3501 -#: builtin/checkout.c:156

3501 +#: builtin/checkout.c:152

3502 #, c-format

3503 msgid "path '%s' does not have all necessary versions"

3504 msgstr "el camí '%s' no té totes les versions necessàries"

3505

3506 -#: builtin/checkout.c:200

3506 +#: builtin/checkout.c:196

3507 #, c-format

3508 msgid "path '%s' does not have necessary versions"

3509 msgstr "el camí '%s' no té les versions necessàries"

3510

3511 -#: builtin/checkout.c:217

3511 +#: builtin/checkout.c:213

3512 #, c-format

3513 msgid "path '%s': cannot merge"

3514 msgstr "camí '%s': no es pot fusionar"

3515

3516 -#: builtin/checkout.c:234

3516 +#: builtin/checkout.c:230

3517 #, c-format

3518 msgid "Unable to add merge result for '%s'"

3519 msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"

3520

3521 -#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3522 -#: builtin/checkout.c:264 builtin/checkout.c:277

3521 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3522 +#: builtin/checkout.c:260

3523 #, c-format

3524 msgid "'%s' cannot be used with updating paths"

3525 msgstr "'%s' no es pot usar amb actualització de camins"

3526

3527 -#: builtin/checkout.c:267 builtin/checkout.c:270

3527 +#: builtin/checkout.c:263 builtin/checkout.c:266

3528 #, c-format

3529 msgid "'%s' cannot be used with %s"

3530 msgstr "'%s' no es pot usar amb %s"

3531

3532 -#: builtin/checkout.c:273

3532 +#: builtin/checkout.c:269

3533 #, c-format

3534 msgid "Cannot update paths and switch to branch '%s' at the same time."

3535 msgstr ""

3536 "No es pot actualitzar els camins i canviar a la branca '%s' a la vegada."

3537

3538 -#: builtin/checkout.c:287 builtin/checkout.c:481

3538 +#: builtin/checkout.c:280 builtin/checkout.c:474

3539 msgid "corrupt index file"

3540 msgstr "fitxer d'índex corrupte"

3541

3542 -#: builtin/checkout.c:347 builtin/checkout.c:354

3542 +#: builtin/checkout.c:340 builtin/checkout.c:347

3543 #, c-format

3544 msgid "path '%s' is unmerged"

3545 msgstr "el camí '%s' està sense fusionar"

3546

3547 -#: builtin/checkout.c:503

3547 +#: builtin/checkout.c:496

3548 msgid "you need to resolve your current index first"

3549 msgstr "heu de resoldre el vostre índex actual primer"

3550

3551 -#: builtin/checkout.c:634

3551 +#: builtin/checkout.c:627

3552 #, c-format

3553 msgid "Can not do reflog for '%s'\n"

3554 msgstr "No es pot fer reflog per a '%s'\n"

3555

3556 -#: builtin/checkout.c:670

3556 +#: builtin/checkout.c:663

3557 msgid "HEAD is now at"

3558 msgstr "HEAD ara és a"

3559

3560 -#: builtin/checkout.c:677

3560 +#: builtin/checkout.c:670

3561 #, c-format

3562 msgid "Reset branch '%s'\n"

3563 msgstr "Restableix la branca '%s'\n"

3564

3565 -#: builtin/checkout.c:680

3565 +#: builtin/checkout.c:673

3566 #, c-format

3567 msgid "Already on '%s'\n"

3568 msgstr "Ja en '%s'\n"

3569

3570 -#: builtin/checkout.c:684

3570 +#: builtin/checkout.c:677

3571 #, c-format

3572 msgid "Switched to and reset branch '%s'\n"

3573 msgstr "S'ha agafat i restablert la branca '%s'\n"

3574

3575 -#: builtin/checkout.c:686 builtin/checkout.c:1285

3575 +#: builtin/checkout.c:679 builtin/checkout.c:1134

3576 #, c-format

3577 msgid "Switched to a new branch '%s'\n"

3578 msgstr "S'ha agafat la branca nova '%s'\n"

3579

3580 -#: builtin/checkout.c:688

3580 +#: builtin/checkout.c:681

3581 #, c-format

3582 msgid "Switched to branch '%s'\n"

3583 msgstr "S'ha agafat la branca '%s'\n"

3584

3585 -#: builtin/checkout.c:740

3585 +#: builtin/checkout.c:733

3586 #, c-format

3587 msgid " ... and %d more.\n"

3588 msgstr " ... i %d més.\n"

3589

3590 -#: builtin/checkout.c:746

3590 +#: builtin/checkout.c:739

3591 #, c-format

3592 msgid ""

3593 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3610,7 +3610,7 @@ msgstr[1] ""

3610 "\n"

3611 "%s\n"

3612

3613 -#: builtin/checkout.c:765

3613 +#: builtin/checkout.c:758

3614 #, c-format

3615 msgid ""

3616 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -3637,177 +3637,149 @@ msgstr[1] ""

3637 " git branch <nom-de-branca-nova> %s\n"

3638 "\n"

3639

3640 -#: builtin/checkout.c:801

3640 +#: builtin/checkout.c:794

3641 msgid "internal error in revision walk"

3642 msgstr "error intern en el passeig per revisions"

3643

3644 -#: builtin/checkout.c:805

3644 +#: builtin/checkout.c:798

3645 msgid "Previous HEAD position was"

3646 msgstr "La posició de HEAD anterior era"

3647

3648 -#: builtin/checkout.c:832 builtin/checkout.c:1280

3648 +#: builtin/checkout.c:825 builtin/checkout.c:1129

3649 msgid "You are on a branch yet to be born"

3650 msgstr "Sou en una branca que encara ha de nàixer"

3651

3652 -#: builtin/checkout.c:893

3653 -msgid "no branch specified"

3654 -msgstr "cap branca especificada"

3655 -

3656 -#: builtin/checkout.c:895

3657 -#, c-format

3658 -msgid "'%s' already exists"

3659 -msgstr "'%s' ja existeix"

3660 -

3661 -#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3662 -#: builtin/clone.c:853

3663 -#, c-format

3664 -msgid "could not create leading directories of '%s'"

3665 -msgstr "no s'ha pogut crear els directoris inicials de '%s'"

3666 -

3667 -#: builtin/checkout.c:924

3668 -#, c-format

3669 -msgid "could not create directory of '%s'"

3670 -msgstr "no s'ha pogut crear directori de '%s'"

3671 -

3672 -#: builtin/checkout.c:960

3673 -#, c-format

3674 -msgid "Enter %s (identifier %s)"

3675 -msgstr "Introduïu %s (identificador %s)"

3676 -

3677 -#: builtin/checkout.c:1070

3652 +#: builtin/checkout.c:931

3653 #, c-format

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

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

3656

3682 -#: builtin/checkout.c:1176

3657 +#: builtin/checkout.c:1036

3658 #, c-format

3659 msgid "only one reference expected, %d given."

3660 msgstr "només una referència esperada, %d donades."

3661

3687 -#: builtin/checkout.c:1215

3662 +#: builtin/checkout.c:1075

3663 #, c-format

3664 msgid "invalid reference: %s"

3665 msgstr "referència no vàlida: %s"

3666

3692 -#: builtin/checkout.c:1255

3667 +#: builtin/checkout.c:1104

3668 #, c-format

3669 msgid "reference is not a tree: %s"

3670 msgstr "la referència no és un arbre: %s"

3671

3697 -#: builtin/checkout.c:1294

3672 +#: builtin/checkout.c:1143

3673 msgid "paths cannot be used with switching branches"

3674 msgstr "els camins no es poden usar amb canvi de branca"

3675

3701 -#: builtin/checkout.c:1297 builtin/checkout.c:1301

3676 +#: builtin/checkout.c:1146 builtin/checkout.c:1150

3677 #, c-format

3678 msgid "'%s' cannot be used with switching branches"

3679 msgstr "'%s' no es pot usar amb canvi de branca"

3680

3706 -#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3707 -#: builtin/checkout.c:1316

3681 +#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3682 +#: builtin/checkout.c:1165

3683 #, c-format

3684 msgid "'%s' cannot be used with '%s'"

3685 msgstr "'%s' no es pot usar amb '%s'"

3686

3712 -#: builtin/checkout.c:1321

3687 +#: builtin/checkout.c:1170

3688 #, c-format

3689 msgid "Cannot switch branch to a non-commit '%s'"

3690 msgstr "No es pot canviar la branca a una no comissió '%s'"

3691

3717 -#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3718 -#: builtin/remote.c:159 builtin/remote.c:161

3692 +#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3693 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3694 +#: builtin/worktree.c:284

3695 msgid "branch"

3696 msgstr "branca"

3697

3722 -#: builtin/checkout.c:1347

3698 +#: builtin/checkout.c:1204

3699 msgid "create and checkout a new branch"

3700 msgstr "crea i agafa una branca nova"

3701

3726 -#: builtin/checkout.c:1349

3702 +#: builtin/checkout.c:1206

3703 msgid "create/reset and checkout a branch"

3704 msgstr "crea/restableix i agafa una branca"

3705

3730 -#: builtin/checkout.c:1350

3706 +#: builtin/checkout.c:1207

3707 msgid "create reflog for new branch"

3708 msgstr "crea un registre de referència per a la branca nova"

3709

3734 -#: builtin/checkout.c:1351

3710 +#: builtin/checkout.c:1208

3711 msgid "detach the HEAD at named commit"

3712 msgstr "separa el HEAD a la comissió anomenada"

3713

3738 -#: builtin/checkout.c:1352

3714 +#: builtin/checkout.c:1209

3715 msgid "set upstream info for new branch"

3716 msgstr "estableix la informació de font de la branca nova"

3717

3742 -#: builtin/checkout.c:1354

3718 +#: builtin/checkout.c:1211

3719 msgid "new-branch"

3720 msgstr "branca-nova"

3721

3746 -#: builtin/checkout.c:1354

3722 +#: builtin/checkout.c:1211

3723 msgid "new unparented branch"

3724 msgstr "branca nova sense mare"

3725

3750 -#: builtin/checkout.c:1355

3726 +#: builtin/checkout.c:1212

3727 msgid "checkout our version for unmerged files"

3728 msgstr "agafa la versió nostra dels fitxers sense fusionar"

3729

3754 -#: builtin/checkout.c:1357

3730 +#: builtin/checkout.c:1214

3731 msgid "checkout their version for unmerged files"

3732 msgstr "agafa la versió seva dels fitxers sense fusionar"

3733

3758 -#: builtin/checkout.c:1359

3734 +#: builtin/checkout.c:1216

3735 msgid "force checkout (throw away local modifications)"

3736 msgstr "agafa a la força (descarta qualsevulles modificacions locals)"

3737

3762 -#: builtin/checkout.c:1360

3738 +#: builtin/checkout.c:1217

3739 msgid "perform a 3-way merge with the new branch"

3740 msgstr "realitza una fusió de 3 vies amb la branca nova"

3741

3766 -#: builtin/checkout.c:1361 builtin/merge.c:227

3742 +#: builtin/checkout.c:1218 builtin/merge.c:227

3743 msgid "update ignored files (default)"

3744 msgstr "actualitza els fitxers ignorats (per defecte)"

3745

3770 -#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3746 +#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

3747 msgid "style"

3748 msgstr "estil"

3749

3774 -#: builtin/checkout.c:1363

3750 +#: builtin/checkout.c:1220

3751 msgid "conflict style (merge or diff3)"

3752 msgstr "estil de conflicte (fusió o diff3)"

3753

3778 -#: builtin/checkout.c:1366

3754 +#: builtin/checkout.c:1223

3755 msgid "do not limit pathspecs to sparse entries only"

3756 msgstr "no limitis les especificacions de camí només a entrades escasses"

3757

3782 -#: builtin/checkout.c:1368

3758 +#: builtin/checkout.c:1225

3759 msgid "second guess 'git checkout <no-such-branch>'"

3760 msgstr "dubta 'git checkout <cap-branca-així>'"

3761

3786 -#: builtin/checkout.c:1370

3787 -msgid "check a branch out in a separate working directory"

3788 -msgstr "agafa una branca en un directori de treball separat"

3789 -

3790 -#: builtin/checkout.c:1372

3762 +#: builtin/checkout.c:1227

3763 msgid "do not check if another worktree is holding the given ref"

3764 msgstr "no comprovis si altre arbre de treball té la referència donada"

3765

3794 -#: builtin/checkout.c:1406

3766 +#: builtin/checkout.c:1252

3767 msgid "-b, -B and --orphan are mutually exclusive"

3768 msgstr "-b, -B i --orphan són mutualment exclusius"

3769

3798 -#: builtin/checkout.c:1423

3770 +#: builtin/checkout.c:1269

3771 msgid "--track needs a branch name"

3772 msgstr "--track necessita un nom de branca"

3773

3802 -#: builtin/checkout.c:1428

3774 +#: builtin/checkout.c:1274

3775 msgid "Missing branch name; try -b"

3776 msgstr "Manca el nom de branca; proveu -b"

3777

3806 -#: builtin/checkout.c:1464

3778 +#: builtin/checkout.c:1310

3779 msgid "invalid path specification"

3780 msgstr "especificació de camí no vàlida"

3781

3810 -#: builtin/checkout.c:1471

3782 +#: builtin/checkout.c:1317

3783 #, c-format

3784 msgid ""

3785 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3816,12 +3788,12 @@ msgstr ""

3788 "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"

3789 "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"

3790

3819 -#: builtin/checkout.c:1476

3791 +#: builtin/checkout.c:1322

3792 #, c-format

3793 msgid "git checkout: --detach does not take a path argument '%s'"

3794 msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"

3795

3824 -#: builtin/checkout.c:1480

3796 +#: builtin/checkout.c:1326

3797 msgid ""

3798 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3799 "checking out of the index."

@@ -4107,57 +4079,57 @@ msgstr "calu=valor"

4079 msgid "set config inside the new repository"

4080 msgstr "estableix la configuració dins del dipòsit nou"

4081

4110 -#: builtin/clone.c:247

4082 +#: builtin/clone.c:240

4083 #, c-format

4084 msgid "reference repository '%s' is not a local repository."

4085 msgstr "el dipòsit de referència '%s' no és un dipòsit local."

4086

4115 -#: builtin/clone.c:251

4087 +#: builtin/clone.c:244

4088 #, c-format

4089 msgid "reference repository '%s' is shallow"

4090 msgstr "el dipòsit de referència '%s' és superficial"

4091

4120 -#: builtin/clone.c:254

4092 +#: builtin/clone.c:247

4093 #, c-format

4094 msgid "reference repository '%s' is grafted"

4095 msgstr "el dipòsit de referència '%s' és empeltat"

4096

4125 -#: builtin/clone.c:317

4097 +#: builtin/clone.c:310

4098 #, c-format

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

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

4101

4130 -#: builtin/clone.c:319 builtin/diff.c:84

4102 +#: builtin/clone.c:312 builtin/diff.c:84

4103 #, c-format

4104 msgid "failed to stat '%s'"

4105 msgstr "s'ha fallat en fer stat a '%s'"

4106

4135 -#: builtin/clone.c:321

4107 +#: builtin/clone.c:314

4108 #, c-format

4109 msgid "%s exists and is not a directory"

4110 msgstr "%s existeix i no és un directori"

4111

4140 -#: builtin/clone.c:335

4112 +#: builtin/clone.c:328

4113 #, c-format

4114 msgid "failed to stat %s\n"

4115 msgstr "s'ha fallat en fer stat a '%s'\n"

4116

4145 -#: builtin/clone.c:357

4117 +#: builtin/clone.c:350

4118 #, c-format

4119 msgid "failed to create link '%s'"

4120 msgstr "s'ha fallat en crear l'enllaç '%s'"

4121

4150 -#: builtin/clone.c:361

4122 +#: builtin/clone.c:354

4123 #, c-format

4124 msgid "failed to copy file to '%s'"

4125 msgstr "s'ha fallat en copiar el fitxer a '%s'"

4126

4155 -#: builtin/clone.c:384 builtin/clone.c:558

4127 +#: builtin/clone.c:377 builtin/clone.c:551

4128 #, c-format

4129 msgid "done.\n"

4130 msgstr "fet.\n"

4131

4160 -#: builtin/clone.c:396

4132 +#: builtin/clone.c:389

4133 msgid ""

4134 "Clone succeeded, but checkout failed.\n"

4135 "You can inspect what was checked out with 'git status'\n"

@@ -4167,117 +4139,123 @@ msgstr ""

4139 "Podeu inspeccionar què s'ha agafat amb 'git status' i\n"

4140 "tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"

4141

4170 -#: builtin/clone.c:473

4142 +#: builtin/clone.c:466

4143 #, c-format

4144 msgid "Could not find remote branch %s to clone."

4145 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."

4146

4175 -#: builtin/clone.c:553

4147 +#: builtin/clone.c:546

4148 #, c-format

4149 msgid "Checking connectivity... "

4150 msgstr "Provant connectivitat... "

4151

4180 -#: builtin/clone.c:556

4152 +#: builtin/clone.c:549

4153 msgid "remote did not send all necessary objects"

4154 msgstr "el remot no ha enviat tots els objectes necessaris"

4155

4184 -#: builtin/clone.c:620

4156 +#: builtin/clone.c:613

4157 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4158 msgstr ""

4159 "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "

4160 "agafar.\n"

4161

4190 -#: builtin/clone.c:651

4162 +#: builtin/clone.c:644

4163 msgid "unable to checkout working tree"

4164 msgstr "no s'ha pogut agafar l'arbre de treball"

4165

4194 -#: builtin/clone.c:738

4166 +#: builtin/clone.c:731

4167 msgid "cannot repack to clean up"

4168 msgstr "no es pot reempaquetar per a netejar"

4169

4198 -#: builtin/clone.c:740

4170 +#: builtin/clone.c:733

4171 msgid "cannot unlink temporary alternates file"

4172 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"

4173

4202 -#: builtin/clone.c:770

4174 +#: builtin/clone.c:763

4175 msgid "Too many arguments."

4176 msgstr "Hi ha massa paràmetres."

4177

4206 -#: builtin/clone.c:774

4178 +#: builtin/clone.c:767

4179 msgid "You must specify a repository to clone."

4180 msgstr "Heu d'especificar un dipòsit per a clonar."

4181

4210 -#: builtin/clone.c:785

4182 +#: builtin/clone.c:778

4183 #, c-format

4184 msgid "--bare and --origin %s options are incompatible."

4185 msgstr "les opcions --bare i --origin %s són incompatibles."

4186

4215 -#: builtin/clone.c:788

4187 +#: builtin/clone.c:781

4188 msgid "--bare and --separate-git-dir are incompatible."

4189 msgstr "--bare i --separate-git-dir són incompatibles."

4190

4219 -#: builtin/clone.c:801

4191 +#: builtin/clone.c:794

4192 #, c-format

4193 msgid "repository '%s' does not exist"

4194 msgstr "el dipòsit '%s' no existeix"

4195

4224 -#: builtin/clone.c:807 builtin/fetch.c:1160

4196 +#: builtin/clone.c:800 builtin/fetch.c:1160

4197 #, c-format

4198 msgid "depth %s is not a positive number"

4199 msgstr "la profunditat %s no és nombre positiu"

4200

4229 -#: builtin/clone.c:817

4201 +#: builtin/clone.c:810

4202 #, c-format

4203 msgid "destination path '%s' already exists and is not an empty directory."

4204 msgstr "el camí destí '%s' ja existeix i no és un directori buit."

4205

4234 -#: builtin/clone.c:827

4206 +#: builtin/clone.c:820

4207 #, c-format

4208 msgid "working tree '%s' already exists."

4209 msgstr "l'arbre de treball '%s' ja existeix."

4210

4239 -#: builtin/clone.c:845

4211 +#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4212 +#: builtin/worktree.c:220

4213 +#, c-format

4214 +msgid "could not create leading directories of '%s'"

4215 +msgstr "no s'ha pogut crear els directoris inicials de '%s'"

4216 +

4217 +#: builtin/clone.c:838

4218 #, c-format

4219 msgid "could not create work tree dir '%s'"

4220 msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"

4221

4244 -#: builtin/clone.c:863

4222 +#: builtin/clone.c:856

4223 #, c-format

4224 msgid "Cloning into bare repository '%s'...\n"

4225 msgstr "Clonant al dipòsit nu '%s'...\n"

4226

4249 -#: builtin/clone.c:865

4227 +#: builtin/clone.c:858

4228 #, c-format

4229 msgid "Cloning into '%s'...\n"

4230 msgstr "Clonant a '%s'...\n"

4231

4254 -#: builtin/clone.c:890

4232 +#: builtin/clone.c:883

4233 msgid "--dissociate given, but there is no --reference"

4234 msgstr "s'ha donat --dissociate, però no hi ha --reference"

4235

4258 -#: builtin/clone.c:907

4236 +#: builtin/clone.c:900

4237 msgid "--depth is ignored in local clones; use file:// instead."

4238 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."

4239

4262 -#: builtin/clone.c:910

4240 +#: builtin/clone.c:903

4241 msgid "source repository is shallow, ignoring --local"

4242 msgstr "el dipòsit font és superficial, ignorant --local"

4243

4266 -#: builtin/clone.c:915

4244 +#: builtin/clone.c:908

4245 msgid "--local is ignored"

4246 msgstr "--local s'ignora"

4247

4270 -#: builtin/clone.c:919

4248 +#: builtin/clone.c:912

4249 #, c-format

4250 msgid "Don't know how to clone %s"

4251 msgstr "No es sap com clonar %s"

4252

4275 -#: builtin/clone.c:968 builtin/clone.c:976

4253 +#: builtin/clone.c:961 builtin/clone.c:969

4254 #, c-format

4255 msgid "Remote branch %s not found in upstream %s"

4256 msgstr "La branca remota %s no es troba en la font %s"

4257

4280 -#: builtin/clone.c:979

4258 +#: builtin/clone.c:972

4259 msgid "You appear to have cloned an empty repository."

4260 msgstr "Sembla que heu clonat un dipòsit buit."

4261

@@ -5662,7 +5640,7 @@ msgstr "clau"

5640 msgid "field name to sort on"

5641 msgstr "nom de camp en el qual ordenar"

5642

5665 -#: builtin/fsck.c:147 builtin/prune.c:236

5643 +#: builtin/fsck.c:147 builtin/prune.c:137

5644 msgid "Checking connectivity"

5645 msgstr "Comprovant connectivitat"

5646

@@ -5710,7 +5688,7 @@ msgstr "habilita la comprovació més estricta"

5688 msgid "write dangling objects in .git/lost-found"

5689 msgstr "escriu objectes penjants a .git/lost-found"

5690

5713 -#: builtin/fsck.c:627 builtin/prune.c:198

5691 +#: builtin/fsck.c:627 builtin/prune.c:107

5692 msgid "show progress"

5693 msgstr "mostra el progrés"

5694

@@ -8196,62 +8174,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"

8174 msgid "Removing duplicate objects"

8175 msgstr "Eliminant objectes duplicats"

8176

8199 -#: builtin/prune.c:12

8177 +#: builtin/prune.c:11

8178 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

8179 msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"

8180

8203 -#: builtin/prune.c:86

8204 -#, c-format

8205 -msgid "Removing worktrees/%s: not a valid directory"

8206 -msgstr "Eliminació de worktrees/%s: no és un directori vàlid"

8207 -

8208 -#: builtin/prune.c:92

8209 -#, c-format

8210 -msgid "Removing worktrees/%s: gitdir file does not exist"

8211 -msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"

8212 -

8213 -#: builtin/prune.c:97

8214 -#, c-format

8215 -msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

8216 -msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"

8217 -

8218 -#: builtin/prune.c:108

8219 -#, c-format

8220 -msgid "Removing worktrees/%s: invalid gitdir file"

8221 -msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"

8222 -

8223 -#: builtin/prune.c:124

8224 -#, c-format

8225 -msgid "Removing worktrees/%s: gitdir file points to non-existent location"

8226 -msgstr ""

8227 -"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "

8228 -"existent"

8229 -

8230 -#: builtin/prune.c:159

8231 -#, c-format

8232 -msgid "failed to remove: %s"

8233 -msgstr "s'ha fallat en eliminar: %s"

8234 -

8235 -#: builtin/prune.c:196

8181 +#: builtin/prune.c:105 builtin/worktree.c:112

8182 msgid "do not remove, show only"

8183 msgstr "no eliminis, només mostra"

8184

8239 -#: builtin/prune.c:197

8185 +#: builtin/prune.c:106 builtin/worktree.c:113

8186 msgid "report pruned objects"

8187 msgstr "informa d'objectes podats"

8188

8243 -#: builtin/prune.c:199

8244 -msgid "prune .git/worktrees"

8245 -msgstr "poda .git/worktrees"

8246 -

8247 -#: builtin/prune.c:201

8189 +#: builtin/prune.c:109 builtin/worktree.c:115

8190 msgid "expire objects older than <time>"

8191 msgstr "fes caducar els objectes més vells que <hora>"

8192

8251 -#: builtin/prune.c:216

8252 -msgid "--worktrees does not take extra arguments"

8253 -msgstr "--worktrees no accepta paràmetres extres"

8254 -

8193 #: builtin/push.c:14

8194 msgid "git push [<options>] [<repository> [<refspec>...]]"

8195 msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"

@@ -10362,6 +10300,85 @@ msgstr "git verify-tag [-v | --verbose] <etiqueta>..."

10300 msgid "print tag contents"

10301 msgstr "imprimeix els continguts de l'etiqueta"

10302

10303 +#: builtin/worktree.c:11

10304 +msgid "git worktree add [<options>] <path> <branch>"

10305 +msgstr "git worktree add [<opcions>] <camí> <branca>"

10306 +

10307 +#: builtin/worktree.c:12

10308 +msgid "git worktree prune [<options>]"

10309 +msgstr "git worktree prune [<opcions>]"

10310 +

10311 +#: builtin/worktree.c:27

10312 +#, c-format

10313 +msgid "Removing worktrees/%s: not a valid directory"

10314 +msgstr "Eliminació de worktrees/%s: no és un directori vàlid"

10315 +

10316 +#: builtin/worktree.c:33

10317 +#, c-format

10318 +msgid "Removing worktrees/%s: gitdir file does not exist"

10319 +msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"

10320 +

10321 +#: builtin/worktree.c:38

10322 +#, c-format

10323 +msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

10324 +msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"

10325 +

10326 +#: builtin/worktree.c:49

10327 +#, c-format

10328 +msgid "Removing worktrees/%s: invalid gitdir file"

10329 +msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"

10330 +

10331 +#: builtin/worktree.c:65

10332 +#, c-format

10333 +msgid "Removing worktrees/%s: gitdir file points to non-existent location"

10334 +msgstr ""

10335 +"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "

10336 +"existent"

10337 +

10338 +#: builtin/worktree.c:100

10339 +#, c-format

10340 +msgid "failed to remove: %s"

10341 +msgstr "s'ha fallat en eliminar: %s"

10342 +

10343 +#: builtin/worktree.c:186

10344 +#, c-format

10345 +msgid "'%s' already exists"

10346 +msgstr "'%s' ja existeix"

10347 +

10348 +#: builtin/worktree.c:207

10349 +#, c-format

10350 +msgid "could not create directory of '%s'"

10351 +msgstr "no s'ha pogut crear directori de '%s'"

10352 +

10353 +#: builtin/worktree.c:241

10354 +msgid "unable to resolve HEAD"

10355 +msgstr "no es pot resoldre HEAD"

10356 +

10357 +#: builtin/worktree.c:249

10358 +#, c-format

10359 +msgid "Enter %s (identifier %s)"

10360 +msgstr "Introduïu %s (identificador %s)"

10361 +

10362 +#: builtin/worktree.c:281

10363 +msgid "checkout <branch> even if already checked out in other worktree"

10364 +msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"

10365 +

10366 +#: builtin/worktree.c:283

10367 +msgid "create a new branch"

10368 +msgstr "crea una branca nova"

10369 +

10370 +#: builtin/worktree.c:285

10371 +msgid "create or reset a branch"

10372 +msgstr "crea o restableix una branca"

10373 +

10374 +#: builtin/worktree.c:286

10375 +msgid "detach HEAD at named commit"

10376 +msgstr "separa el HEAD a la comissió anomenada"

10377 +

10378 +#: builtin/worktree.c:292

10379 +msgid "-b and -B are mutually exclusive"

10380 +msgstr "-b i -B són mutualment exclusius"

10381 +

10382 #: builtin/write-tree.c:13

10383 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"

10384 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"

@@ -10426,8 +10443,8 @@ msgid "List, create, or delete branches"

10443 msgstr "Llista, crea o suprimeix branques"

10444

10445 #: common-cmds.h:21

10429 -msgid "Checkout a branch or paths to the working tree"

10430 -msgstr "Agafa una branca o uns camins a l'arbre de treball"

10446 +msgid "Switch branches or restore working tree files"

10447 +msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"

10448

10449 #: common-cmds.h:22

10450 msgid "Clone a repository into a new directory"

l10n: ca.po: update translation