7363e66904 · 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-04-03 08:13+0800\n"

11 -"PO-Revision-Date: 2015-04-07 12:26-0700\n"

10 +"POT-Creation-Date: 2015-06-27 19:17+0800\n"

11 +"PO-Revision-Date: 2015-07-01 22:21-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.7.5\n"

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

20

21 #: advice.c:55

22 #, c-format

@@ -51,7 +51,7 @@ msgstr ""

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

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

53

54 -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

54 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

55 #, c-format

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

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

@@ -74,9 +74,9 @@ msgstr "anteposa el prefix a cada nom de camí en l'arxiu"

74

75 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

76 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

77 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

77 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

78 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

79 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

79 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

80 msgid "file"

81 msgstr "fitxer"

82

@@ -108,7 +108,7 @@ msgstr "comprimeix millor"

108 msgid "list supported archive formats"

109 msgstr "allista els formats d'arxiu admesos"

110

111 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

111 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

112 msgid "repo"

113 msgstr "dipòsit"

114

@@ -124,7 +124,7 @@ msgstr "ordre"

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

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

126

127 -#: attr.c:264

127 +#: attr.c:265

128 msgid ""

129 "Negative patterns are ignored in git attributes\n"

130 "Use '\\!' for literal leading exclamation."

@@ -271,8 +271,8 @@ msgid "Repository lacks these prerequisite commits:"

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

272

273 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

274 -#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330

275 -#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

274 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

275 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

276 #: builtin/shortlog.c:158

277 msgid "revision walk setup failed"

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

@@ -518,16 +518,16 @@ msgstr ""

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

519 "%s"

520

521 -#: diff.c:2956

521 +#: diff.c:2997

522 #, c-format

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

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

525

526 -#: diff.c:3351

526 +#: diff.c:3393

527 msgid "--follow requires exactly one pathspec"

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

529

530 -#: diff.c:3514

530 +#: diff.c:3556

531 #, c-format

532 msgid ""

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

@@ -536,11 +536,19 @@ msgstr ""

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

537 "%s"

538

539 -#: diff.c:3528

539 +#: diff.c:3570

540 #, c-format

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

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

543

544 +#: dir.c:1852

545 +msgid "failed to get kernel name and information"

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

547 +

548 +#: dir.c:1945

549 +msgid "Untracked cache is disabled on this system."

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

551 +

552 #: gpg-interface.c:129 gpg-interface.c:200

553 msgid "could not run gpg."

554 msgstr "no s'ha pogut executar el gpg."

@@ -587,11 +595,11 @@ msgstr "ordres de git disponibles en '%s'"

595 msgid "git commands available from elsewhere on your $PATH"

596 msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"

597

590 -#: help.c:230

591 -msgid "The most commonly used git commands are:"

592 -msgstr "Les ordres de git més freqüentment usades són:"

598 +#: help.c:246

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

600 +msgstr "Aquests són ordres del Git comunament usats en diverses situacions:"

601

594 -#: help.c:289

602 +#: help.c:311

603 #, c-format

604 msgid ""

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

@@ -600,11 +608,11 @@ msgstr ""

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

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

610

603 -#: help.c:346

611 +#: help.c:368

612 msgid "Uh oh. Your system reports no Git commands at all."

613 msgstr "Ai. El vostre sistema no informa de cap ordre de Git."

614

607 -#: help.c:368

615 +#: help.c:390

616 #, c-format

617 msgid ""

618 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -613,17 +621,17 @@ msgstr ""

621 "AVÍS: Heu invocat una ordre de Git amb nom '%s', la qual no existeix.\n"

622 "Continuant sota l'assumpció que volíeu dir '%s'"

623

616 -#: help.c:373

624 +#: help.c:395

625 #, c-format

626 msgid "in %0.1f seconds automatically..."

627 msgstr "en %0.1f segons automàticament..."

628

621 -#: help.c:380

629 +#: help.c:402

630 #, c-format

631 msgid "git: '%s' is not a git command. See 'git --help'."

632 msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."

633

626 -#: help.c:384 help.c:444

634 +#: help.c:406 help.c:466

635 msgid ""

636 "\n"

637 "Did you mean this?"

@@ -637,16 +645,16 @@ msgstr[1] ""

645 "\n"

646 "Volíeu dir un d'aquests?"

647

640 -#: help.c:440

648 +#: help.c:462

649 #, c-format

650 msgid "%s: %s - %s"

651 msgstr "%s: %s - %s"

652

645 -#: lockfile.c:283

653 +#: lockfile.c:345

654 msgid "BUG: reopen a lockfile that is still open"

655 msgstr "BUG: reobrir un fitxer de bloqueig que encara està obert"

656

649 -#: lockfile.c:285

657 +#: lockfile.c:347

658 msgid "BUG: reopen a lockfile that has been committed"

659 msgstr "BUG: reobrir un fitxer de bloqueig que s'ha comès"

660

@@ -654,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

657 -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

658 -#: builtin/clone.c:662

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

666 +#: builtin/clone.c:654

667 msgid "unable to write new index file"

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

669

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

681 msgid "error building trees"

682 msgstr "error en construir arbres"

683

676 -#: merge-recursive.c:688

684 +#: merge-recursive.c:687

685 #, c-format

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

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

688

681 -#: merge-recursive.c:699

689 +#: merge-recursive.c:698

690 #, c-format

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

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

693

686 -#: merge-recursive.c:713 merge-recursive.c:734

694 +#: merge-recursive.c:712 merge-recursive.c:733

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

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

697

690 -#: merge-recursive.c:724

698 +#: merge-recursive.c:723

699 #, c-format

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

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

702

695 -#: merge-recursive.c:764

703 +#: merge-recursive.c:763

704 #, c-format

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

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

707

700 -#: merge-recursive.c:766

708 +#: merge-recursive.c:765

709 #, c-format

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

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

712

705 -#: merge-recursive.c:789 builtin/clone.c:321

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

714 #, c-format

715 msgid "failed to open '%s'"

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

717

710 -#: merge-recursive.c:797

718 +#: merge-recursive.c:796

719 #, c-format

720 msgid "failed to symlink '%s'"

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

722

715 -#: merge-recursive.c:800

723 +#: merge-recursive.c:799

724 #, c-format

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

726 msgstr "no es sap què fer amb %06o %s '%s'"

727

720 -#: merge-recursive.c:938

728 +#: merge-recursive.c:937

729 msgid "Failed to execute internal merge"

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

731

724 -#: merge-recursive.c:942

732 +#: merge-recursive.c:941

733 #, c-format

734 msgid "Unable to add %s to database"

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

736

729 -#: merge-recursive.c:958

737 +#: merge-recursive.c:957

738 msgid "unsupported object type in the tree"

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

740

733 -#: merge-recursive.c:1033 merge-recursive.c:1047

741 +#: merge-recursive.c:1032 merge-recursive.c:1046

742 #, c-format

743 msgid ""

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

@@ -739,7 +747,7 @@ msgstr ""

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

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

749

742 -#: merge-recursive.c:1039 merge-recursive.c:1052

750 +#: merge-recursive.c:1038 merge-recursive.c:1051

751 #, c-format

752 msgid ""

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

@@ -748,20 +756,20 @@ msgstr ""

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

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

758

751 -#: merge-recursive.c:1093

759 +#: merge-recursive.c:1092

760 msgid "rename"

761 msgstr "canvia de nom"

762

755 -#: merge-recursive.c:1093

763 +#: merge-recursive.c:1092

764 msgid "renamed"

765 msgstr "canviat de nom"

766

759 -#: merge-recursive.c:1149

767 +#: merge-recursive.c:1148

768 #, c-format

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

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

771

764 -#: merge-recursive.c:1171

772 +#: merge-recursive.c:1170

773 #, c-format

774 msgid ""

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

@@ -770,146 +778,146 @@ msgstr ""

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

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

780

773 -#: merge-recursive.c:1176

781 +#: merge-recursive.c:1175

782 msgid " (left unresolved)"

783 msgstr " (deixat sense resolució)"

784

777 -#: merge-recursive.c:1230

785 +#: merge-recursive.c:1229

786 #, c-format

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

788 msgstr ""

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

790 "nom %s->%s en %s"

791

784 -#: merge-recursive.c:1260

792 +#: merge-recursive.c:1259

793 #, c-format

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

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

796

789 -#: merge-recursive.c:1459

797 +#: merge-recursive.c:1458

798 #, c-format

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

800 msgstr ""

801 "CONFLICTE (supressió/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s"

802

795 -#: merge-recursive.c:1469

803 +#: merge-recursive.c:1468

804 #, c-format

805 msgid "Adding merged %s"

806 msgstr "Afegint %s fusionat"

807

800 -#: merge-recursive.c:1474 merge-recursive.c:1672

808 +#: merge-recursive.c:1473 merge-recursive.c:1671

809 #, c-format

810 msgid "Adding as %s instead"

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

812

805 -#: merge-recursive.c:1525

813 +#: merge-recursive.c:1524

814 #, c-format

815 msgid "cannot read object %s"

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

817

810 -#: merge-recursive.c:1528

818 +#: merge-recursive.c:1527

819 #, c-format

820 msgid "object %s is not a blob"

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

822

815 -#: merge-recursive.c:1576

823 +#: merge-recursive.c:1575

824 msgid "modify"

825 msgstr "modifica"

826

819 -#: merge-recursive.c:1576

827 +#: merge-recursive.c:1575

828 msgid "modified"

829 msgstr "modificat"

830

823 -#: merge-recursive.c:1586

831 +#: merge-recursive.c:1585

832 msgid "content"

833 msgstr "contingut"

834

827 -#: merge-recursive.c:1593

835 +#: merge-recursive.c:1592

836 msgid "add/add"

837 msgstr "afegiment/afegiment"

838

831 -#: merge-recursive.c:1627

839 +#: merge-recursive.c:1626

840 #, c-format

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

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

843

836 -#: merge-recursive.c:1641

844 +#: merge-recursive.c:1640

845 #, c-format

846 msgid "Auto-merging %s"

847 msgstr "Autofusionant %s"

848

841 -#: merge-recursive.c:1645 git-submodule.sh:1150

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

850 msgid "submodule"

851 msgstr "submòdul"

852

845 -#: merge-recursive.c:1646

853 +#: merge-recursive.c:1645

854 #, c-format

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

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

857

850 -#: merge-recursive.c:1732

858 +#: merge-recursive.c:1731

859 #, c-format

860 msgid "Removing %s"

861 msgstr "Eliminant %s"

862

855 -#: merge-recursive.c:1757

863 +#: merge-recursive.c:1756

864 msgid "file/directory"

865 msgstr "fitxer/directori"

866

859 -#: merge-recursive.c:1763

867 +#: merge-recursive.c:1762

868 msgid "directory/file"

869 msgstr "directori/fitxer"

870

863 -#: merge-recursive.c:1768

871 +#: merge-recursive.c:1767

872 #, c-format

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

874 msgstr ""

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

876

869 -#: merge-recursive.c:1778

877 +#: merge-recursive.c:1777

878 #, c-format

879 msgid "Adding %s"

880 msgstr "Afegint %s"

881

874 -#: merge-recursive.c:1795

882 +#: merge-recursive.c:1794

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

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

885

878 -#: merge-recursive.c:1814

886 +#: merge-recursive.c:1813

887 msgid "Already up-to-date!"

888 msgstr "Ja al dia!"

889

882 -#: merge-recursive.c:1823

890 +#: merge-recursive.c:1822

891 #, c-format

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

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

894

887 -#: merge-recursive.c:1853

895 +#: merge-recursive.c:1852

896 #, c-format

897 msgid "Unprocessed path??? %s"

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

899

892 -#: merge-recursive.c:1901

900 +#: merge-recursive.c:1900

901 msgid "Merging:"

902 msgstr "Fusionant:"

903

896 -#: merge-recursive.c:1914

904 +#: merge-recursive.c:1913

905 #, c-format

906 msgid "found %u common ancestor:"

907 msgid_plural "found %u common ancestors:"

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

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

910

903 -#: merge-recursive.c:1951

911 +#: merge-recursive.c:1950

912 msgid "merge returned no commit"

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

914

907 -#: merge-recursive.c:2008

915 +#: merge-recursive.c:2007

916 #, c-format

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

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

919

912 -#: merge-recursive.c:2019 builtin/merge.c:667

920 +#: merge-recursive.c:2018 builtin/merge.c:645

921 msgid "Unable to write index."

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

923

@@ -934,7 +942,7 @@ msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)"

942 msgid "Bad %s value: '%s'"

943 msgstr "Valor dolent de %s: '%s'"

944

937 -#: object.c:241

945 +#: object.c:242

946 #, c-format

947 msgid "unable to parse object: %s"

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

@@ -1035,11 +1043,11 @@ msgstr ""

1043 msgid "unable to parse --pretty format"

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

1045

1038 -#: progress.c:225

1046 +#: progress.c:236

1047 msgid "done"

1048 msgstr "fet"

1049

1042 -#: read-cache.c:1275

1050 +#: read-cache.c:1295

1051 #, c-format

1052 msgid ""

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

@@ -1048,7 +1056,7 @@ msgstr ""

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

1057 "Usant la versió %i"

1058

1051 -#: read-cache.c:1285

1059 +#: read-cache.c:1305

1060 #, c-format

1061 msgid ""

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

@@ -1057,51 +1065,94 @@ msgstr ""

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

1066 "Usant la versió %i"

1067

1060 -#: remote.c:782

1068 +#: remote.c:792

1069 #, c-format

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

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

1072

1065 -#: remote.c:786

1073 +#: remote.c:796

1074 #, c-format

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

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

1077

1070 -#: remote.c:790

1078 +#: remote.c:800

1079 #, c-format

1080 msgid "%s tracks both %s and %s"

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

1082

1075 -#: remote.c:798

1083 +#: remote.c:808

1084 msgid "Internal error"

1085 msgstr "Error intern"

1086

1079 -#: remote.c:1980

1087 +#: remote.c:1723 remote.c:1766

1088 +msgid "HEAD does not point to a branch"

1089 +msgstr "HEAD no assenyala cap branca"

1090 +

1091 +#: remote.c:1732

1092 +#, c-format

1093 +msgid "no such branch: '%s'"

1094 +msgstr "no hi ha tal branca: '%s'"

1095 +

1096 +#: remote.c:1735

1097 +#, c-format

1098 +msgid "no upstream configured for branch '%s'"

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

1100 +

1101 +#: remote.c:1741

1102 +#, c-format

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

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

1105 +

1106 +#: remote.c:1756

1107 +#, c-format

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

1109 +msgstr ""

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

1111 +

1112 +#: remote.c:1771

1113 +#, c-format

1114 +msgid "branch '%s' has no remote for pushing"

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

1116 +

1117 +#: remote.c:1782

1118 +#, c-format

1119 +msgid "push refspecs for '%s' do not include '%s'"

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

1121 +

1122 +#: remote.c:1795

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

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

1125 +

1126 +#: remote.c:1817

1127 +msgid "cannot resolve 'simple' push to a single destination"

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

1129 +

1130 +#: remote.c:2124

1131 #, c-format

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

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

1134

1084 -#: remote.c:1984

1135 +#: remote.c:2128

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

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

1138

1088 -#: remote.c:1987

1139 +#: remote.c:2131

1140 #, c-format

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

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

1143

1093 -#: remote.c:1991

1144 +#: remote.c:2135

1145 #, c-format

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

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

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

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

1150

1100 -#: remote.c:1997

1151 +#: remote.c:2141

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

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

1154

1104 -#: remote.c:2000

1155 +#: remote.c:2144

1156 #, c-format

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

1158 msgid_plural ""

@@ -1113,11 +1164,11 @@ msgstr[1] ""

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

1165 "ràpidament.\n"

1166

1116 -#: remote.c:2008

1167 +#: remote.c:2152

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

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

1170

1120 -#: remote.c:2011

1171 +#: remote.c:2155

1172 #, c-format

1173 msgid ""

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

@@ -1132,11 +1183,11 @@ msgstr[1] ""

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

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

1185

1135 -#: remote.c:2021

1186 +#: remote.c:2165

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

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

1189

1139 -#: revision.c:2348

1190 +#: revision.c:2366

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

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

1193

@@ -1153,22 +1204,22 @@ msgstr "dup2(%d,%d) ha fallat"

1204 msgid "failed to sign the push certificate"

1205 msgstr "s'ha fallat en firmar el certificat de pujada"

1206

1156 -#: send-pack.c:356

1207 +#: send-pack.c:378

1208 msgid "the receiving end does not support --signed push"

1209 msgstr "el destí receptor no admet pujar --signed"

1210

1160 -#: send-pack.c:366

1211 +#: send-pack.c:389

1212 msgid "the receiving end does not support --atomic push"

1213 msgstr "el destí receptor no admet pujar --atomic"

1214

1164 -#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1165 -#: builtin/merge.c:1005

1215 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1216 +#: builtin/merge.c:983

1217 #, c-format

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

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

1220

1170 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1171 -#: builtin/merge.c:1010

1221 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1222 +#: builtin/merge.c:988

1223 #, c-format

1224 msgid "Could not write to '%s'"

1225 msgstr "No s'ha pogut escriure al '%s'"

@@ -1367,7 +1418,7 @@ msgstr "no es pot resoldre HEAD"

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

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

1420

1370 -#: sequencer.c:908 builtin/apply.c:4288

1421 +#: sequencer.c:908 builtin/apply.c:4291

1422 #, c-format

1423 msgid "cannot open %s: %s"

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

@@ -1410,7 +1461,12 @@ msgstr "No es pot revertir com a comissió inicial"

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

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

1463

1413 -#: sha1_name.c:440

1464 +#: setup.c:243

1465 +#, c-format

1466 +msgid "failed to read %s"

1467 +msgstr "s'ha fallat en llegir %s"

1468 +

1469 +#: sha1_name.c:453

1470 msgid ""

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

1472 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1434,26 +1490,6 @@ msgstr ""

1490 "suprimiu-les. Desactiveu aquest missatge executant\n"

1491 "\"git config advice.objectNameWarning false\""

1492

1437 -#: sha1_name.c:1068

1438 -msgid "HEAD does not point to a branch"

1439 -msgstr "HEAD no assenyala cap branca"

1440 -

1441 -#: sha1_name.c:1071

1442 -#, c-format

1443 -msgid "No such branch: '%s'"

1444 -msgstr "No hi ha tal branca: '%s'"

1445 -

1446 -#: sha1_name.c:1073

1447 -#, c-format

1448 -msgid "No upstream configured for branch '%s'"

1449 -msgstr "Cap font configurada per a la branca '%s'"

1450 -

1451 -#: sha1_name.c:1077

1452 -#, c-format

1453 -msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1454 -msgstr ""

1455 -"La branca font '%s' no s'emmagatzema com a branca que segueixi al remot"

1456 -

1493 #: submodule.c:64 submodule.c:98

1494 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1495 msgstr ""

@@ -1479,12 +1515,7 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"

1515 msgid "staging updated .gitmodules failed"

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

1517

1482 -#: submodule.c:1109 builtin/init-db.c:371

1483 -#, c-format

1484 -msgid "Could not create git link %s"

1485 -msgstr "No s'ha pogut crear l'enllaç de git %s"

1486 -

1487 -#: submodule.c:1120

1518 +#: submodule.c:1115

1519 #, c-format

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

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

@@ -1514,7 +1545,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"

1545 msgid "could not read from stdin"

1546 msgstr "No s'ha pogut llegir des d'stdin"

1547

1517 -#: unpack-trees.c:202

1548 +#: unpack-trees.c:203

1549 msgid "Checking out files"

1550 msgstr "Agafant fitxers"

1551

@@ -1570,6 +1601,21 @@ msgstr "no hi ha tal usuari"

1601 msgid "unable to get current working directory"

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

1603

1604 +#: wrapper.c:575

1605 +#, c-format

1606 +msgid "could not open %s for writing"

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

1608 +

1609 +#: wrapper.c:587

1610 +#, c-format

1611 +msgid "could not write to %s"

1612 +msgstr "no s'ha pogut escriure a %s"

1613 +

1614 +#: wrapper.c:593

1615 +#, c-format

1616 +msgid "could not close %s"

1617 +msgstr "no s'ha pogut tancar %s"

1618 +

1619 #: wt-status.c:150

1620 msgid "Unmerged paths:"

1621 msgstr "Camins sense fusionar:"

@@ -1597,11 +1643,11 @@ msgstr ""

1643 msgid " (use \"git rm <file>...\" to mark resolution)"

1644 msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"

1645

1600 -#: wt-status.c:198 wt-status.c:878

1646 +#: wt-status.c:198 wt-status.c:881

1647 msgid "Changes to be committed:"

1648 msgstr "Canvis a cometre:"

1649

1604 -#: wt-status.c:216 wt-status.c:887

1650 +#: wt-status.c:216 wt-status.c:890

1651 msgid "Changes not staged for commit:"

1652 msgstr "Canvis no allistats per a cometre:"

1653

@@ -1712,15 +1758,15 @@ msgstr "contingut no seguit, "

1758 msgid "bug: unhandled diff status %c"

1759 msgstr "bug: estat de diferència no gestionat %c"

1760

1715 -#: wt-status.c:753

1761 +#: wt-status.c:755

1762 msgid "Submodules changed but not updated:"

1763 msgstr "Submòduls canviats però no actualitzats:"

1764

1719 -#: wt-status.c:755

1765 +#: wt-status.c:757

1766 msgid "Submodule changes to be committed:"

1767 msgstr "Canvis de submòdul a cometre:"

1768

1723 -#: wt-status.c:835

1769 +#: wt-status.c:838

1770 msgid ""

1771 "Do not touch the line above.\n"

1772 "Everything below will be removed."

@@ -1728,191 +1774,191 @@ msgstr ""

1774 "No toqueu la línia de sobre.\n"

1775 "Tot el que hi ha a sota s'eliminarà."

1776

1731 -#: wt-status.c:946

1777 +#: wt-status.c:949

1778 msgid "You have unmerged paths."

1779 msgstr "Teniu camins sense fusionar."

1780

1735 -#: wt-status.c:949

1781 +#: wt-status.c:952

1782 msgid " (fix conflicts and run \"git commit\")"

1783 msgstr " (arregleu els conflictes i executeu \"git commit\")"

1784

1739 -#: wt-status.c:952

1785 +#: wt-status.c:955

1786 msgid "All conflicts fixed but you are still merging."

1787 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."

1788

1743 -#: wt-status.c:955

1789 +#: wt-status.c:958

1790 msgid " (use \"git commit\" to conclude merge)"

1791 msgstr " (useu \"git commit\" per a concloure la fusió)"

1792

1747 -#: wt-status.c:965

1793 +#: wt-status.c:968

1794 msgid "You are in the middle of an am session."

1795 msgstr "Esteu enmig d'una sessió am."

1796

1751 -#: wt-status.c:968

1797 +#: wt-status.c:971

1798 msgid "The current patch is empty."

1799 msgstr "El pedaç actual està buit."

1800

1755 -#: wt-status.c:972

1801 +#: wt-status.c:975

1802 msgid " (fix conflicts and then run \"git am --continue\")"

1803 msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"

1804

1759 -#: wt-status.c:974

1805 +#: wt-status.c:977

1806 msgid " (use \"git am --skip\" to skip this patch)"

1807 msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"

1808

1763 -#: wt-status.c:976

1809 +#: wt-status.c:979

1810 msgid " (use \"git am --abort\" to restore the original branch)"

1811 msgstr " (useu \"git am --abort\" per a restaurar la branca original)"

1812

1767 -#: wt-status.c:1036 wt-status.c:1053

1813 +#: wt-status.c:1039 wt-status.c:1056

1814 #, c-format

1815 msgid "You are currently rebasing branch '%s' on '%s'."

1816 msgstr "Actualment esteu rebasant la branca '%s' en '%s'."

1817

1772 -#: wt-status.c:1041 wt-status.c:1058

1818 +#: wt-status.c:1044 wt-status.c:1061

1819 msgid "You are currently rebasing."

1820 msgstr "Actualment esteu rebasant."

1821

1776 -#: wt-status.c:1044

1822 +#: wt-status.c:1047

1823 msgid " (fix conflicts and then run \"git rebase --continue\")"

1824 msgstr ""

1825 " (arregleu els conflictes i després executeu \"git rebase --continue\")"

1826

1781 -#: wt-status.c:1046

1827 +#: wt-status.c:1049

1828 msgid " (use \"git rebase --skip\" to skip this patch)"

1829 msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"

1830

1785 -#: wt-status.c:1048

1831 +#: wt-status.c:1051

1832 msgid " (use \"git rebase --abort\" to check out the original branch)"

1833 msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"

1834

1789 -#: wt-status.c:1061

1835 +#: wt-status.c:1064

1836 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1837 msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")"

1838

1793 -#: wt-status.c:1065

1839 +#: wt-status.c:1068

1840 #, c-format

1841 msgid ""

1842 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1843 msgstr ""

1844 "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'."

1845

1800 -#: wt-status.c:1070

1846 +#: wt-status.c:1073

1847 msgid "You are currently splitting a commit during a rebase."

1848 msgstr "Actualment esteu dividint una comissió durant una rebase."

1849

1804 -#: wt-status.c:1073

1850 +#: wt-status.c:1076

1851 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1852 msgstr ""

1853 " (Una vegada que el vostre directori de treball sigui net, executeu \"git "

1854 "rebase --continue\")"

1855

1810 -#: wt-status.c:1077

1856 +#: wt-status.c:1080

1857 #, c-format

1858 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1859 msgstr ""

1860 "Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'."

1861

1816 -#: wt-status.c:1082

1862 +#: wt-status.c:1085

1863 msgid "You are currently editing a commit during a rebase."

1864 msgstr "Actualment esteu editant una comissió durant una rebase."

1865

1820 -#: wt-status.c:1085

1866 +#: wt-status.c:1088

1867 msgid " (use \"git commit --amend\" to amend the current commit)"

1868 msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"

1869

1824 -#: wt-status.c:1087

1870 +#: wt-status.c:1090

1871 msgid ""

1872 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1873 msgstr ""

1874 " (useu \"git rebase --continue\" una vegada que esteu satisfet amb els "

1875 "vostres canvis)"

1876

1831 -#: wt-status.c:1097

1877 +#: wt-status.c:1100

1878 #, c-format

1879 msgid "You are currently cherry-picking commit %s."

1880 msgstr "Actualment esteu recollint com a cirera la comissió %s."

1881

1836 -#: wt-status.c:1102

1882 +#: wt-status.c:1105

1883 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1884 msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"

1885

1840 -#: wt-status.c:1105

1886 +#: wt-status.c:1108

1887 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1888 msgstr ""

1889 " (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")"

1890

1845 -#: wt-status.c:1107

1891 +#: wt-status.c:1110

1892 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1893 msgstr ""

1894 " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de "

1895 "cireres)"

1896

1851 -#: wt-status.c:1116

1897 +#: wt-status.c:1119

1898 #, c-format

1899 msgid "You are currently reverting commit %s."

1900 msgstr "Actualment esteu revertint la comissió %s."

1901

1856 -#: wt-status.c:1121

1902 +#: wt-status.c:1124

1903 msgid " (fix conflicts and run \"git revert --continue\")"

1904 msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"

1905

1860 -#: wt-status.c:1124

1906 +#: wt-status.c:1127

1907 msgid " (all conflicts fixed: run \"git revert --continue\")"

1908 msgstr ""

1909 " (tots els conflictes estan arreglats: executeu \"git revert --continue\")"

1910

1865 -#: wt-status.c:1126

1911 +#: wt-status.c:1129

1912 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1913 msgstr ""

1914 " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"

1915

1870 -#: wt-status.c:1137

1916 +#: wt-status.c:1140

1917 #, c-format

1918 msgid "You are currently bisecting, started from branch '%s'."

1919 msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."

1920

1875 -#: wt-status.c:1141

1921 +#: wt-status.c:1144

1922 msgid "You are currently bisecting."

1923 msgstr "Actualment esteu bisecant."

1924

1879 -#: wt-status.c:1144

1925 +#: wt-status.c:1147

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

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

1928

1883 -#: wt-status.c:1321

1929 +#: wt-status.c:1324

1930 msgid "On branch "

1931 msgstr "En la branca "

1932

1887 -#: wt-status.c:1328

1933 +#: wt-status.c:1331

1934 msgid "rebase in progress; onto "

1935 msgstr "rebase en progrés; en "

1936

1891 -#: wt-status.c:1333

1937 +#: wt-status.c:1336

1938 msgid "HEAD detached at "

1939 msgstr "HEAD separat a "

1940

1895 -#: wt-status.c:1335

1941 +#: wt-status.c:1338

1942 msgid "HEAD detached from "

1943 msgstr "HEAD separat de "

1944

1899 -#: wt-status.c:1338

1945 +#: wt-status.c:1341

1946 msgid "Not currently on any branch."

1947 msgstr "Actualment no en cap branca."

1948

1903 -#: wt-status.c:1355

1949 +#: wt-status.c:1358

1950 msgid "Initial commit"

1951 msgstr "Comissió inicial"

1952

1907 -#: wt-status.c:1369

1953 +#: wt-status.c:1372

1954 msgid "Untracked files"

1955 msgstr "Fitxers no seguits"

1956

1911 -#: wt-status.c:1371

1957 +#: wt-status.c:1374

1958 msgid "Ignored files"

1959 msgstr "Fitxers ignorats"

1960

1915 -#: wt-status.c:1375

1961 +#: wt-status.c:1378

1962 #, c-format

1963 msgid ""

1964 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1924,31 +1970,31 @@ msgstr ""

1970 "oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n"

1971 "'git help status')."

1972

1927 -#: wt-status.c:1381

1973 +#: wt-status.c:1384

1974 #, c-format

1975 msgid "Untracked files not listed%s"

1976 msgstr "Els fitxers no seguits no estan llistats%s"

1977

1932 -#: wt-status.c:1383

1978 +#: wt-status.c:1386

1979 msgid " (use -u option to show untracked files)"

1980 msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"

1981

1936 -#: wt-status.c:1389

1982 +#: wt-status.c:1392

1983 msgid "No changes"

1984 msgstr "Sense canvis"

1985

1940 -#: wt-status.c:1394

1986 +#: wt-status.c:1397

1987 #, c-format

1988 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1989 msgstr ""

1990 "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"

1991

1946 -#: wt-status.c:1397

1992 +#: wt-status.c:1400

1993 #, c-format

1994 msgid "no changes added to commit\n"

1995 msgstr "no hi ha canvis afegits a cometre\n"

1996

1951 -#: wt-status.c:1400

1997 +#: wt-status.c:1403

1998 #, c-format

1999 msgid ""

2000 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -1957,51 +2003,51 @@ msgstr ""

2003 "no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "

2004 "\"git add\" per a seguir-los)\n"

2005

1960 -#: wt-status.c:1403

2006 +#: wt-status.c:1406

2007 #, c-format

2008 msgid "nothing added to commit but untracked files present\n"

2009 msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"

2010

1965 -#: wt-status.c:1406

2011 +#: wt-status.c:1409

2012 #, c-format

2013 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2014 msgstr ""

2015 "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"

2016 "los)\n"

2017

1972 -#: wt-status.c:1409 wt-status.c:1414

2018 +#: wt-status.c:1412 wt-status.c:1417

2019 #, c-format

2020 msgid "nothing to commit\n"

2021 msgstr "no hi ha res a cometre\n"

2022

1977 -#: wt-status.c:1412

2023 +#: wt-status.c:1415

2024 #, c-format

2025 msgid "nothing to commit (use -u to show untracked files)\n"

2026 msgstr ""

2027 "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"

2028

1983 -#: wt-status.c:1416

2029 +#: wt-status.c:1419

2030 #, c-format

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

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

2033

1988 -#: wt-status.c:1525

2034 +#: wt-status.c:1528

2035 msgid "HEAD (no branch)"

2036 msgstr "HEAD (sense branca)"

2037

1992 -#: wt-status.c:1531

2038 +#: wt-status.c:1534

2039 msgid "Initial commit on "

2040 msgstr "Comissió inicial en "

2041

1996 -#: wt-status.c:1563

2042 +#: wt-status.c:1561

2043 msgid "gone"

2044 msgstr "no hi és"

2045

2000 -#: wt-status.c:1565 wt-status.c:1573

2046 +#: wt-status.c:1563 wt-status.c:1571

2047 msgid "behind "

2048 msgstr "darrere "

2049

2004 -#: compat/precompose_utf8.c:55 builtin/clone.c:360

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

2051 #, c-format

2052 msgid "failed to unlink '%s'"

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

@@ -2028,7 +2074,7 @@ msgstr "elimina '%s'\n"

2074 msgid "Unstaged changes after refreshing the index:"

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

2076

2031 -#: builtin/add.c:194 builtin/rev-parse.c:785

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

2078 msgid "Could not read the index"

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

2080

@@ -2041,116 +2087,120 @@ msgstr "No s'ha pogut obrir '%s' per a escriptura."

2087 msgid "Could not write patch"

2088 msgstr "No s'ha pogut escriure el pedaç"

2089

2044 -#: builtin/add.c:214

2090 +#: builtin/add.c:212

2091 +msgid "editing patch failed"

2092 +msgstr "l'edició del pedaç ha fallat"

2093 +

2094 +#: builtin/add.c:215

2095 #, c-format

2096 msgid "Could not stat '%s'"

2097 msgstr "No s'ha pogut fer stat a '%s'"

2098

2049 -#: builtin/add.c:216

2099 +#: builtin/add.c:217

2100 msgid "Empty patch. Aborted."

2101 msgstr "El pedaç és buit. Avortat."

2102

2053 -#: builtin/add.c:221

2103 +#: builtin/add.c:222

2104 #, c-format

2105 msgid "Could not apply '%s'"

2106 msgstr "No s'ha pogut aplicar '%s'"

2107

2058 -#: builtin/add.c:231

2108 +#: builtin/add.c:232

2109 msgid "The following paths are ignored by one of your .gitignore files:\n"

2110 msgstr ""

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

2112

2063 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

2064 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

2065 -#: builtin/rm.c:269

2113 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2114 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2115 +#: builtin/rm.c:268

2116 msgid "dry run"

2117 msgstr "marxa en sec"

2118

2069 -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

2070 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608

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

2120 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

2121 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2122 msgid "be verbose"

2123 msgstr "sigues detallat"

2124

2075 -#: builtin/add.c:251

2125 +#: builtin/add.c:252

2126 msgid "interactive picking"

2127 msgstr "recull interactiu"

2128

2079 -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

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

2130 msgid "select hunks interactively"

2131 msgstr "selecciona els trossos interactivament"

2132

2083 -#: builtin/add.c:253

2133 +#: builtin/add.c:254

2134 msgid "edit current diff and apply"

2135 msgstr "edita la diferència actual i aplica-la"

2136

2087 -#: builtin/add.c:254

2137 +#: builtin/add.c:255

2138 msgid "allow adding otherwise ignored files"

2139 msgstr "permet afegir fitxers que d'altra manera s'ignoren"

2140

2091 -#: builtin/add.c:255

2141 +#: builtin/add.c:256

2142 msgid "update tracked files"

2143 msgstr "actualitza els fitxers seguits"

2144

2095 -#: builtin/add.c:256

2145 +#: builtin/add.c:257

2146 msgid "record only the fact that the path will be added later"

2147 msgstr "registra només el fet que el camí s'afegirà més tard"

2148

2099 -#: builtin/add.c:257

2149 +#: builtin/add.c:258

2150 msgid "add changes from all tracked and untracked files"

2151 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"

2152

2103 -#: builtin/add.c:260

2153 +#: builtin/add.c:261

2154 msgid "ignore paths removed in the working tree (same as --no-all)"

2155 msgstr ""

2156 "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"

2157

2108 -#: builtin/add.c:262

2158 +#: builtin/add.c:263

2159 msgid "don't add, only refresh the index"

2160 msgstr "no afegeixis, només actualitza l'índex"

2161

2112 -#: builtin/add.c:263

2162 +#: builtin/add.c:264

2163 msgid "just skip files which cannot be added because of errors"

2164 msgstr "només omet els fitxers que no es poden afegir a causa d'errors"

2165

2116 -#: builtin/add.c:264

2166 +#: builtin/add.c:265

2167 msgid "check if - even missing - files are ignored in dry run"

2168 msgstr ""

2169 "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"

2170

2121 -#: builtin/add.c:286

2171 +#: builtin/add.c:287

2172 #, c-format

2173 msgid "Use -f if you really want to add them.\n"

2174 msgstr "Useu -f si realment els voleu afegir.\n"

2175

2126 -#: builtin/add.c:293

2176 +#: builtin/add.c:294

2177 msgid "adding files failed"

2178 msgstr "l'afegiment de fitxers ha fallat"

2179

2130 -#: builtin/add.c:329

2180 +#: builtin/add.c:330

2181 msgid "-A and -u are mutually incompatible"

2182 msgstr "-A i -u són mutualment incompatibles"

2183

2134 -#: builtin/add.c:336

2184 +#: builtin/add.c:337

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

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

2187

2138 -#: builtin/add.c:357

2188 +#: builtin/add.c:358

2189 #, c-format

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

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

2192

2143 -#: builtin/add.c:358

2193 +#: builtin/add.c:359

2194 #, c-format

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

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

2197

2148 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2149 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2198 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2199 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2200 msgid "index file corrupt"

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

2202

2153 -#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431

2203 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2204 msgid "Unable to write new index file"

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

2206

@@ -2231,77 +2281,77 @@ msgstr[1] ""

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

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

2283

2234 -#: builtin/apply.c:1656

2284 +#: builtin/apply.c:1659

2285 msgid "new file depends on old contents"

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

2287

2238 -#: builtin/apply.c:1658

2288 +#: builtin/apply.c:1661

2289 msgid "deleted file still has contents"

2290 msgstr "el fitxer suprimit encara té continguts"

2291

2242 -#: builtin/apply.c:1684

2292 +#: builtin/apply.c:1687

2293 #, c-format

2294 msgid "corrupt patch at line %d"

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

2296

2247 -#: builtin/apply.c:1720

2297 +#: builtin/apply.c:1723

2298 #, c-format

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

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

2301

2252 -#: builtin/apply.c:1722

2302 +#: builtin/apply.c:1725

2303 #, c-format

2304 msgid "deleted file %s still has contents"

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

2306

2257 -#: builtin/apply.c:1725

2307 +#: builtin/apply.c:1728

2308 #, c-format

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

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

2311

2262 -#: builtin/apply.c:1871

2312 +#: builtin/apply.c:1874

2313 #, c-format

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

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

2316

2267 -#: builtin/apply.c:1900

2317 +#: builtin/apply.c:1903

2318 #, c-format

2319 msgid "unrecognized binary patch at line %d"

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

2321

2272 -#: builtin/apply.c:2051

2322 +#: builtin/apply.c:2054

2323 #, c-format

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

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

2326

2277 -#: builtin/apply.c:2141

2327 +#: builtin/apply.c:2144

2328 #, c-format

2329 msgid "unable to read symlink %s"

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

2331

2282 -#: builtin/apply.c:2145

2332 +#: builtin/apply.c:2148

2333 #, c-format

2334 msgid "unable to open or read %s"

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

2336

2287 -#: builtin/apply.c:2778

2337 +#: builtin/apply.c:2781

2338 #, c-format

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

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

2341

2292 -#: builtin/apply.c:2897

2342 +#: builtin/apply.c:2900

2343 #, c-format

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

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

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

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

2348

2299 -#: builtin/apply.c:2909

2349 +#: builtin/apply.c:2912

2350 #, c-format

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

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

2353

2304 -#: builtin/apply.c:2915

2354 +#: builtin/apply.c:2918

2355 #, c-format

2356 msgid ""

2357 "while searching for:\n"

@@ -2310,343 +2360,343 @@ msgstr ""

2360 "tot cercant:\n"

2361 "%.*s"

2362

2313 -#: builtin/apply.c:2935

2363 +#: builtin/apply.c:2938

2364 #, c-format

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

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

2367

2318 -#: builtin/apply.c:3036

2368 +#: builtin/apply.c:3039

2369 #, c-format

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

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

2372

2323 -#: builtin/apply.c:3042

2373 +#: builtin/apply.c:3045

2374 #, c-format

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

2376 msgstr ""

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

2378

2329 -#: builtin/apply.c:3063

2379 +#: builtin/apply.c:3066

2380 #, c-format

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

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

2383

2334 -#: builtin/apply.c:3187

2384 +#: builtin/apply.c:3190

2385 #, c-format

2386 msgid "cannot checkout %s"

2387 msgstr "no es pot agafar %s"

2388

2339 -#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288

2389 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2390 #, c-format

2391 msgid "read of %s failed"

2392 msgstr "la lectura de %s ha fallat"

2393

2344 -#: builtin/apply.c:3240

2394 +#: builtin/apply.c:3243

2395 #, c-format

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

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

2398

2349 -#: builtin/apply.c:3268 builtin/apply.c:3490

2399 +#: builtin/apply.c:3271 builtin/apply.c:3493

2400 #, c-format

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

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

2403

2354 -#: builtin/apply.c:3349 builtin/apply.c:3504

2404 +#: builtin/apply.c:3352 builtin/apply.c:3507

2405 #, c-format

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

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

2408

2359 -#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518

2409 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2410 #, c-format

2411 msgid "%s: %s"

2412 msgstr "%s: %s"

2413

2364 -#: builtin/apply.c:3358 builtin/apply.c:3512

2414 +#: builtin/apply.c:3361 builtin/apply.c:3515

2415 #, c-format

2416 msgid "%s: does not match index"

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

2418

2369 -#: builtin/apply.c:3460

2419 +#: builtin/apply.c:3463

2420 msgid "removal patch leaves file contents"

2421 msgstr "el pedaç de supressió deixa els continguts dels fitxers"

2422

2373 -#: builtin/apply.c:3529

2423 +#: builtin/apply.c:3532

2424 #, c-format

2425 msgid "%s: wrong type"

2426 msgstr "%s: tipus erroni"

2427

2378 -#: builtin/apply.c:3531

2428 +#: builtin/apply.c:3534

2429 #, c-format

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

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

2432

2383 -#: builtin/apply.c:3690 builtin/apply.c:3692

2433 +#: builtin/apply.c:3693 builtin/apply.c:3695

2434 #, c-format

2435 msgid "invalid path '%s'"

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

2437

2388 -#: builtin/apply.c:3747

2438 +#: builtin/apply.c:3750

2439 #, c-format

2440 msgid "%s: already exists in index"

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

2442

2393 -#: builtin/apply.c:3750

2443 +#: builtin/apply.c:3753

2444 #, c-format

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

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

2447

2398 -#: builtin/apply.c:3770

2448 +#: builtin/apply.c:3773

2449 #, c-format

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

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

2452

2403 -#: builtin/apply.c:3775

2453 +#: builtin/apply.c:3778

2454 #, c-format

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

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

2457

2408 -#: builtin/apply.c:3795

2458 +#: builtin/apply.c:3798

2459 #, c-format

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

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

2462

2413 -#: builtin/apply.c:3799

2463 +#: builtin/apply.c:3802

2464 #, c-format

2465 msgid "%s: patch does not apply"

2466 msgstr "%s: el pedaç no aplica"

2467

2418 -#: builtin/apply.c:3813

2468 +#: builtin/apply.c:3816

2469 #, c-format

2470 msgid "Checking patch %s..."

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

2472

2423 -#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135

2473 +#: builtin/apply.c:3909 builtin/checkout.c:237 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'"

2477

2428 -#: builtin/apply.c:4049

2478 +#: builtin/apply.c:4052

2479 #, c-format

2480 msgid "unable to remove %s from index"

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

2482

2433 -#: builtin/apply.c:4078

2483 +#: builtin/apply.c:4081

2484 #, c-format

2485 msgid "corrupt patch for submodule %s"

2486 msgstr "pedaç corrupte per al submòdul %s"

2487

2438 -#: builtin/apply.c:4082

2488 +#: builtin/apply.c:4085

2489 #, c-format

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

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

2492

2443 -#: builtin/apply.c:4087

2493 +#: builtin/apply.c:4090

2494 #, c-format

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

2496 msgstr ""

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

2498 "%s"

2499

2450 -#: builtin/apply.c:4090 builtin/apply.c:4198

2500 +#: builtin/apply.c:4093 builtin/apply.c:4201

2501 #, c-format

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

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

2504

2455 -#: builtin/apply.c:4123

2505 +#: builtin/apply.c:4126

2506 #, c-format

2507 msgid "closing file '%s'"

2508 msgstr "tancant el fitxer '%s'"

2509

2460 -#: builtin/apply.c:4172

2510 +#: builtin/apply.c:4175

2511 #, c-format

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

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

2514

2465 -#: builtin/apply.c:4259

2515 +#: builtin/apply.c:4262

2516 #, c-format

2517 msgid "Applied patch %s cleanly."

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

2519

2470 -#: builtin/apply.c:4267

2520 +#: builtin/apply.c:4270

2521 msgid "internal error"

2522 msgstr "error intern"

2523

2474 -#: builtin/apply.c:4270

2524 +#: builtin/apply.c:4273

2525 #, c-format

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

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

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

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

2530

2481 -#: builtin/apply.c:4280

2531 +#: builtin/apply.c:4283

2532 #, c-format

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

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

2535

2486 -#: builtin/apply.c:4301

2536 +#: builtin/apply.c:4304

2537 #, c-format

2538 msgid "Hunk #%d applied cleanly."

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

2540

2491 -#: builtin/apply.c:4304

2541 +#: builtin/apply.c:4307

2542 #, c-format

2543 msgid "Rejected hunk #%d."

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

2545

2496 -#: builtin/apply.c:4394

2546 +#: builtin/apply.c:4397

2547 msgid "unrecognized input"

2548 msgstr "entrada no reconeguda"

2549

2500 -#: builtin/apply.c:4405

2550 +#: builtin/apply.c:4408

2551 msgid "unable to read index file"

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

2553

2504 -#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92

2554 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2555 #: builtin/fetch.c:92

2556 msgid "path"

2557 msgstr "camí"

2558

2509 -#: builtin/apply.c:4523

2559 +#: builtin/apply.c:4526

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

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

2562

2513 -#: builtin/apply.c:4526

2563 +#: builtin/apply.c:4529

2564 msgid "apply changes matching the given path"

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

2566

2517 -#: builtin/apply.c:4528

2567 +#: builtin/apply.c:4531

2568 msgid "num"

2569 msgstr "número"

2570

2521 -#: builtin/apply.c:4529

2571 +#: builtin/apply.c:4532

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

2573 msgstr ""

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

2575 "tradicionals"

2576

2527 -#: builtin/apply.c:4532

2577 +#: builtin/apply.c:4535

2578 msgid "ignore additions made by the patch"

2579 msgstr "ignora afegiments fets pel pedaç"

2580

2531 -#: builtin/apply.c:4534

2581 +#: builtin/apply.c:4537

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

2583 msgstr ""

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

2585

2536 -#: builtin/apply.c:4538

2586 +#: builtin/apply.c:4541

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

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

2589

2540 -#: builtin/apply.c:4540

2590 +#: builtin/apply.c:4543

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

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

2593

2544 -#: builtin/apply.c:4542

2594 +#: builtin/apply.c:4545

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

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

2597

2548 -#: builtin/apply.c:4544

2598 +#: builtin/apply.c:4547

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

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

2601

2552 -#: builtin/apply.c:4546

2602 +#: builtin/apply.c:4549

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

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

2605

2556 -#: builtin/apply.c:4548

2606 +#: builtin/apply.c:4551

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

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

2609

2560 -#: builtin/apply.c:4550

2610 +#: builtin/apply.c:4553

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

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

2613

2564 -#: builtin/apply.c:4552

2614 +#: builtin/apply.c:4555

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

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

2617

2568 -#: builtin/apply.c:4554

2618 +#: builtin/apply.c:4557

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

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

2621

2572 -#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412

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

2623 msgid "paths are separated with NUL character"

2624 msgstr "els camins es separen amb el caràcter NUL"

2625

2576 -#: builtin/apply.c:4559

2626 +#: builtin/apply.c:4562

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

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

2629

2580 -#: builtin/apply.c:4560

2630 +#: builtin/apply.c:4563

2631 msgid "action"

2632 msgstr "acció"

2633

2584 -#: builtin/apply.c:4561

2634 +#: builtin/apply.c:4564

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

2636 msgstr ""

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

2638

2589 -#: builtin/apply.c:4564 builtin/apply.c:4567

2639 +#: builtin/apply.c:4567 builtin/apply.c:4570

2640 msgid "ignore changes in whitespace when finding context"

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

2642

2593 -#: builtin/apply.c:4570

2643 +#: builtin/apply.c:4573

2644 msgid "apply the patch in reverse"

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

2646

2597 -#: builtin/apply.c:4572

2647 +#: builtin/apply.c:4575

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

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

2650

2601 -#: builtin/apply.c:4574

2651 +#: builtin/apply.c:4577

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

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

2654

2605 -#: builtin/apply.c:4576

2655 +#: builtin/apply.c:4579

2656 msgid "allow overlapping hunks"

2657 msgstr "permet trossos encavalcants"

2658

2609 -#: builtin/apply.c:4579

2659 +#: builtin/apply.c:4582

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

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

2662

2613 -#: builtin/apply.c:4582

2663 +#: builtin/apply.c:4585

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

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

2666

2617 -#: builtin/apply.c:4584

2667 +#: builtin/apply.c:4587

2668 msgid "root"

2669 msgstr "arrel"

2670

2621 -#: builtin/apply.c:4585

2671 +#: builtin/apply.c:4588

2672 msgid "prepend <root> to all filenames"

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

2674

2625 -#: builtin/apply.c:4607

2675 +#: builtin/apply.c:4610

2676 msgid "--3way outside a repository"

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

2678

2629 -#: builtin/apply.c:4615

2679 +#: builtin/apply.c:4618

2680 msgid "--index outside a repository"

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

2682

2633 -#: builtin/apply.c:4618

2683 +#: builtin/apply.c:4621

2684 msgid "--cached outside a repository"

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

2686

2637 -#: builtin/apply.c:4637

2687 +#: builtin/apply.c:4640

2688 #, c-format

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

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

2691

2642 -#: builtin/apply.c:4651

2692 +#: builtin/apply.c:4654

2693 #, c-format

2694 msgid "squelched %d whitespace error"

2695 msgid_plural "squelched %d whitespace errors"

2696 msgstr[0] "%d error d'espai en blanc omès"

2697 msgstr[1] "%d errors d'espai en blanc omesos"

2698

2649 -#: builtin/apply.c:4657 builtin/apply.c:4667

2699 +#: builtin/apply.c:4660 builtin/apply.c:4670

2700 #, c-format

2701 msgid "%d line adds whitespace errors."

2702 msgid_plural "%d lines add whitespace errors."

@@ -2700,11 +2750,11 @@ msgstr "realitza 'git bisect next'"

2750 msgid "update BISECT_HEAD instead of checking out the current commit"

2751 msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"

2752

2703 -#: builtin/blame.c:30

2704 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2753 +#: builtin/blame.c:31

2754 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

2755 msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"

2756

2707 -#: builtin/blame.c:35

2757 +#: builtin/blame.c:36

2758 msgid "<rev-opts> are documented in git-rev-list(1)"

2759 msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"

2760

@@ -2832,7 +2882,7 @@ msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."

2882 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2883 msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"

2884

2835 -#: builtin/branch.c:152

2885 +#: builtin/branch.c:150

2886 #, c-format

2887 msgid ""

2888 "deleting branch '%s' that has been merged to\n"

@@ -2842,7 +2892,7 @@ msgstr ""

2892 " '%s', però encara no s'ha fusionat\n"

2893 " a HEAD."

2894

2845 -#: builtin/branch.c:156

2895 +#: builtin/branch.c:154

2896 #, c-format

2897 msgid ""

2898 "not deleting branch '%s' that is not yet merged to\n"

@@ -2852,12 +2902,12 @@ msgstr ""

2902 " fusionat a '%s', encara que està\n"

2903 " fusionada a HEAD."

2904

2855 -#: builtin/branch.c:170

2905 +#: builtin/branch.c:168

2906 #, c-format

2907 msgid "Couldn't look up commit object for '%s'"

2908 msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"

2909

2860 -#: builtin/branch.c:174

2910 +#: builtin/branch.c:172

2911 #, c-format

2912 msgid ""

2913 "The branch '%s' is not fully merged.\n"

@@ -2866,348 +2916,348 @@ msgstr ""

2916 "La branca '%s' no està totalment fusionada.\n"

2917 "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."

2918

2869 -#: builtin/branch.c:187

2919 +#: builtin/branch.c:185

2920 msgid "Update of config-file failed"

2921 msgstr "L'actualització del fitxer de configuració ha fallat"

2922

2873 -#: builtin/branch.c:215

2923 +#: builtin/branch.c:213

2924 msgid "cannot use -a with -d"

2925 msgstr "no es pot usar -a amb -d"

2926

2877 -#: builtin/branch.c:221

2927 +#: builtin/branch.c:219

2928 msgid "Couldn't look up commit object for HEAD"

2929 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"

2930

2881 -#: builtin/branch.c:229

2931 +#: builtin/branch.c:227

2932 #, c-format

2933 msgid "Cannot delete the branch '%s' which you are currently on."

2934 msgstr "No es pot suprimir la branca '%s', en la qual sou actualment."

2935

2886 -#: builtin/branch.c:245

2936 +#: builtin/branch.c:243

2937 #, c-format

2888 -msgid "remote branch '%s' not found."

2889 -msgstr "no s'ha trobat la branca remota '%s'."

2938 +msgid "remote-tracking branch '%s' not found."

2939 +msgstr "no s'ha trobat la branca amb seguiment remot '%s'."

2940

2891 -#: builtin/branch.c:246

2941 +#: builtin/branch.c:244

2942 #, c-format

2943 msgid "branch '%s' not found."

2944 msgstr "no s'ha trobat la branca '%s'."

2945

2896 -#: builtin/branch.c:260

2946 +#: builtin/branch.c:258

2947 #, c-format

2898 -msgid "Error deleting remote branch '%s'"

2899 -msgstr "Error en suprimir la branca remota '%s'"

2948 +msgid "Error deleting remote-tracking branch '%s'"

2949 +msgstr "Error en suprimir la branca amb seguiment remot '%s'"

2950

2901 -#: builtin/branch.c:261

2951 +#: builtin/branch.c:259

2952 #, c-format

2953 msgid "Error deleting branch '%s'"

2954 msgstr "Error en suprimir la branca '%s'"

2955

2906 -#: builtin/branch.c:268

2956 +#: builtin/branch.c:266

2957 #, c-format

2908 -msgid "Deleted remote branch %s (was %s).\n"

2909 -msgstr "S'ha suprimit la branca remota %s (ha estat %s).\n"

2958 +msgid "Deleted remote-tracking branch %s (was %s).\n"

2959 +msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"

2960

2911 -#: builtin/branch.c:269

2961 +#: builtin/branch.c:267

2962 #, c-format

2963 msgid "Deleted branch %s (was %s).\n"

2914 -msgstr "S'ha suprimit la branca %s (ha estat %s).\n"

2964 +msgstr "S'ha suprimit la branca %s (era %s).\n"

2965

2916 -#: builtin/branch.c:370

2966 +#: builtin/branch.c:368

2967 #, c-format

2968 msgid "branch '%s' does not point at a commit"

2969 msgstr "la branca '%s' no assenyala cap comissió"

2970

2921 -#: builtin/branch.c:459

2971 +#: builtin/branch.c:451

2972 #, c-format

2973 msgid "[%s: gone]"

2974 msgstr "[%s: no hi és]"

2975

2926 -#: builtin/branch.c:464

2976 +#: builtin/branch.c:456

2977 #, c-format

2978 msgid "[%s]"

2979 msgstr "[%s]"

2980

2931 -#: builtin/branch.c:469

2981 +#: builtin/branch.c:461

2982 #, c-format

2983 msgid "[%s: behind %d]"

2984 msgstr "[%s: darrere per %d]"

2985

2936 -#: builtin/branch.c:471

2986 +#: builtin/branch.c:463

2987 #, c-format

2988 msgid "[behind %d]"

2989 msgstr "[darrere de %d]"

2990

2941 -#: builtin/branch.c:475

2991 +#: builtin/branch.c:467

2992 #, c-format

2993 msgid "[%s: ahead %d]"

2994 msgstr "[%s: davant per %d]"

2995

2946 -#: builtin/branch.c:477

2996 +#: builtin/branch.c:469

2997 #, c-format

2998 msgid "[ahead %d]"

2999 msgstr "[davant de %d]"

3000

2951 -#: builtin/branch.c:480

3001 +#: builtin/branch.c:472

3002 #, c-format

3003 msgid "[%s: ahead %d, behind %d]"

3004 msgstr "[%s: davant per %d, darrere per %d]"

3005

2956 -#: builtin/branch.c:483

3006 +#: builtin/branch.c:475

3007 #, c-format

3008 msgid "[ahead %d, behind %d]"

3009 msgstr "[davant %d, darrere %d]"

3010

2961 -#: builtin/branch.c:496

3011 +#: builtin/branch.c:488

3012 msgid " **** invalid ref ****"

3013 msgstr " **** referència no vàlida ****"

3014

2965 -#: builtin/branch.c:587

3015 +#: builtin/branch.c:579

3016 #, c-format

3017 msgid "(no branch, rebasing %s)"

3018 msgstr "(cap branca, rebasant %s)"

3019

2970 -#: builtin/branch.c:590

3020 +#: builtin/branch.c:582

3021 #, c-format

3022 msgid "(no branch, bisect started on %s)"

3023 msgstr "(cap branca, bisecció començada en %s)"

3024

2975 -#: builtin/branch.c:596

3025 +#: builtin/branch.c:588

3026 #, c-format

3027 msgid "(HEAD detached at %s)"

3028 msgstr "(HEAD separat a %s)"

3029

2980 -#: builtin/branch.c:599

3030 +#: builtin/branch.c:591

3031 #, c-format

3032 msgid "(HEAD detached from %s)"

3033 msgstr "(HEAD separat de %s)"

3034

2985 -#: builtin/branch.c:603

3035 +#: builtin/branch.c:595

3036 msgid "(no branch)"

3037 msgstr "(cap branca)"

3038

2989 -#: builtin/branch.c:650

3039 +#: builtin/branch.c:642

3040 #, c-format

3041 msgid "object '%s' does not point to a commit"

3042 msgstr "l'objecte '%s' no assenyala cap comissió"

3043

2994 -#: builtin/branch.c:698

3044 +#: builtin/branch.c:690

3045 msgid "some refs could not be read"

3046 msgstr "no s'han pogut llegir algunes referències"

3047

2998 -#: builtin/branch.c:711

3048 +#: builtin/branch.c:703

3049 msgid "cannot rename the current branch while not on any."

3050 msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."

3051

3002 -#: builtin/branch.c:721

3052 +#: builtin/branch.c:713

3053 #, c-format

3054 msgid "Invalid branch name: '%s'"

3055 msgstr "Nom de branca no vàlid: '%s'"

3056

3007 -#: builtin/branch.c:736

3057 +#: builtin/branch.c:728

3058 msgid "Branch rename failed"

3059 msgstr "El canvi de nom de branca ha fallat"

3060

3011 -#: builtin/branch.c:740

3061 +#: builtin/branch.c:732

3062 #, c-format

3063 msgid "Renamed a misnamed branch '%s' away"

3064 msgstr "S'ha canviat el nom de la branca malanomenada '%s'"

3065

3016 -#: builtin/branch.c:744

3066 +#: builtin/branch.c:736

3067 #, c-format

3068 msgid "Branch renamed to %s, but HEAD is not updated!"

3069 msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"

3070

3021 -#: builtin/branch.c:751

3071 +#: builtin/branch.c:743

3072 msgid "Branch is renamed, but update of config-file failed"

3073 msgstr ""

3074 "La branca està canviada de nom, però l'actualització del fitxer de "

3075 "configuració ha fallat"

3076

3027 -#: builtin/branch.c:766

3077 +#: builtin/branch.c:758

3078 #, c-format

3079 msgid "malformed object name %s"

3080 msgstr "nom d'objecte %s mal format"

3081

3032 -#: builtin/branch.c:790

3082 +#: builtin/branch.c:780

3083 #, c-format

3084 msgid "could not write branch description template: %s"

3085 msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s"

3086

3037 -#: builtin/branch.c:820

3087 +#: builtin/branch.c:810

3088 msgid "Generic options"

3089 msgstr "Opcions genèriques"

3090

3041 -#: builtin/branch.c:822

3091 +#: builtin/branch.c:812

3092 msgid "show hash and subject, give twice for upstream branch"

3093 msgstr "mostra el hash i el tema, doneu dues vegades per la branca font"

3094

3045 -#: builtin/branch.c:823

3095 +#: builtin/branch.c:813

3096 msgid "suppress informational messages"

3097 msgstr "omet els missatges informatius"

3098

3049 -#: builtin/branch.c:824

3099 +#: builtin/branch.c:814

3100 msgid "set up tracking mode (see git-pull(1))"

3101 msgstr "configura el mode de seguiment (vegeu git-pull(1))"

3102

3053 -#: builtin/branch.c:826

3103 +#: builtin/branch.c:816

3104 msgid "change upstream info"

3105 msgstr "canvia la informació de font"

3106

3057 -#: builtin/branch.c:830

3107 +#: builtin/branch.c:820

3108 msgid "use colored output"

3109 msgstr "usa sortida colorada"

3110

3061 -#: builtin/branch.c:831

3111 +#: builtin/branch.c:821

3112 msgid "act on remote-tracking branches"

3113 msgstr "actua en branques amb seguiment remot"

3114

3065 -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

3066 -#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583

3067 -#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616

3115 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3116 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3117 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3118 #: builtin/tag.c:622

3119 msgid "commit"

3120 msgstr "comissió"

3121

3072 -#: builtin/branch.c:835 builtin/branch.c:841

3122 +#: builtin/branch.c:825 builtin/branch.c:831

3123 msgid "print only branches that contain the commit"

3124 msgstr "imprimeix només les branques que continguin la comissió"

3125

3076 -#: builtin/branch.c:847

3126 +#: builtin/branch.c:837

3127 msgid "Specific git-branch actions:"

3128 msgstr "Accions de git-branch específiques:"

3129

3080 -#: builtin/branch.c:848

3130 +#: builtin/branch.c:838

3131 msgid "list both remote-tracking and local branches"

3132 msgstr "llista les branques amb seguiment remot i les locals"

3133

3084 -#: builtin/branch.c:850

3134 +#: builtin/branch.c:840

3135 msgid "delete fully merged branch"

3136 msgstr "suprimeix la branca si és completament fusionada"

3137

3088 -#: builtin/branch.c:851

3138 +#: builtin/branch.c:841

3139 msgid "delete branch (even if not merged)"

3140 msgstr "suprimeix la branca (encara que no estigui fusionada)"

3141

3092 -#: builtin/branch.c:852

3142 +#: builtin/branch.c:842

3143 msgid "move/rename a branch and its reflog"

3144 msgstr "mou/canvia de nom una branca i el seu registre de referència"

3145

3096 -#: builtin/branch.c:853

3146 +#: builtin/branch.c:843

3147 msgid "move/rename a branch, even if target exists"

3148 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"

3149

3100 -#: builtin/branch.c:854

3150 +#: builtin/branch.c:844

3151 msgid "list branch names"

3152 msgstr "llista els noms de branca"

3153

3104 -#: builtin/branch.c:855

3154 +#: builtin/branch.c:845

3155 msgid "create the branch's reflog"

3156 msgstr "crea el registre de referència de la branca"

3157

3108 -#: builtin/branch.c:857

3158 +#: builtin/branch.c:847

3159 msgid "edit the description for the branch"

3160 msgstr "edita la descripció de la branca"

3161

3112 -#: builtin/branch.c:858

3162 +#: builtin/branch.c:848

3163 msgid "force creation, move/rename, deletion"

3164 msgstr "força creació, moviment/canvi de nom, supressió"

3165

3116 -#: builtin/branch.c:861

3166 +#: builtin/branch.c:851

3167 msgid "print only not merged branches"

3168 msgstr "imprimeix només les branques sense fusionar"

3169

3120 -#: builtin/branch.c:867

3170 +#: builtin/branch.c:857

3171 msgid "print only merged branches"

3172 msgstr "imprimeix només les branques fusionades"

3173

3124 -#: builtin/branch.c:871

3174 +#: builtin/branch.c:861

3175 msgid "list branches in columns"

3176 msgstr "llista les branques en columnes"

3177

3128 -#: builtin/branch.c:884

3178 +#: builtin/branch.c:874

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

3132 -#: builtin/branch.c:888 builtin/clone.c:637

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

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

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

3185

3136 -#: builtin/branch.c:910

3186 +#: builtin/branch.c:900

3187 msgid "--column and --verbose are incompatible"

3188 msgstr "--column i --verbose són incompatibles"

3189

3140 -#: builtin/branch.c:921 builtin/branch.c:960

3190 +#: builtin/branch.c:911 builtin/branch.c:950

3191 msgid "branch name required"

3192 msgstr "cal el nom de branca"

3193

3144 -#: builtin/branch.c:936

3194 +#: builtin/branch.c:926

3195 msgid "Cannot give description to detached HEAD"

3196 msgstr "No es pot donar descripció a un HEAD separat"

3197

3148 -#: builtin/branch.c:941

3198 +#: builtin/branch.c:931

3199 msgid "cannot edit description of more than one branch"

3200 msgstr "no es pot editar la descripció de més d'una branca"

3201

3152 -#: builtin/branch.c:948

3202 +#: builtin/branch.c:938

3203 #, c-format

3204 msgid "No commit on branch '%s' yet."

3205 msgstr "Encara no hi ha comissió en la branca '%s'."

3206

3157 -#: builtin/branch.c:951

3207 +#: builtin/branch.c:941

3208 #, c-format

3209 msgid "No branch named '%s'."

3210 msgstr "No hi ha branca amb nom '%s'."

3211

3162 -#: builtin/branch.c:966

3212 +#: builtin/branch.c:956

3213 msgid "too many branches for a rename operation"

3214 msgstr "hi ha massa branques per a una operació de canvi de nom"

3215

3166 -#: builtin/branch.c:971

3216 +#: builtin/branch.c:961

3217 msgid "too many branches to set new upstream"

3218 msgstr "hi ha massa branques per a establir una nova font"

3219

3170 -#: builtin/branch.c:975

3220 +#: builtin/branch.c:965

3221 #, c-format

3222 msgid ""

3223 "could not set upstream of HEAD to %s when it does not point to any branch."

3224 msgstr ""

3225 "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."

3226

3177 -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3227 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3228 #, c-format

3229 msgid "no such branch '%s'"

3230 msgstr "no hi ha tal branca '%s'"

3231

3182 -#: builtin/branch.c:982

3232 +#: builtin/branch.c:972

3233 #, c-format

3234 msgid "branch '%s' does not exist"

3235 msgstr "la branca '%s' no existeix"

3236

3187 -#: builtin/branch.c:994

3237 +#: builtin/branch.c:984

3238 msgid "too many branches to unset upstream"

3239 msgstr "hi ha massa branques per a desestablir la font"

3240

3191 -#: builtin/branch.c:998

3241 +#: builtin/branch.c:988

3242 msgid "could not unset upstream of HEAD when it does not point to any branch."

3243 msgstr ""

3244 "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."

3245

3196 -#: builtin/branch.c:1004

3246 +#: builtin/branch.c:994

3247 #, c-format

3248 msgid "Branch '%s' has no upstream information"

3249 msgstr "La branca '%s' no té informació de font"

3250

3201 -#: builtin/branch.c:1018

3251 +#: builtin/branch.c:1008

3252 msgid "it does not make sense to create 'HEAD' manually"

3253 msgstr "no té sentit crear 'HEAD' manualment"

3254

3205 -#: builtin/branch.c:1024

3255 +#: builtin/branch.c:1014

3256 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3257 msgstr ""

3258 "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"

3259

3210 -#: builtin/branch.c:1027

3260 +#: builtin/branch.c:1017

3261 #, c-format

3262 msgid ""

3263 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3216,7 +3266,7 @@ msgstr ""

3266 "La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --"

3267 "track o --set-upstream-to\n"

3268

3219 -#: builtin/branch.c:1044

3269 +#: builtin/branch.c:1034

3270 #, c-format

3271 msgid ""

3272 "\n"

@@ -3227,70 +3277,87 @@ msgstr ""

3277 "Si volíeu fer '%s' seguir '%s', feu això:\n"

3278 "\n"

3279

3230 -#: builtin/branch.c:1045

3280 +#: builtin/branch.c:1035

3281 #, c-format

3282 msgid " git branch -d %s\n"

3283 msgstr " git branch -d %s\n"

3284

3235 -#: builtin/branch.c:1046

3285 +#: builtin/branch.c:1036

3286 #, c-format

3287 msgid " git branch --set-upstream-to %s\n"

3288 msgstr " git branch --set-upstream-to %s\n"

3289

3240 -#: builtin/bundle.c:47

3290 +#: builtin/bundle.c:51

3291 #, c-format

3292 msgid "%s is okay\n"

3293 msgstr "%s està bé\n"

3294

3245 -#: builtin/bundle.c:56

3295 +#: builtin/bundle.c:64

3296 msgid "Need a repository to create a bundle."

3297 msgstr "Cal un dipòsit per a fer un farcell."

3298

3249 -#: builtin/bundle.c:60

3299 +#: builtin/bundle.c:68

3300 msgid "Need a repository to unbundle."

3301 msgstr "Cal un dipòsit per a desfer un farcell."

3302

3253 -#: builtin/cat-file.c:326

3254 -msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"

3255 -msgstr "git cat-file (-t | -s | -e | -p | <tipus> | --textconv) <objecte>"

3303 +#: builtin/cat-file.c:369

3304 +msgid ""

3305 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3306 +"<type>|--textconv) <object>"

3307 +msgstr ""

3308 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3309 +"<tipus>|--textconv) <objecte>"

3310

3257 -#: builtin/cat-file.c:327

3258 -msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3259 -msgstr "git cat-file (--batch | --batch-check) < <llista-d'objectes>"

3311 +#: builtin/cat-file.c:370

3312 +msgid ""

3313 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3314 +"objects>"

3315 +msgstr ""

3316 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <llista-"

3317 +"d'objectes>"

3318

3261 -#: builtin/cat-file.c:364

3319 +#: builtin/cat-file.c:407

3320 msgid "<type> can be one of: blob, tree, commit, tag"

3321 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"

3322

3265 -#: builtin/cat-file.c:365

3323 +#: builtin/cat-file.c:408

3324 msgid "show object type"

3325 msgstr "mostra el tipus de l'objecte"

3326

3269 -#: builtin/cat-file.c:366

3327 +#: builtin/cat-file.c:409

3328 msgid "show object size"

3329 msgstr "mostra la mida de l'objecte"

3330

3273 -#: builtin/cat-file.c:368

3331 +#: builtin/cat-file.c:411

3332 msgid "exit with zero when there's no error"

3333 msgstr "surt amb zero quan no hi ha error"

3334

3277 -#: builtin/cat-file.c:369

3335 +#: builtin/cat-file.c:412

3336 msgid "pretty-print object's content"

3337 msgstr "imprimeix bellament el contingut de l'objecte"

3338

3281 -#: builtin/cat-file.c:371

3339 +#: builtin/cat-file.c:414

3340 msgid "for blob objects, run textconv on object's content"

3341 msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"

3342

3285 -#: builtin/cat-file.c:373

3343 +#: builtin/cat-file.c:416

3344 +msgid "allow -s and -t to work with broken/corrupt objects"

3345 +msgstr "permet que -s i -t funcionin amb objectes trencats/corruptes"

3346 +

3347 +#: builtin/cat-file.c:418

3348 msgid "show info and content of objects fed from the standard input"

3349 msgstr ""

3350 "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"

3351

3290 -#: builtin/cat-file.c:376

3352 +#: builtin/cat-file.c:421

3353 msgid "show info about objects fed from the standard input"

3354 msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"

3355

3356 +#: builtin/cat-file.c:424

3357 +msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3358 +msgstr ""

3359 +"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"

3360 +

3361 #: builtin/check-attr.c:11

3362 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3363 msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."

@@ -3308,7 +3375,7 @@ msgstr "informa de tots els atributs establerts en el fitxer"

3375 msgid "use .gitattributes only from the index"

3376 msgstr "usa .gitattributes només des de l'índex"

3377

3311 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3378 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3379 msgid "read file names from stdin"

3380 msgstr "llegeix els noms de fitxer d'stdin"

3381

@@ -3316,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

3319 -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

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

3387 msgid "suppress progress reporting"

3388 msgstr "omet el reportatge de progrés"

3389

@@ -3413,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

3416 -#: builtin/checkout.c:25

3483 +#: builtin/checkout.c:26

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

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

3486

3420 -#: builtin/checkout.c:26

3487 +#: builtin/checkout.c:27

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

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

3490

3424 -#: builtin/checkout.c:132 builtin/checkout.c:165

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

3492 #, c-format

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

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

3495

3429 -#: builtin/checkout.c:134 builtin/checkout.c:167

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

3497 #, c-format

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

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

3500

3434 -#: builtin/checkout.c:150

3501 +#: builtin/checkout.c:156

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

3439 -#: builtin/checkout.c:194

3506 +#: builtin/checkout.c:200

3507 #, c-format

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

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

3510

3444 -#: builtin/checkout.c:211

3511 +#: builtin/checkout.c:217

3512 #, c-format

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

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

3515

3449 -#: builtin/checkout.c:228

3516 +#: builtin/checkout.c:234

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

3454 -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3455 -#: builtin/checkout.c:258

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

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

3523 #, c-format

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

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

3526

3460 -#: builtin/checkout.c:261 builtin/checkout.c:264

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

3528 #, c-format

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

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

3531

3465 -#: builtin/checkout.c:267

3532 +#: builtin/checkout.c:273

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

3471 -#: builtin/checkout.c:278 builtin/checkout.c:467

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

3539 msgid "corrupt index file"

3540 msgstr "fitxer d'índex corrupte"

3541

3475 -#: builtin/checkout.c:338 builtin/checkout.c:345

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

3543 #, c-format

3544 msgid "path '%s' is unmerged"

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

3546

3480 -#: builtin/checkout.c:489

3547 +#: builtin/checkout.c:503

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

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

3550

3484 -#: builtin/checkout.c:615

3551 +#: builtin/checkout.c:634

3552 #, c-format

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

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

3555

3489 -#: builtin/checkout.c:653

3556 +#: builtin/checkout.c:670

3557 msgid "HEAD is now at"

3558 msgstr "HEAD ara és a"

3559

3493 -#: builtin/checkout.c:660

3560 +#: builtin/checkout.c:677

3561 #, c-format

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

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

3564

3498 -#: builtin/checkout.c:663

3565 +#: builtin/checkout.c:680

3566 #, c-format

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

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

3569

3503 -#: builtin/checkout.c:667

3570 +#: builtin/checkout.c:684

3571 #, c-format

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

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

3574

3508 -#: builtin/checkout.c:669 builtin/checkout.c:1050

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

3576 #, c-format

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

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

3579

3513 -#: builtin/checkout.c:671

3580 +#: builtin/checkout.c:688

3581 #, c-format

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

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

3584

3518 -#: builtin/checkout.c:723

3585 +#: builtin/checkout.c:740

3586 #, c-format

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

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

3589

3523 -#: builtin/checkout.c:729

3590 +#: builtin/checkout.c:746

3591 #, c-format

3592 msgid ""

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

@@ -3543,154 +3610,204 @@ msgstr[1] ""

3610 "\n"

3611 "%s\n"

3612

3546 -#: builtin/checkout.c:747

3613 +#: builtin/checkout.c:765

3614 #, c-format

3615 msgid ""

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

3617 +"to do so with:\n"

3618 +"\n"

3619 +" git branch <new-branch-name> %s\n"

3620 +"\n"

3621 +msgid_plural ""

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

3623 "to do so with:\n"

3624 "\n"

3625 " git branch <new-branch-name> %s\n"

3626 "\n"

3554 -msgstr ""

3555 -"Si les voleu retenir creant una branca nova, ara pot ser un bon moment per\n"

3556 -"a fer-ho amb:\n"

3627 +msgstr[0] ""

3628 +"Si la voleu retenir creant una branca nova, ara pot ser un bon moment\n"

3629 +"per a fer-ho amb:\n"

3630 +"\n"

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

3632 +"\n"

3633 +msgstr[1] ""

3634 +"Si les voleu retenir creant una branca nova, ara pot ser un bon moment\n"

3635 +"per a fer-ho amb:\n"

3636 "\n"

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

3638 "\n"

3639

3561 -#: builtin/checkout.c:777

3640 +#: builtin/checkout.c:801

3641 msgid "internal error in revision walk"

3642 msgstr "error intern en el passeig per revisions"

3643

3565 -#: builtin/checkout.c:781

3644 +#: builtin/checkout.c:805

3645 msgid "Previous HEAD position was"

3646 msgstr "La posició de HEAD anterior era"

3647

3569 -#: builtin/checkout.c:808 builtin/checkout.c:1045

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

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

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

3651

3573 -#: builtin/checkout.c:952

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

3678 +#, c-format

3679 +msgid "'%s' is already checked out at '%s'"

3680 +msgstr "'%s' ja s'ha agafat a '%s'"

3681 +

3682 +#: builtin/checkout.c:1176

3683 #, c-format

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

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

3686

3578 -#: builtin/checkout.c:991

3687 +#: builtin/checkout.c:1215

3688 #, c-format

3689 msgid "invalid reference: %s"

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

3691

3583 -#: builtin/checkout.c:1020

3692 +#: builtin/checkout.c:1255

3693 #, c-format

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

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

3696

3588 -#: builtin/checkout.c:1059

3697 +#: builtin/checkout.c:1294

3698 msgid "paths cannot be used with switching branches"

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

3700

3592 -#: builtin/checkout.c:1062 builtin/checkout.c:1066

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

3702 #, c-format

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

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

3705

3597 -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3598 -#: builtin/checkout.c:1081

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

3707 +#: builtin/checkout.c:1316

3708 #, c-format

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

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

3711

3603 -#: builtin/checkout.c:1086

3712 +#: builtin/checkout.c:1321

3713 #, c-format

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

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

3716

3608 -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

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

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

3719 msgid "branch"

3720 msgstr "branca"

3721

3613 -#: builtin/checkout.c:1109

3722 +#: builtin/checkout.c:1347

3723 msgid "create and checkout a new branch"

3724 msgstr "crea i agafa una branca nova"

3725

3617 -#: builtin/checkout.c:1111

3726 +#: builtin/checkout.c:1349

3727 msgid "create/reset and checkout a branch"

3728 msgstr "crea/restableix i agafa una branca"

3729

3621 -#: builtin/checkout.c:1112

3730 +#: builtin/checkout.c:1350

3731 msgid "create reflog for new branch"

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

3733

3625 -#: builtin/checkout.c:1113

3734 +#: builtin/checkout.c:1351

3735 msgid "detach the HEAD at named commit"

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

3737

3629 -#: builtin/checkout.c:1114

3738 +#: builtin/checkout.c:1352

3739 msgid "set upstream info for new branch"

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

3741

3633 -#: builtin/checkout.c:1116

3742 +#: builtin/checkout.c:1354

3743 msgid "new-branch"

3744 msgstr "branca-nova"

3745

3637 -#: builtin/checkout.c:1116

3746 +#: builtin/checkout.c:1354

3747 msgid "new unparented branch"

3748 msgstr "branca nova sense mare"

3749

3641 -#: builtin/checkout.c:1117

3750 +#: builtin/checkout.c:1355

3751 msgid "checkout our version for unmerged files"

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

3753

3645 -#: builtin/checkout.c:1119

3754 +#: builtin/checkout.c:1357

3755 msgid "checkout their version for unmerged files"

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

3757

3649 -#: builtin/checkout.c:1121

3758 +#: builtin/checkout.c:1359

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

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

3761

3653 -#: builtin/checkout.c:1122

3762 +#: builtin/checkout.c:1360

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

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

3765

3657 -#: builtin/checkout.c:1123 builtin/merge.c:227

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

3767 msgid "update ignored files (default)"

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

3769

3661 -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

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

3771 msgid "style"

3772 msgstr "estil"

3773

3665 -#: builtin/checkout.c:1125

3774 +#: builtin/checkout.c:1363

3775 msgid "conflict style (merge or diff3)"

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

3777

3669 -#: builtin/checkout.c:1128

3778 +#: builtin/checkout.c:1366

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

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

3781

3673 -#: builtin/checkout.c:1130

3782 +#: builtin/checkout.c:1368

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

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

3785

3677 -#: builtin/checkout.c:1153

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

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

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

3793 +

3794 +#: builtin/checkout.c:1406

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

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

3797

3681 -#: builtin/checkout.c:1170

3798 +#: builtin/checkout.c:1423

3799 msgid "--track needs a branch name"

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

3801

3685 -#: builtin/checkout.c:1175

3802 +#: builtin/checkout.c:1428

3803 msgid "Missing branch name; try -b"

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

3805

3689 -#: builtin/checkout.c:1212

3806 +#: builtin/checkout.c:1464

3807 msgid "invalid path specification"

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

3809

3693 -#: builtin/checkout.c:1219

3810 +#: builtin/checkout.c:1471

3811 #, c-format

3812 msgid ""

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

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

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

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

3818

3702 -#: builtin/checkout.c:1224

3819 +#: builtin/checkout.c:1476

3820 #, c-format

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

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

3823

3707 -#: builtin/checkout.c:1228

3824 +#: builtin/checkout.c:1480

3825 msgid ""

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

3827 "checking out of the index."

@@ -3775,36 +3892,36 @@ msgstr ""

3892 "* - tria tots els ítems\n"

3893 " - (buit) finalitza la selecció"

3894

3778 -#: builtin/clean.c:517

3895 +#: builtin/clean.c:515

3896 #, c-format

3897 msgid "Huh (%s)?"

3898 msgstr "Perdó (%s)?"

3899

3783 -#: builtin/clean.c:659

3900 +#: builtin/clean.c:657

3901 #, c-format

3902 msgid "Input ignore patterns>> "

3903 msgstr "Introduïu els patrons a ignorar>> "

3904

3788 -#: builtin/clean.c:696

3905 +#: builtin/clean.c:694

3906 #, c-format

3907 msgid "WARNING: Cannot find items matched by: %s"

3908 msgstr "AVÍS: No es pot trobar ítems que coincideixin amb: %s"

3909

3793 -#: builtin/clean.c:717

3910 +#: builtin/clean.c:715

3911 msgid "Select items to delete"

3912 msgstr "Selecciona els ítems a suprimir"

3913

3914 #. TRANSLATORS: Make sure to keep [y/N] as is

3798 -#: builtin/clean.c:758

3915 +#: builtin/clean.c:756

3916 #, c-format

3917 msgid "Remove %s [y/N]? "

3918 msgstr "Voleu eliminar %s [y/N]? "

3919

3803 -#: builtin/clean.c:783

3920 +#: builtin/clean.c:781

3921 msgid "Bye."

3922 msgstr "Adéu."

3923

3807 -#: builtin/clean.c:791

3924 +#: builtin/clean.c:789

3925 msgid ""

3926 "clean - start cleaning\n"

3927 "filter by pattern - exclude items from deletion\n"

@@ -3822,62 +3939,62 @@ msgstr ""

3939 "help - aquesta pantalla\n"

3940 "? - ajuda de selecció de l'avís"

3941

3825 -#: builtin/clean.c:818

3942 +#: builtin/clean.c:816

3943 msgid "*** Commands ***"

3944 msgstr "*** Ordres ***"

3945

3829 -#: builtin/clean.c:819

3946 +#: builtin/clean.c:817

3947 msgid "What now"

3948 msgstr "Què ara"

3949

3833 -#: builtin/clean.c:827

3950 +#: builtin/clean.c:825

3951 msgid "Would remove the following item:"

3952 msgid_plural "Would remove the following items:"

3953 msgstr[0] "Eliminaria l'ítem següent:"

3954 msgstr[1] "Eliminaria els ítems següents:"

3955

3839 -#: builtin/clean.c:844

3956 +#: builtin/clean.c:842

3957 msgid "No more files to clean, exiting."

3958 msgstr "No hi ha més fitxers a netejar; sortint."

3959

3843 -#: builtin/clean.c:875

3960 +#: builtin/clean.c:873

3961 msgid "do not print names of files removed"

3962 msgstr "no imprimeixis els noms dels fitxers eliminats"

3963

3847 -#: builtin/clean.c:877

3964 +#: builtin/clean.c:875

3965 msgid "force"

3966 msgstr "força"

3967

3851 -#: builtin/clean.c:878

3968 +#: builtin/clean.c:876

3969 msgid "interactive cleaning"

3970 msgstr "neteja interactiva"

3971

3855 -#: builtin/clean.c:880

3972 +#: builtin/clean.c:878

3973 msgid "remove whole directories"

3974 msgstr "elimina directoris sencers"

3975

3859 -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3860 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3976 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

3977 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

3978 msgid "pattern"

3979 msgstr "patró"

3980

3864 -#: builtin/clean.c:882

3981 +#: builtin/clean.c:880

3982 msgid "add <pattern> to ignore rules"

3983 msgstr "afegiu <patró> per a ignorar les regles"

3984

3868 -#: builtin/clean.c:883

3985 +#: builtin/clean.c:881

3986 msgid "remove ignored files, too"

3987 msgstr "elimina els fitxers ignorats, també"

3988

3872 -#: builtin/clean.c:885

3989 +#: builtin/clean.c:883

3990 msgid "remove only ignored files"

3991 msgstr "elimina només els fitxers ignorats"

3992

3876 -#: builtin/clean.c:903

3993 +#: builtin/clean.c:901

3994 msgid "-x and -X cannot be used together"

3995 msgstr "-x i -X no es poden usar junts"

3996

3880 -#: builtin/clean.c:907

3997 +#: builtin/clean.c:905

3998 msgid ""

3999 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4000 "clean"

@@ -3885,7 +4002,7 @@ msgstr ""

4002 "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; "

4003 "refusant netejar"

4004

3888 -#: builtin/clean.c:910

4005 +#: builtin/clean.c:908

4006 msgid ""

4007 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4008 "refusing to clean"

@@ -3897,150 +4014,150 @@ msgstr ""

4014 msgid "git clone [<options>] [--] <repo> [<dir>]"

4015 msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"

4016

3900 -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

4017 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

4018 #: builtin/push.c:523

4019 msgid "force progress reporting"

4020 msgstr "força l'informe de progrés"

4021

3905 -#: builtin/clone.c:68

4022 +#: builtin/clone.c:59

4023 msgid "don't create a checkout"

4024 msgstr "no facis cap agafada"

4025

3909 -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

4026 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4027 msgid "create a bare repository"

4028 msgstr "crea un dipòsit nu"

4029

3913 -#: builtin/clone.c:73

4030 +#: builtin/clone.c:64

4031 msgid "create a mirror repository (implies bare)"

4032 msgstr "crea un dipòsit reflectit (implica bare)"

4033

3917 -#: builtin/clone.c:75

4034 +#: builtin/clone.c:66

4035 msgid "to clone from a local repository"

4036 msgstr "per a clonar des d'un dipòsit local"

4037

3921 -#: builtin/clone.c:77

4038 +#: builtin/clone.c:68

4039 msgid "don't use local hardlinks, always copy"

4040 msgstr "no usis enllaços durs locals, sempre copia"

4041

3925 -#: builtin/clone.c:79

4042 +#: builtin/clone.c:70

4043 msgid "setup as shared repository"

4044 msgstr "configura com a dipòsit compartit"

4045

3929 -#: builtin/clone.c:81 builtin/clone.c:83

4046 +#: builtin/clone.c:72 builtin/clone.c:74

4047 msgid "initialize submodules in the clone"

4048 msgstr "initialitza els submòduls en el clon"

4049

3933 -#: builtin/clone.c:84 builtin/init-db.c:493

4050 +#: builtin/clone.c:75 builtin/init-db.c:500

4051 msgid "template-directory"

4052 msgstr "directori-de-plantilla"

4053

3937 -#: builtin/clone.c:85 builtin/init-db.c:494

4054 +#: builtin/clone.c:76 builtin/init-db.c:501

4055 msgid "directory from which templates will be used"

4056 msgstr "directori del qual les plantilles s'usaran"

4057

3941 -#: builtin/clone.c:87

4058 +#: builtin/clone.c:78

4059 msgid "reference repository"

4060 msgstr "dipòsit de referència"

4061

3945 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

4062 +#: builtin/clone.c:80

4063 +msgid "use --reference only while cloning"

4064 +msgstr "usa --reference només en clonar"

4065 +

4066 +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4067 msgid "name"

4068 msgstr "nom"

4069

3949 -#: builtin/clone.c:89

4070 +#: builtin/clone.c:82

4071 msgid "use <name> instead of 'origin' to track upstream"

4072 msgstr "usa <nom> en lloc de 'origin' per a seguir la font"

4073

3953 -#: builtin/clone.c:91

4074 +#: builtin/clone.c:84

4075 msgid "checkout <branch> instead of the remote's HEAD"

4076 msgstr "agafa <branca> en lloc del HEAD del remot"

4077

3957 -#: builtin/clone.c:93

4078 +#: builtin/clone.c:86

4079 msgid "path to git-upload-pack on the remote"

4080 msgstr "camí a git-upload-pack en el remot"

4081

3961 -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

4082 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4083 msgid "depth"

4084 msgstr "profunditat"

4085

3965 -#: builtin/clone.c:95

4086 +#: builtin/clone.c:88

4087 msgid "create a shallow clone of that depth"

4088 msgstr "crea un clon superficial de tal profunditat"

4089

3969 -#: builtin/clone.c:97

4090 +#: builtin/clone.c:90

4091 msgid "clone only one branch, HEAD or --branch"

4092 msgstr "clona només una branca, HEAD o --branch"

4093

3973 -#: builtin/clone.c:99

3974 -msgid "use --reference only while cloning"

3975 -msgstr "usa --reference només en clonar"

3976 -

3977 -#: builtin/clone.c:100 builtin/init-db.c:502

4094 +#: builtin/clone.c:91 builtin/init-db.c:509

4095 msgid "gitdir"

4096 msgstr "directori de git"

4097

3981 -#: builtin/clone.c:101 builtin/init-db.c:503

4098 +#: builtin/clone.c:92 builtin/init-db.c:510

4099 msgid "separate git dir from working tree"

4100 msgstr "separa el directori de git de l'arbre de treball"

4101

3985 -#: builtin/clone.c:102

4102 +#: builtin/clone.c:93

4103 msgid "key=value"

4104 msgstr "calu=valor"

4105

3989 -#: builtin/clone.c:103

4106 +#: builtin/clone.c:94

4107 msgid "set config inside the new repository"

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

4109

3993 -#: builtin/clone.c:256

4110 +#: builtin/clone.c:247

4111 #, c-format

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

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

4114

3998 -#: builtin/clone.c:260

4115 +#: builtin/clone.c:251

4116 #, c-format

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

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

4119

4003 -#: builtin/clone.c:263

4120 +#: builtin/clone.c:254

4121 #, c-format

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

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

4124

4008 -#: builtin/clone.c:325

4125 +#: builtin/clone.c:317

4126 #, c-format

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

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

4129

4013 -#: builtin/clone.c:327 builtin/diff.c:84

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

4131 #, c-format

4132 msgid "failed to stat '%s'"

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

4134

4018 -#: builtin/clone.c:329

4135 +#: builtin/clone.c:321

4136 #, c-format

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

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

4139

4023 -#: builtin/clone.c:343

4140 +#: builtin/clone.c:335

4141 #, c-format

4142 msgid "failed to stat %s\n"

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

4144

4028 -#: builtin/clone.c:365

4145 +#: builtin/clone.c:357

4146 #, c-format

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

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

4149

4033 -#: builtin/clone.c:369

4150 +#: builtin/clone.c:361

4151 #, c-format

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

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

4154

4038 -#: builtin/clone.c:392 builtin/clone.c:566

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

4156 #, c-format

4157 msgid "done.\n"

4158 msgstr "fet.\n"

4159

4043 -#: builtin/clone.c:404

4160 +#: builtin/clone.c:396

4161 msgid ""

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

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

@@ -4050,122 +4167,117 @@ msgstr ""

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

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

4169

4053 -#: builtin/clone.c:481

4170 +#: builtin/clone.c:473

4171 #, c-format

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

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

4174

4058 -#: builtin/clone.c:561

4175 +#: builtin/clone.c:553

4176 #, c-format

4177 msgid "Checking connectivity... "

4178 msgstr "Provant connectivitat... "

4179

4063 -#: builtin/clone.c:564

4180 +#: builtin/clone.c:556

4181 msgid "remote did not send all necessary objects"

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

4183

4067 -#: builtin/clone.c:628

4184 +#: builtin/clone.c:620

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

4186 msgstr ""

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

4188 "agafar.\n"

4189

4073 -#: builtin/clone.c:659

4190 +#: builtin/clone.c:651

4191 msgid "unable to checkout working tree"

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

4193

4077 -#: builtin/clone.c:746

4194 +#: builtin/clone.c:738

4195 msgid "cannot repack to clean up"

4196 msgstr "no es pot reempaquetar per a netejar"

4197

4081 -#: builtin/clone.c:748

4198 +#: builtin/clone.c:740

4199 msgid "cannot unlink temporary alternates file"

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

4201

4085 -#: builtin/clone.c:778

4202 +#: builtin/clone.c:770

4203 msgid "Too many arguments."

4204 msgstr "Hi ha massa paràmetres."

4205

4089 -#: builtin/clone.c:782

4206 +#: builtin/clone.c:774

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

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

4209

4093 -#: builtin/clone.c:793

4210 +#: builtin/clone.c:785

4211 #, c-format

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

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

4214

4098 -#: builtin/clone.c:796

4215 +#: builtin/clone.c:788

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

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

4218

4102 -#: builtin/clone.c:809

4219 +#: builtin/clone.c:801

4220 #, c-format

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

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

4223

4107 -#: builtin/clone.c:815 builtin/fetch.c:1156

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

4225 #, c-format

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

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

4228

4112 -#: builtin/clone.c:825

4229 +#: builtin/clone.c:817

4230 #, c-format

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

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

4233

4117 -#: builtin/clone.c:835

4234 +#: builtin/clone.c:827

4235 #, c-format

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

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

4238

4122 -#: builtin/clone.c:850 builtin/clone.c:861

4123 -#, c-format

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

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

4126 -

4127 -#: builtin/clone.c:853

4239 +#: builtin/clone.c:845

4240 #, c-format

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

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

4243

4132 -#: builtin/clone.c:871

4244 +#: builtin/clone.c:863

4245 #, c-format

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

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

4248

4137 -#: builtin/clone.c:873

4249 +#: builtin/clone.c:865

4250 #, c-format

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

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

4253

4142 -#: builtin/clone.c:898

4254 +#: builtin/clone.c:890

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

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

4257

4146 -#: builtin/clone.c:913

4258 +#: builtin/clone.c:907

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

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

4261

4150 -#: builtin/clone.c:916

4262 +#: builtin/clone.c:910

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

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

4265

4154 -#: builtin/clone.c:921

4266 +#: builtin/clone.c:915

4267 msgid "--local is ignored"

4268 msgstr "--local s'ignora"

4269

4158 -#: builtin/clone.c:925

4270 +#: builtin/clone.c:919

4271 #, c-format

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

4273 msgstr "No es sap com clonar %s"

4274

4163 -#: builtin/clone.c:976 builtin/clone.c:984

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

4276 #, c-format

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

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

4279

4168 -#: builtin/clone.c:987

4280 +#: builtin/clone.c:979

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

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

4283

@@ -4405,7 +4517,7 @@ msgstr "no s'ha pogut llegir MERGE_MSG"

4517 msgid "could not read SQUASH_MSG"

4518 msgstr "no s'ha pogur llegir SQUASH_MSG"

4519

4408 -#: builtin/commit.c:738

4520 +#: builtin/commit.c:738 builtin/merge.c:1079

4521 #, c-format

4522 msgid "could not read '%s'"

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

@@ -4567,32 +4679,32 @@ msgstr "Mode de neteja no vàlid %s"

4679 msgid "Paths with -a does not make sense."

4680 msgstr "-a no té sentit amb camins."

4681

4570 -#: builtin/commit.c:1324 builtin/commit.c:1604

4682 +#: builtin/commit.c:1324 builtin/commit.c:1603

4683 msgid "show status concisely"

4684 msgstr "mostra l'estat concisament"

4685

4574 -#: builtin/commit.c:1326 builtin/commit.c:1606

4686 +#: builtin/commit.c:1326 builtin/commit.c:1605

4687 msgid "show branch information"

4688 msgstr "mostra la informació de branca"

4689

4578 -#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509

4690 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4691 msgid "machine-readable output"

4692 msgstr "sortida llegible per màquina"

4693

4582 -#: builtin/commit.c:1331 builtin/commit.c:1610

4694 +#: builtin/commit.c:1331 builtin/commit.c:1609

4695 msgid "show status in long format (default)"

4696 msgstr "mostra l'estat en format llarg (per defecte)"

4697

4586 -#: builtin/commit.c:1334 builtin/commit.c:1613

4698 +#: builtin/commit.c:1334 builtin/commit.c:1612

4699 msgid "terminate entries with NUL"

4700 msgstr "acaba les entrades amb NUL"

4701

4590 -#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980

4702 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4703 #: builtin/fast-export.c:983 builtin/tag.c:603

4704 msgid "mode"

4705 msgstr "mode"

4706

4595 -#: builtin/commit.c:1337 builtin/commit.c:1616

4707 +#: builtin/commit.c:1337 builtin/commit.c:1615

4708 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4709 msgstr ""

4710 "mostra els fitxers no seguits, modes opcional: all, normal, no. (Per "

@@ -4602,7 +4714,7 @@ msgstr ""

4714 msgid "show ignored files"

4715 msgstr "mostra els fitxers ignorats"

4716

4605 -#: builtin/commit.c:1341 parse-options.h:153

4717 +#: builtin/commit.c:1341 parse-options.h:152

4718 msgid "when"

4719 msgstr "quan"

4720

@@ -4618,206 +4730,206 @@ msgstr ""

4730 msgid "list untracked files in columns"

4731 msgstr "mostra els fitxers no seguits en columnes"

4732

4621 -#: builtin/commit.c:1431

4733 +#: builtin/commit.c:1430

4734 msgid "couldn't look up newly created commit"

4735 msgstr "no s'ha pogut trobar la comissió novament creada"

4736

4625 -#: builtin/commit.c:1433

4737 +#: builtin/commit.c:1432

4738 msgid "could not parse newly created commit"

4739 msgstr "no s'ha pogut analitzar la comissió novament creada"

4740

4629 -#: builtin/commit.c:1478

4741 +#: builtin/commit.c:1477

4742 msgid "detached HEAD"

4743 msgstr "HEAD separat"

4744

4633 -#: builtin/commit.c:1481

4745 +#: builtin/commit.c:1480

4746 msgid " (root-commit)"

4747 msgstr " (comissió d'arrel)"

4748

4637 -#: builtin/commit.c:1574

4749 +#: builtin/commit.c:1573

4750 msgid "suppress summary after successful commit"

4751 msgstr "omet el resum després d'una comissió reeixida"

4752

4641 -#: builtin/commit.c:1575

4753 +#: builtin/commit.c:1574

4754 msgid "show diff in commit message template"

4755 msgstr "mostra la diferència en la plantilla de missatge de comissió"

4756

4645 -#: builtin/commit.c:1577

4757 +#: builtin/commit.c:1576

4758 msgid "Commit message options"

4759 msgstr "Opcions de missatge de comissió"

4760

4649 -#: builtin/commit.c:1578 builtin/tag.c:601

4761 +#: builtin/commit.c:1577 builtin/tag.c:601

4762 msgid "read message from file"

4763 msgstr "llegiu el missatge des d'un fitxer"

4764

4653 -#: builtin/commit.c:1579

4765 +#: builtin/commit.c:1578

4766 msgid "author"

4767 msgstr "autor"

4768

4657 -#: builtin/commit.c:1579

4769 +#: builtin/commit.c:1578

4770 msgid "override author for commit"

4771 msgstr "autor corregit de la comissió"

4772

4661 -#: builtin/commit.c:1580 builtin/gc.c:275

4773 +#: builtin/commit.c:1579 builtin/gc.c:280

4774 msgid "date"

4775 msgstr "data"

4776

4665 -#: builtin/commit.c:1580

4777 +#: builtin/commit.c:1579

4778 msgid "override date for commit"

4779 msgstr "data corregida de la comissió"

4780

4669 -#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391

4781 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4782 #: builtin/notes.c:554 builtin/tag.c:599

4783 msgid "message"

4784 msgstr "missatge"

4785

4674 -#: builtin/commit.c:1581

4786 +#: builtin/commit.c:1580

4787 msgid "commit message"

4788 msgstr "missatge de comissió"

4789

4678 -#: builtin/commit.c:1582

4790 +#: builtin/commit.c:1581

4791 msgid "reuse and edit message from specified commit"

4792 msgstr "reusa i edita el missatge de la comissió especificada"

4793

4682 -#: builtin/commit.c:1583

4794 +#: builtin/commit.c:1582

4795 msgid "reuse message from specified commit"

4796 msgstr "reusa el missatge de la comissió especificada"

4797

4686 -#: builtin/commit.c:1584

4798 +#: builtin/commit.c:1583

4799 msgid "use autosquash formatted message to fixup specified commit"

4800 msgstr ""

4801 "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "

4802 "especificada"

4803

4692 -#: builtin/commit.c:1585

4804 +#: builtin/commit.c:1584

4805 msgid "use autosquash formatted message to squash specified commit"

4806 msgstr ""

4807 "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "

4808 "especificada"

4809

4698 -#: builtin/commit.c:1586

4810 +#: builtin/commit.c:1585

4811 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4700 -msgstr "l'autor de la comissió ja sóc jo (usat amb -C/-c/--amend)"

4812 +msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"

4813

4702 -#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86

4814 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4815 msgid "add Signed-off-by:"

4816 msgstr "afegeix Signed-off-by:"

4817

4706 -#: builtin/commit.c:1588

4818 +#: builtin/commit.c:1587

4819 msgid "use specified template file"

4820 msgstr "usa el fitxer de plantilla especificat"

4821

4710 -#: builtin/commit.c:1589

4822 +#: builtin/commit.c:1588

4823 msgid "force edit of commit"

4824 msgstr "força l'edició de la comissió"

4825

4714 -#: builtin/commit.c:1590

4826 +#: builtin/commit.c:1589

4827 msgid "default"

4828 msgstr "per defecte"

4829

4718 -#: builtin/commit.c:1590 builtin/tag.c:604

4830 +#: builtin/commit.c:1589 builtin/tag.c:604

4831 msgid "how to strip spaces and #comments from message"

4832 msgstr "com despullar els espais i #comentaris del missatge"

4833

4722 -#: builtin/commit.c:1591

4834 +#: builtin/commit.c:1590

4835 msgid "include status in commit message template"

4836 msgstr "inclou l'estat en la plantilla de missatge de comissió"

4837

4726 -#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92

4838 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4839 #: builtin/tag.c:605

4840 msgid "key-id"

4841 msgstr "ID de clau"

4842

4731 -#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93

4843 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4844 msgid "GPG sign commit"

4845 msgstr "firma la comissió amb GPG"

4846

4735 -#: builtin/commit.c:1596

4847 +#: builtin/commit.c:1595

4848 msgid "Commit contents options"

4849 msgstr "Opcions dels continguts de les comissions"

4850

4739 -#: builtin/commit.c:1597

4851 +#: builtin/commit.c:1596

4852 msgid "commit all changed files"

4853 msgstr "comet tots els fitxers canviats"

4854

4743 -#: builtin/commit.c:1598

4855 +#: builtin/commit.c:1597

4856 msgid "add specified files to index for commit"

4857 msgstr "afegeix els fitxers especificats a l'índex per a cometre"

4858

4747 -#: builtin/commit.c:1599

4859 +#: builtin/commit.c:1598

4860 msgid "interactively add files"

4861 msgstr "afegeix els fitxers interactivament"

4862

4751 -#: builtin/commit.c:1600

4863 +#: builtin/commit.c:1599

4864 msgid "interactively add changes"

4865 msgstr "afegeix els canvis interactivament"

4866

4755 -#: builtin/commit.c:1601

4867 +#: builtin/commit.c:1600

4868 msgid "commit only specified files"

4869 msgstr "comet només els fitxers especificats"

4870

4759 -#: builtin/commit.c:1602

4871 +#: builtin/commit.c:1601

4872 msgid "bypass pre-commit hook"

4873 msgstr "evita el ganxo de precomissió"

4874

4763 -#: builtin/commit.c:1603

4875 +#: builtin/commit.c:1602

4876 msgid "show what would be committed"

4877 msgstr "mostra què es cometria"

4878

4767 -#: builtin/commit.c:1614

4879 +#: builtin/commit.c:1613

4880 msgid "amend previous commit"

4881 msgstr "esmena la comissió anterior"

4882

4771 -#: builtin/commit.c:1615

4883 +#: builtin/commit.c:1614

4884 msgid "bypass post-rewrite hook"

4885 msgstr "evita el ganxo de postreescriure"

4886

4775 -#: builtin/commit.c:1620

4887 +#: builtin/commit.c:1619

4888 msgid "ok to record an empty change"

4889 msgstr "està bé registrar un canvi buit"

4890

4779 -#: builtin/commit.c:1622

4891 +#: builtin/commit.c:1621

4892 msgid "ok to record a change with an empty message"

4893 msgstr "està bé registrar un canvi amb missatge buit"

4894

4783 -#: builtin/commit.c:1651

4895 +#: builtin/commit.c:1650

4896 msgid "could not parse HEAD commit"

4897 msgstr "no s'ha pogut analitzar la comissió HEAD"

4898

4787 -#: builtin/commit.c:1690 builtin/merge.c:519

4899 +#: builtin/commit.c:1689 builtin/merge.c:1076

4900 #, c-format

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

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

4903

4792 -#: builtin/commit.c:1697

4904 +#: builtin/commit.c:1696

4905 #, c-format

4906 msgid "Corrupt MERGE_HEAD file (%s)"

4907 msgstr "Fitxer MERGE_HEAD corrupte (%s)"

4908

4797 -#: builtin/commit.c:1704

4909 +#: builtin/commit.c:1703

4910 msgid "could not read MERGE_MODE"

4911 msgstr "no s'ha pogut llegir MERGE_MODE"

4912

4801 -#: builtin/commit.c:1723

4913 +#: builtin/commit.c:1722

4914 #, c-format

4915 msgid "could not read commit message: %s"

4916 msgstr "no s'ha pogut llegir el missatge de comissió: %s"

4917

4806 -#: builtin/commit.c:1734

4918 +#: builtin/commit.c:1733

4919 #, c-format

4920 msgid "Aborting commit; you did not edit the message.\n"

4921 msgstr "Avortant la comissió; no heu editat el missatge.\n"

4922

4811 -#: builtin/commit.c:1739

4923 +#: builtin/commit.c:1738

4924 #, c-format

4925 msgid "Aborting commit due to empty commit message.\n"

4926 msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n"

4927

4816 -#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876

4928 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4929 msgid "failed to write commit object"

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

4931

4820 -#: builtin/commit.c:1787

4932 +#: builtin/commit.c:1786

4933 msgid ""

4934 "Repository has been updated, but unable to write\n"

4935 "new_index file. Check that disk is not full and quota is\n"

@@ -4961,18 +5073,18 @@ msgstr "no s'ha pogut analitzar el valor de color per defecte"

5073 #, c-format

5074 msgid ""

5075 "# This is Git's per-user configuration file.\n"

4964 -"[core]\n"

5076 +"[user]\n"

5077 "# Please adapt and uncomment the following lines:\n"

4966 -"#\tuser = %s\n"

5078 +"#\tname = %s\n"

5079 "#\temail = %s\n"

5080 msgstr ""

5081 "# Això és el fitxer de configuració del Git de l'usuari.\n"

4970 -"[core]\n"

5082 +"[user]\n"

5083 "# Si us plau, adapteu i descomenteu les línies següents:\n"

4972 -"#\tuser = %s\n"

5084 +"#\tname = %s\n"

5085 "#\temail = %s\n"

5086

4975 -#: builtin/config.c:589

5087 +#: builtin/config.c:587

5088 #, c-format

5089 msgid "cannot create configuration file %s"

5090 msgstr "no es pot crear el fitxer de configuració '%s'"

@@ -5302,82 +5414,82 @@ msgstr "mapa de referències"

5414 msgid "specify fetch refmap"

5415 msgstr "mostra el mapa de referències d'obteniment"

5416

5305 -#: builtin/fetch.c:375

5417 +#: builtin/fetch.c:377

5418 msgid "Couldn't find remote ref HEAD"

5419 msgstr "No s'ha pogut trobar la referència HEAD remota"

5420

5309 -#: builtin/fetch.c:455

5421 +#: builtin/fetch.c:457

5422 #, c-format

5423 msgid "object %s not found"

5424 msgstr "objecte %s no trobat"

5425

5314 -#: builtin/fetch.c:460

5426 +#: builtin/fetch.c:462

5427 msgid "[up to date]"

5428 msgstr "[al dia]"

5429

5318 -#: builtin/fetch.c:474

5430 +#: builtin/fetch.c:476

5431 #, c-format

5432 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5433 msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)"

5434

5323 -#: builtin/fetch.c:475 builtin/fetch.c:561

5435 +#: builtin/fetch.c:477 builtin/fetch.c:563

5436 msgid "[rejected]"

5437 msgstr "[rebutjat]"

5438

5327 -#: builtin/fetch.c:486

5439 +#: builtin/fetch.c:488

5440 msgid "[tag update]"

5441 msgstr "[actualització d'etiqueta]"

5442

5331 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5443 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5444 msgid " (unable to update local ref)"

5445 msgstr " (no s'ha pogut actualitzar la referència local)"

5446

5335 -#: builtin/fetch.c:506

5447 +#: builtin/fetch.c:508

5448 msgid "[new tag]"

5449 msgstr "[etiqueta nova]"

5450

5339 -#: builtin/fetch.c:509

5451 +#: builtin/fetch.c:511

5452 msgid "[new branch]"

5453 msgstr "[branca nova]"

5454

5343 -#: builtin/fetch.c:512

5455 +#: builtin/fetch.c:514

5456 msgid "[new ref]"

5457 msgstr "[referència nova]"

5458

5347 -#: builtin/fetch.c:557

5459 +#: builtin/fetch.c:559

5460 msgid "unable to update local ref"

5461 msgstr "no s'ha pogut actualitzar la referència local"

5462

5351 -#: builtin/fetch.c:557

5463 +#: builtin/fetch.c:559

5464 msgid "forced update"

5465 msgstr "actualització forçada"

5466

5355 -#: builtin/fetch.c:563

5467 +#: builtin/fetch.c:565

5468 msgid "(non-fast-forward)"

5469 msgstr "(sense avanç ràpid)"

5470

5359 -#: builtin/fetch.c:596 builtin/fetch.c:829

5471 +#: builtin/fetch.c:599 builtin/fetch.c:832

5472 #, c-format

5473 msgid "cannot open %s: %s\n"

5474 msgstr "no es pot obrir %s: %s\n"

5475

5364 -#: builtin/fetch.c:605

5476 +#: builtin/fetch.c:608

5477 #, c-format

5478 msgid "%s did not send all necessary objects\n"

5479 msgstr "%s no ha enviat tots els objectes necessaris\n"

5480

5369 -#: builtin/fetch.c:623

5481 +#: builtin/fetch.c:626

5482 #, c-format

5483 msgid "reject %s because shallow roots are not allowed to be updated"

5484 msgstr ""

5485 "rebutja %s perquè no es permet que les arrels superficials s'actualitzin"

5486

5375 -#: builtin/fetch.c:711 builtin/fetch.c:794

5487 +#: builtin/fetch.c:714 builtin/fetch.c:797

5488 #, c-format

5489 msgid "From %.*s\n"

5490 msgstr "De %.*s\n"

5491

5380 -#: builtin/fetch.c:722

5492 +#: builtin/fetch.c:725

5493 #, c-format

5494 msgid ""

5495 "some local refs could not be updated; try running\n"

@@ -5387,55 +5499,55 @@ msgstr ""

5499 " intenteu executar 'git remote prune %s' per a eliminar\n"

5500 " qualsevulla branca antiga o conflictiva"

5501

5390 -#: builtin/fetch.c:774

5502 +#: builtin/fetch.c:777

5503 #, c-format

5504 msgid " (%s will become dangling)"

5505 msgstr " (%s es tornarà penjant)"

5506

5395 -#: builtin/fetch.c:775

5507 +#: builtin/fetch.c:778

5508 #, c-format

5509 msgid " (%s has become dangling)"

5510 msgstr " (%s s'ha tornat penjant)"

5511

5400 -#: builtin/fetch.c:799

5512 +#: builtin/fetch.c:802

5513 msgid "[deleted]"

5514 msgstr "[suprimit]"

5515

5404 -#: builtin/fetch.c:800 builtin/remote.c:1060

5516 +#: builtin/fetch.c:803 builtin/remote.c:1057

5517 msgid "(none)"

5518 msgstr "(cap)"

5519

5408 -#: builtin/fetch.c:819

5520 +#: builtin/fetch.c:822

5521 #, c-format

5522 msgid "Refusing to fetch into current branch %s of non-bare repository"

5523 msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu"

5524

5413 -#: builtin/fetch.c:838

5525 +#: builtin/fetch.c:841

5526 #, c-format

5527 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5528 msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"

5529

5418 -#: builtin/fetch.c:841

5530 +#: builtin/fetch.c:844

5531 #, c-format

5532 msgid "Option \"%s\" is ignored for %s\n"

5533 msgstr "S'ignora l'opció \"%s\" per a %s\n"

5534

5423 -#: builtin/fetch.c:897

5535 +#: builtin/fetch.c:900

5536 #, c-format

5537 msgid "Don't know how to fetch from %s"

5538 msgstr "No es sap com obtenir de %s"

5539

5428 -#: builtin/fetch.c:1059

5540 +#: builtin/fetch.c:1063

5541 #, c-format

5542 msgid "Fetching %s\n"

5543 msgstr "Obtenint %s\n"

5544

5433 -#: builtin/fetch.c:1061 builtin/remote.c:90

5545 +#: builtin/fetch.c:1065 builtin/remote.c:90

5546 #, c-format

5547 msgid "Could not fetch %s"

5548 msgstr "No s'ha pogut obtenir %s"

5549

5438 -#: builtin/fetch.c:1079

5550 +#: builtin/fetch.c:1083

5551 msgid ""

5552 "No remote repository specified. Please, specify either a URL or a\n"

5553 "remote name from which new revisions should be fetched."

@@ -5443,32 +5555,32 @@ msgstr ""

5555 "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"

5556 "un nom remot del qual es deuen obtenir les revisions noves."

5557

5446 -#: builtin/fetch.c:1102

5558 +#: builtin/fetch.c:1106

5559 msgid "You need to specify a tag name."

5560 msgstr "Necessiteu especificar un nom d'etiqueta."

5561

5450 -#: builtin/fetch.c:1144

5562 +#: builtin/fetch.c:1148

5563 msgid "--depth and --unshallow cannot be used together"

5564 msgstr "--depth i --unshallow no es poden usar junts"

5565

5454 -#: builtin/fetch.c:1146

5566 +#: builtin/fetch.c:1150

5567 msgid "--unshallow on a complete repository does not make sense"

5568 msgstr "--unshallow en un dipòsit complet no té sentit"

5569

5458 -#: builtin/fetch.c:1169

5570 +#: builtin/fetch.c:1173

5571 msgid "fetch --all does not take a repository argument"

5572 msgstr "fetch --all no accepta un paràmetre de dipòsit"

5573

5462 -#: builtin/fetch.c:1171

5574 +#: builtin/fetch.c:1175

5575 msgid "fetch --all does not make sense with refspecs"

5576 msgstr "fetch --all no té sentit amb especificacions de referència"

5577

5466 -#: builtin/fetch.c:1182

5578 +#: builtin/fetch.c:1186

5579 #, c-format

5580 msgid "No such remote or remote group: %s"

5581 msgstr "No hi ha tal remot ni tal grup remot: %s"

5582

5471 -#: builtin/fetch.c:1190

5583 +#: builtin/fetch.c:1194

5584 msgid "Fetching a group and specifying refspecs does not make sense"

5585 msgstr "Obtenir un grup i especificar referències no té sentit"

5586

@@ -5478,131 +5590,131 @@ msgid ""

5590 msgstr ""

5591 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"

5592

5481 -#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5593 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5594 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5483 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590

5484 -#: parse-options.h:132 parse-options.h:239

5595 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5596 +#: parse-options.h:131 parse-options.h:238

5597 msgid "n"

5598 msgstr "n"

5599

5488 -#: builtin/fmt-merge-msg.c:663

5600 +#: builtin/fmt-merge-msg.c:669

5601 msgid "populate log with at most <n> entries from shortlog"

5602 msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"

5603

5492 -#: builtin/fmt-merge-msg.c:666

5604 +#: builtin/fmt-merge-msg.c:672

5605 msgid "alias for --log (deprecated)"

5606 msgstr "àlies per --log (desaprovat)"

5607

5496 -#: builtin/fmt-merge-msg.c:669

5608 +#: builtin/fmt-merge-msg.c:675

5609 msgid "text"

5610 msgstr "text"

5611

5500 -#: builtin/fmt-merge-msg.c:670

5612 +#: builtin/fmt-merge-msg.c:676

5613 msgid "use <text> as start of message"

5614 msgstr "usa <text> com a inici de missatge"

5615

5504 -#: builtin/fmt-merge-msg.c:671

5616 +#: builtin/fmt-merge-msg.c:677

5617 msgid "file to read from"

5618 msgstr "fitxer del qual llegir"

5619

5508 -#: builtin/for-each-ref.c:675

5620 +#: builtin/for-each-ref.c:687

5621 msgid "unable to parse format"

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

5623

5512 -#: builtin/for-each-ref.c:1063

5624 +#: builtin/for-each-ref.c:1083

5625 msgid "git for-each-ref [<options>] [<pattern>]"

5626 msgstr "git for-each-ref [<opcions>] [<patró>]"

5627

5516 -#: builtin/for-each-ref.c:1078

5628 +#: builtin/for-each-ref.c:1098

5629 msgid "quote placeholders suitably for shells"

5630 msgstr ""

5631 "posa els marcadors de posició entre cometes adequades per als terminals"

5632

5521 -#: builtin/for-each-ref.c:1080

5633 +#: builtin/for-each-ref.c:1100

5634 msgid "quote placeholders suitably for perl"

5635 msgstr "posa els marcadors de posició entre cometes adequades per a perl"

5636

5525 -#: builtin/for-each-ref.c:1082

5637 +#: builtin/for-each-ref.c:1102

5638 msgid "quote placeholders suitably for python"

5639 msgstr "posa els marcadors de posició entre cometes adequades per a python"

5640

5529 -#: builtin/for-each-ref.c:1084

5641 +#: builtin/for-each-ref.c:1104

5642 msgid "quote placeholders suitably for Tcl"

5643 msgstr "posa els marcadors de posició entre cometes adequades per a Tcl"

5644

5533 -#: builtin/for-each-ref.c:1087

5645 +#: builtin/for-each-ref.c:1107

5646 msgid "show only <n> matched refs"

5647 msgstr "mostra només <n> referències coincidents"

5648

5537 -#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5649 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5650 msgid "format"

5651 msgstr "format"

5652

5541 -#: builtin/for-each-ref.c:1088

5653 +#: builtin/for-each-ref.c:1108

5654 msgid "format to use for the output"

5655 msgstr "format a usar en la sortida"

5656

5545 -#: builtin/for-each-ref.c:1089

5657 +#: builtin/for-each-ref.c:1109

5658 msgid "key"

5659 msgstr "clau"

5660

5549 -#: builtin/for-each-ref.c:1090

5661 +#: builtin/for-each-ref.c:1110

5662 msgid "field name to sort on"

5663 msgstr "nom de camp en el qual ordenar"

5664

5553 -#: builtin/fsck.c:147 builtin/prune.c:137

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

5666 msgid "Checking connectivity"

5667 msgstr "Comprovant connectivitat"

5668

5557 -#: builtin/fsck.c:540

5669 +#: builtin/fsck.c:548

5670 msgid "Checking object directories"

5671 msgstr "Comprovant els directoris d'objecte"

5672

5561 -#: builtin/fsck.c:603

5673 +#: builtin/fsck.c:611

5674 msgid "git fsck [<options>] [<object>...]"

5675 msgstr "git fsck [<opcions>] [<objecte>...]"

5676

5565 -#: builtin/fsck.c:609

5677 +#: builtin/fsck.c:617

5678 msgid "show unreachable objects"

5679 msgstr "mostra els objectes inabastables"

5680

5569 -#: builtin/fsck.c:610

5681 +#: builtin/fsck.c:618

5682 msgid "show dangling objects"

5683 msgstr "mostra els objectes penjants"

5684

5573 -#: builtin/fsck.c:611

5685 +#: builtin/fsck.c:619

5686 msgid "report tags"

5687 msgstr "informa de les etiquetes"

5688

5577 -#: builtin/fsck.c:612

5689 +#: builtin/fsck.c:620

5690 msgid "report root nodes"

5691 msgstr "informa dels nodes d'arrel"

5692

5581 -#: builtin/fsck.c:613

5693 +#: builtin/fsck.c:621

5694 msgid "make index objects head nodes"

5695 msgstr "fes els objectes d'índex nodes de cap"

5696

5585 -#: builtin/fsck.c:614

5697 +#: builtin/fsck.c:622

5698 msgid "make reflogs head nodes (default)"

5699 msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"

5700

5589 -#: builtin/fsck.c:615

5701 +#: builtin/fsck.c:623

5702 msgid "also consider packs and alternate objects"

5703 msgstr "també considera els paquets i els objectes alternatius"

5704

5593 -#: builtin/fsck.c:616

5705 +#: builtin/fsck.c:624

5706 msgid "enable more strict checking"

5707 msgstr "habilita la comprovació més estricta"

5708

5597 -#: builtin/fsck.c:618

5709 +#: builtin/fsck.c:626

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

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

5712

5601 -#: builtin/fsck.c:619 builtin/prune.c:108

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

5714 msgid "show progress"

5715 msgstr "mostra el progrés"

5716

5605 -#: builtin/fsck.c:669

5717 +#: builtin/fsck.c:677

5718 msgid "Checking objects"

5719 msgstr "Comprovant els objectes"

5720

@@ -5610,56 +5722,56 @@ msgstr "Comprovant els objectes"

5722 msgid "git gc [<options>]"

5723 msgstr "git gc [<opcions>]"

5724

5613 -#: builtin/gc.c:79

5725 +#: builtin/gc.c:67

5726 #, c-format

5615 -msgid "Invalid gc.pruneexpire: '%s'"

5616 -msgstr "gc.pruneexpire no vàlid: %s"

5727 +msgid "Invalid %s: '%s'"

5728 +msgstr "%s no vàlid: %s"

5729

5618 -#: builtin/gc.c:107

5730 +#: builtin/gc.c:112

5731 #, c-format

5732 msgid "insanely long object directory %.*s"

5733 msgstr "directori d'objectes increïblement llarg %.*s"

5734

5623 -#: builtin/gc.c:276

5735 +#: builtin/gc.c:281

5736 msgid "prune unreferenced objects"

5737 msgstr "poda objectes sense referència"

5738

5627 -#: builtin/gc.c:278

5739 +#: builtin/gc.c:283

5740 msgid "be more thorough (increased runtime)"

5741 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"

5742

5631 -#: builtin/gc.c:279

5743 +#: builtin/gc.c:284

5744 msgid "enable auto-gc mode"

5745 msgstr "habilita el mode de recollida d'escombraries automàtica"

5746

5635 -#: builtin/gc.c:280

5747 +#: builtin/gc.c:285

5748 msgid "force running gc even if there may be another gc running"

5749 msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"

5750

5639 -#: builtin/gc.c:321

5751 +#: builtin/gc.c:327

5752 #, c-format

5753 msgid "Auto packing the repository in background for optimum performance.\n"

5754 msgstr ""

5755 "Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n"

5756

5645 -#: builtin/gc.c:323

5757 +#: builtin/gc.c:329

5758 #, c-format

5759 msgid "Auto packing the repository for optimum performance.\n"

5760 msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n"

5761

5650 -#: builtin/gc.c:324

5762 +#: builtin/gc.c:330

5763 #, c-format

5764 msgid "See \"git help gc\" for manual housekeeping.\n"

5765 msgstr "Vegeu \"git help gc\" per neteja manual.\n"

5766

5655 -#: builtin/gc.c:342

5767 +#: builtin/gc.c:348

5768 #, c-format

5769 msgid ""

5770 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5771 msgstr ""

5772 "gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"

5773

5662 -#: builtin/gc.c:364

5774 +#: builtin/gc.c:376

5775 msgid ""

5776 "There are too many unreachable loose objects; run 'git prune' to remove them."

5777 msgstr ""

@@ -5867,7 +5979,7 @@ msgstr "mostra els fitxers coincidents en el paginador"

5979 msgid "allow calling of grep(1) (ignored by this build)"

5980 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"

5981

5870 -#: builtin/grep.c:741 builtin/show-ref.c:187

5982 +#: builtin/grep.c:741 builtin/show-ref.c:189

5983 msgid "show usage"

5984 msgstr "mostra l'ús"

5985

@@ -5895,7 +6007,7 @@ msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."

6007 msgid "both --cached and trees are given."

6008 msgstr "s'han donat ambdós --caches i arbres."

6009

5898 -#: builtin/hash-object.c:82

6010 +#: builtin/hash-object.c:80

6011 msgid ""

6012 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6013 "[--] <file>..."

@@ -5903,38 +6015,38 @@ msgstr ""

6015 "git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "

6016 "[--] <fitxer>..."

6017

5906 -#: builtin/hash-object.c:83

6018 +#: builtin/hash-object.c:81

6019 msgid "git hash-object --stdin-paths < <list-of-paths>"

6020 msgstr "git hash-object --stdin-paths < <llista-de-camins>"

6021

5910 -#: builtin/hash-object.c:94 builtin/tag.c:612

6022 +#: builtin/hash-object.c:92 builtin/tag.c:612

6023 msgid "type"

6024 msgstr "tipus"

6025

5914 -#: builtin/hash-object.c:94

6026 +#: builtin/hash-object.c:92

6027 msgid "object type"

6028 msgstr "tipus d'objecte"

6029

5918 -#: builtin/hash-object.c:95

6030 +#: builtin/hash-object.c:93

6031 msgid "write the object into the object database"

6032 msgstr "escriu l'objecte a la base de dades d'objectes"

6033

5922 -#: builtin/hash-object.c:97

6034 +#: builtin/hash-object.c:95

6035 msgid "read the object from stdin"

6036 msgstr "llegiu l'objecte des d'stdin"

6037

5926 -#: builtin/hash-object.c:99

6038 +#: builtin/hash-object.c:97

6039 msgid "store file as is without filters"

6040 msgstr "emmagatzema el fitxer tal com és sense filtres"

6041

5930 -#: builtin/hash-object.c:100

6042 +#: builtin/hash-object.c:98

6043 msgid ""

6044 "just hash any random garbage to create corrupt objects for debugging Git"

6045 msgstr ""

6046 "només suma qualsevulla brossa aleatòria per a crear objectes corruptes per a "

6047 "depurar al Git"

6048

5937 -#: builtin/hash-object.c:101

6049 +#: builtin/hash-object.c:99

6050 msgid "process file as it were from this path"

6051 msgstr "processa el fitxer com si fos d'aquest camí"

6052

@@ -6062,291 +6174,291 @@ msgstr "ús: %s%s"

6174 msgid "`git %s' is aliased to `%s'"

6175 msgstr "`git %s' és un àlies de `%s'"

6176

6065 -#: builtin/index-pack.c:150

6177 +#: builtin/index-pack.c:151

6178 #, c-format

6179 msgid "unable to open %s"

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

6181

6070 -#: builtin/index-pack.c:200

6182 +#: builtin/index-pack.c:201

6183 #, c-format

6184 msgid "object type mismatch at %s"

6185 msgstr "hi ha una discordança de tipus d'objecte a %s"

6186

6075 -#: builtin/index-pack.c:220

6187 +#: builtin/index-pack.c:221

6188 #, c-format

6189 msgid "did not receive expected object %s"

6190 msgstr "no s'ha rebut l'objecte esperat %s"

6191

6080 -#: builtin/index-pack.c:223

6192 +#: builtin/index-pack.c:224

6193 #, c-format

6194 msgid "object %s: expected type %s, found %s"

6195 msgstr "objecte %s: tipus %s esperat, %s trobat"

6196

6085 -#: builtin/index-pack.c:265

6197 +#: builtin/index-pack.c:266

6198 #, c-format

6199 msgid "cannot fill %d byte"

6200 msgid_plural "cannot fill %d bytes"

6201 msgstr[0] "no es pot omplir %d octet"

6202 msgstr[1] "no es pot omplir %d octets"

6203

6092 -#: builtin/index-pack.c:275

6204 +#: builtin/index-pack.c:276

6205 msgid "early EOF"

6206 msgstr "EOF prematur"

6207

6096 -#: builtin/index-pack.c:276

6208 +#: builtin/index-pack.c:277

6209 msgid "read error on input"

6210 msgstr "error de lectura d'entrada"

6211

6100 -#: builtin/index-pack.c:288

6212 +#: builtin/index-pack.c:289

6213 msgid "used more bytes than were available"

6102 -msgstr "s'han usat més octets dels que hi havia disponibles"

6214 +msgstr "s'han usat més octets que hi havia disponibles"

6215

6104 -#: builtin/index-pack.c:295

6216 +#: builtin/index-pack.c:296

6217 msgid "pack too large for current definition of off_t"

6218 msgstr "paquet massa gran per a la definició actual d'off_t"

6219

6108 -#: builtin/index-pack.c:311

6220 +#: builtin/index-pack.c:312

6221 #, c-format

6222 msgid "unable to create '%s'"

6223 msgstr "no es pot crear '%s'"

6224

6113 -#: builtin/index-pack.c:316

6225 +#: builtin/index-pack.c:317

6226 #, c-format

6227 msgid "cannot open packfile '%s'"

6228 msgstr "no es pot obrir el fitxer de paquet '%s'"

6229

6118 -#: builtin/index-pack.c:330

6230 +#: builtin/index-pack.c:331

6231 msgid "pack signature mismatch"

6232 msgstr "hi ha una discordança de firma de paquet"

6233

6122 -#: builtin/index-pack.c:332

6234 +#: builtin/index-pack.c:333

6235 #, c-format

6236 msgid "pack version %<PRIu32> unsupported"

6237 msgstr "la versió de paquet %<PRIu32> no és compatible"

6238

6127 -#: builtin/index-pack.c:350

6239 +#: builtin/index-pack.c:351

6240 #, c-format

6241 msgid "pack has bad object at offset %lu: %s"

6242 msgstr "el paquet té un objecte dolent a la posició %lu: %s"

6243

6132 -#: builtin/index-pack.c:471

6244 +#: builtin/index-pack.c:472

6245 #, c-format

6246 msgid "inflate returned %d"

6247 msgstr "la inflació ha retornat %d"

6248

6137 -#: builtin/index-pack.c:520

6249 +#: builtin/index-pack.c:521

6250 msgid "offset value overflow for delta base object"

6251 msgstr "desbordament de valor de desplaçament per a l'objecte base de delta"

6252

6141 -#: builtin/index-pack.c:528

6253 +#: builtin/index-pack.c:529

6254 msgid "delta base offset is out of bound"

6255 msgstr "el desplaçament de base de delta està fora de límits"

6256

6145 -#: builtin/index-pack.c:536

6257 +#: builtin/index-pack.c:537

6258 #, c-format

6259 msgid "unknown object type %d"

6260 msgstr "tipus d'objecte desconegut %d"

6261

6150 -#: builtin/index-pack.c:567

6262 +#: builtin/index-pack.c:568

6263 msgid "cannot pread pack file"

6264 msgstr "no es pot fer pread en el fitxer de paquet"

6265

6154 -#: builtin/index-pack.c:569

6266 +#: builtin/index-pack.c:570

6267 #, c-format

6268 msgid "premature end of pack file, %lu byte missing"

6269 msgid_plural "premature end of pack file, %lu bytes missing"

6270 msgstr[0] "final prematur de fitxer de paquet, manca %lu octet"

6271 msgstr[1] "final prematur de fitxer de paquet, manquen %lu octets"

6272

6161 -#: builtin/index-pack.c:595

6273 +#: builtin/index-pack.c:596

6274 msgid "serious inflate inconsistency"

6275 msgstr "hi ha una inconsistència seriosa d'inflació"

6276

6165 -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715

6166 -#: builtin/index-pack.c:749 builtin/index-pack.c:758

6277 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6278 +#: builtin/index-pack.c:805 builtin/index-pack.c:814

6279 #, c-format

6280 msgid "SHA1 COLLISION FOUND WITH %s !"

6281 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"

6282

6171 -#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6283 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6284 #: builtin/pack-objects.c:254

6285 #, c-format

6286 msgid "unable to read %s"

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

6288

6177 -#: builtin/index-pack.c:755

6289 +#: builtin/index-pack.c:811

6290 #, c-format

6291 msgid "cannot read existing object %s"

6292 msgstr "no es pot llegir l'objecte existent %s"

6293

6182 -#: builtin/index-pack.c:769

6294 +#: builtin/index-pack.c:825

6295 #, c-format

6296 msgid "invalid blob object %s"

6297 msgstr "objecte de blob no vàlid %s"

6298

6187 -#: builtin/index-pack.c:783

6299 +#: builtin/index-pack.c:839

6300 #, c-format

6301 msgid "invalid %s"

6302 msgstr "%s no vàlid"

6303

6192 -#: builtin/index-pack.c:787

6304 +#: builtin/index-pack.c:843

6305 msgid "Error in object"

6306 msgstr "Error en objecte"

6307

6196 -#: builtin/index-pack.c:789

6308 +#: builtin/index-pack.c:845

6309 #, c-format

6310 msgid "Not all child objects of %s are reachable"

6311 msgstr "No tots els objectes fills de %s són abastables"

6312

6201 -#: builtin/index-pack.c:861 builtin/index-pack.c:890

6313 +#: builtin/index-pack.c:917 builtin/index-pack.c:948

6314 msgid "failed to apply delta"

6315 msgstr "s'ha fallat en aplicar la delta"

6316

6205 -#: builtin/index-pack.c:1055

6317 +#: builtin/index-pack.c:1118

6318 msgid "Receiving objects"

6319 msgstr "Rebent objectes"

6320

6209 -#: builtin/index-pack.c:1055

6321 +#: builtin/index-pack.c:1118

6322 msgid "Indexing objects"

6323 msgstr "Indexant objectes"

6324

6213 -#: builtin/index-pack.c:1081

6325 +#: builtin/index-pack.c:1150

6326 msgid "pack is corrupted (SHA1 mismatch)"

6327 msgstr "el paquet és corromput (discordança SHA1)"

6328

6217 -#: builtin/index-pack.c:1086

6329 +#: builtin/index-pack.c:1155

6330 msgid "cannot fstat packfile"

6331 msgstr "no es pot fer fstat en el fitxer de paquet"

6332

6221 -#: builtin/index-pack.c:1089

6333 +#: builtin/index-pack.c:1158

6334 msgid "pack has junk at the end"

6335 msgstr "el paquet té brossa al seu final"

6336

6225 -#: builtin/index-pack.c:1100

6337 +#: builtin/index-pack.c:1169

6338 msgid "confusion beyond insanity in parse_pack_objects()"

6339 msgstr "confusió més enllà de la insanitat en parse_pack_objects()"

6340

6229 -#: builtin/index-pack.c:1123

6341 +#: builtin/index-pack.c:1194

6342 msgid "Resolving deltas"

6343 msgstr "Resolent les deltes"

6344

6233 -#: builtin/index-pack.c:1133

6345 +#: builtin/index-pack.c:1205

6346 #, c-format

6347 msgid "unable to create thread: %s"

6348 msgstr "no s'ha pogut crear fil: %s"

6349

6238 -#: builtin/index-pack.c:1175

6350 +#: builtin/index-pack.c:1247

6351 msgid "confusion beyond insanity"

6352 msgstr "confusió més enllà de la insanitat"

6353

6242 -#: builtin/index-pack.c:1181

6354 +#: builtin/index-pack.c:1253

6355 #, c-format

6356 msgid "completed with %d local objects"

6357 msgstr "s'ha completat amb %d objectes locals"

6358

6247 -#: builtin/index-pack.c:1191

6359 +#: builtin/index-pack.c:1263

6360 #, c-format

6361 msgid "Unexpected tail checksum for %s (disk corruption?)"

6362 msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"

6363

6252 -#: builtin/index-pack.c:1195

6364 +#: builtin/index-pack.c:1267

6365 #, c-format

6366 msgid "pack has %d unresolved delta"

6367 msgid_plural "pack has %d unresolved deltas"

6368 msgstr[0] "El paquet té %d delta no resolta"

6369 msgstr[1] "El paquet té %d deltes no resoltes"

6370

6259 -#: builtin/index-pack.c:1219

6371 +#: builtin/index-pack.c:1291

6372 #, c-format

6373 msgid "unable to deflate appended object (%d)"

6374 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"

6375

6264 -#: builtin/index-pack.c:1298

6376 +#: builtin/index-pack.c:1367

6377 #, c-format

6378 msgid "local object %s is corrupt"

6379 msgstr "l'objecte local %s és corrupte"

6380

6269 -#: builtin/index-pack.c:1322

6381 +#: builtin/index-pack.c:1391

6382 msgid "error while closing pack file"

6383 msgstr "error en tancar el fitxer de paquet"

6384

6273 -#: builtin/index-pack.c:1335

6385 +#: builtin/index-pack.c:1404

6386 #, c-format

6387 msgid "cannot write keep file '%s'"

6388 msgstr "no es pot escriure el fitxer a retenir '%s'"

6389

6278 -#: builtin/index-pack.c:1343

6390 +#: builtin/index-pack.c:1412

6391 #, c-format

6392 msgid "cannot close written keep file '%s'"

6393 msgstr "no es pot tancar el fitxer escrit a retenir '%s'"

6394

6283 -#: builtin/index-pack.c:1356

6395 +#: builtin/index-pack.c:1425

6396 msgid "cannot store pack file"

6397 msgstr "no es pot emmagatzemar el fitxer de paquet"

6398

6287 -#: builtin/index-pack.c:1367

6399 +#: builtin/index-pack.c:1436

6400 msgid "cannot store index file"

6401 msgstr "no es pot emmagatzemar el fitxer d'índex"

6402

6291 -#: builtin/index-pack.c:1400

6403 +#: builtin/index-pack.c:1469

6404 #, c-format

6405 msgid "bad pack.indexversion=%<PRIu32>"

6406 msgstr "pack.indexversion=%<PRIu32> dolent"

6407

6296 -#: builtin/index-pack.c:1406

6408 +#: builtin/index-pack.c:1475

6409 #, c-format

6410 msgid "invalid number of threads specified (%d)"

6411 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"

6412

6301 -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6413 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6414 #, c-format

6415 msgid "no threads support, ignoring %s"

6416 msgstr "no hi ha suport de fils, ignorant %s"

6417

6306 -#: builtin/index-pack.c:1468

6418 +#: builtin/index-pack.c:1537

6419 #, c-format

6420 msgid "Cannot open existing pack file '%s'"

6421 msgstr "No es pot obrir el fitxer de paquet existent '%s'"

6422

6311 -#: builtin/index-pack.c:1470

6423 +#: builtin/index-pack.c:1539

6424 #, c-format

6425 msgid "Cannot open existing pack idx file for '%s'"

6426 msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'"

6427

6316 -#: builtin/index-pack.c:1517

6428 +#: builtin/index-pack.c:1586

6429 #, c-format

6430 msgid "non delta: %d object"

6431 msgid_plural "non delta: %d objects"

6432 msgstr[0] "sense delta: %d objecte"

6433 msgstr[1] "sense delta: %d objectes"

6434

6323 -#: builtin/index-pack.c:1524

6435 +#: builtin/index-pack.c:1593

6436 #, c-format

6437 msgid "chain length = %d: %lu object"

6438 msgid_plural "chain length = %d: %lu objects"

6439 msgstr[0] "longitud de cadena = %d: %lu objecte"

6440 msgstr[1] "longitud de cadena = %d: %lu objectes"

6441

6330 -#: builtin/index-pack.c:1553

6442 +#: builtin/index-pack.c:1622

6443 msgid "Cannot come back to cwd"

6444 msgstr "No es pot tornar al directori de treball actual"

6445

6334 -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6335 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6446 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6447 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6448 #, c-format

6449 msgid "bad %s"

6450 msgstr "%s dolent"

6451

6340 -#: builtin/index-pack.c:1634

6452 +#: builtin/index-pack.c:1703

6453 msgid "--fix-thin cannot be used without --stdin"

6454 msgstr "--fix-thin no es pot usar sense --stdin"

6455

6344 -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6456 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6457 #, c-format

6458 msgid "packfile name '%s' does not end with '.pack'"

6459 msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'"

6460

6349 -#: builtin/index-pack.c:1655

6461 +#: builtin/index-pack.c:1724

6462 msgid "--verify with no packfile name given"

6463 msgstr "s'ha donat --verify sense nom de fitxer de paquet"

6464

@@ -6415,22 +6527,22 @@ msgstr "no s'han trobat les plantilles %s"

6527 msgid "not copying templates of a wrong format version %d from '%s'"

6528 msgstr "no copiant plantilles d'una versió de format errònia %d de '%s'"

6529

6418 -#: builtin/init-db.c:197

6530 +#: builtin/init-db.c:211

6531 #, c-format

6532 msgid "insane git directory %s"

6533 msgstr "directori de git boig %s"

6534

6423 -#: builtin/init-db.c:331 builtin/init-db.c:334

6535 +#: builtin/init-db.c:343 builtin/init-db.c:346

6536 #, c-format

6537 msgid "%s already exists"

6538 msgstr "%s ja existeix"

6539

6428 -#: builtin/init-db.c:363

6540 +#: builtin/init-db.c:374

6541 #, c-format

6542 msgid "unable to handle file type %d"

6543 msgstr "no s'ha pogut gestionar el tipus de fitxer %d"

6544

6433 -#: builtin/init-db.c:366

6545 +#: builtin/init-db.c:377

6546 #, c-format

6547 msgid "unable to move %s to %s"

6548 msgstr "no s'ha pogut moure %s a %s"

@@ -6438,24 +6550,24 @@ msgstr "no s'ha pogut moure %s a %s"

6550 #. TRANSLATORS: The first '%s' is either "Reinitialized

6551 #. existing" or "Initialized empty", the second " shared" or

6552 #. "", and the last '%s%s' is the verbatim directory name.

6441 -#: builtin/init-db.c:426

6553 +#: builtin/init-db.c:433

6554 #, c-format

6555 msgid "%s%s Git repository in %s%s\n"

6556 msgstr "%s dipòsit de Git%s a %s%s\n"

6557

6446 -#: builtin/init-db.c:427

6558 +#: builtin/init-db.c:434

6559 msgid "Reinitialized existing"

6560 msgstr "S'ha reinicialitzat un existent"

6561

6450 -#: builtin/init-db.c:427

6562 +#: builtin/init-db.c:434

6563 msgid "Initialized empty"

6564 msgstr "S'ha inicialitzat un buit"

6565

6454 -#: builtin/init-db.c:428

6566 +#: builtin/init-db.c:435

6567 msgid " shared"

6568 msgstr " compartit"

6569

6458 -#: builtin/init-db.c:475

6570 +#: builtin/init-db.c:482

6571 msgid ""

6572 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6573 "shared[=<permissions>]] [<directory>]"

@@ -6463,29 +6575,29 @@ msgstr ""

6575 "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"

6576 "shared[=<permisos>]] [<directori>]"

6577

6466 -#: builtin/init-db.c:498

6578 +#: builtin/init-db.c:505

6579 msgid "permissions"

6580 msgstr "permisos"

6581

6470 -#: builtin/init-db.c:499

6582 +#: builtin/init-db.c:506

6583 msgid "specify that the git repository is to be shared amongst several users"

6584 msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"

6585

6474 -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6586 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171

6587 msgid "be quiet"

6588 msgstr "calla"

6589

6478 -#: builtin/init-db.c:533 builtin/init-db.c:538

6590 +#: builtin/init-db.c:540 builtin/init-db.c:545

6591 #, c-format

6592 msgid "cannot mkdir %s"

6593 msgstr "no es pot mkdir %s"

6594

6483 -#: builtin/init-db.c:542

6595 +#: builtin/init-db.c:549

6596 #, c-format

6597 msgid "cannot chdir to %s"

6598 msgstr "no es pot chdir a %s"

6599

6488 -#: builtin/init-db.c:563

6600 +#: builtin/init-db.c:570

6601 #, c-format

6602 msgid ""

6603 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6494,7 +6606,7 @@ msgstr ""

6606 "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"

6607 "dir=<directori>)"

6608

6497 -#: builtin/init-db.c:591

6609 +#: builtin/init-db.c:598

6610 #, c-format

6611 msgid "Cannot access work tree '%s'"

6612 msgstr "No es pot accedir a l'arbre de treball '%s'"

@@ -6520,8 +6632,8 @@ msgid "trailer(s) to add"

6632 msgstr "remolcs a afegir"

6633

6634 #: builtin/log.c:41

6523 -msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6524 -msgstr "git log [<opcions>] [<rang de revisions>] [[--] <camí>...]"

6635 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6636 +msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"

6637

6638 #: builtin/log.c:42

6639 msgid "git show [<options>] <object>..."

@@ -6589,7 +6701,7 @@ msgstr "No es pot obrir el fitxer de pedaç %s"

6701 msgid "Need exactly one range."

6702 msgstr "Cal exactament un rang."

6703

6592 -#: builtin/log.c:811

6704 +#: builtin/log.c:813

6705 msgid "Not a range."

6706 msgstr "No és un rang."

6707

@@ -6791,7 +6903,7 @@ msgstr "S'ha fallat en crear els fitxers de sortida"

6903 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6904 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"

6905

6794 -#: builtin/log.c:1638

6906 +#: builtin/log.c:1637

6907 #, c-format

6908 msgid ""

6909 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

@@ -6799,7 +6911,7 @@ msgstr ""

6911 "No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "

6912 "<font> manualment.\n"

6913

6802 -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

6914 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662

6915 #, c-format

6916 msgid "Unknown commit %s"

6917 msgstr "Comissió desconeguda %s"

@@ -7076,40 +7188,40 @@ msgstr "Cap missatge de fusió -- no actualitzant HEAD\n"

7188 msgid "'%s' does not point to a commit"

7189 msgstr "'%s' no assenyala una comissió"

7190

7079 -#: builtin/merge.c:559

7191 +#: builtin/merge.c:537

7192 #, c-format

7193 msgid "Bad branch.%s.mergeoptions string: %s"

7194 msgstr "Cadena branch.%s.mergeoptions dolenta: %s"

7195

7084 -#: builtin/merge.c:654

7196 +#: builtin/merge.c:632

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

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

7199

7088 -#: builtin/merge.c:678

7200 +#: builtin/merge.c:656

7201 msgid "Not handling anything other than two heads merge."

7202 msgstr "No gestionant res a part de la fusió de dos caps."

7203

7092 -#: builtin/merge.c:692

7204 +#: builtin/merge.c:670

7205 #, c-format

7206 msgid "Unknown option for merge-recursive: -X%s"

7207 msgstr "Opció desconeguda de merge-recursive: -X%s"

7208

7097 -#: builtin/merge.c:705

7209 +#: builtin/merge.c:683

7210 #, c-format

7211 msgid "unable to write %s"

7212 msgstr "no s'ha pogut escriure %s"

7213

7102 -#: builtin/merge.c:794

7214 +#: builtin/merge.c:772

7215 #, c-format

7216 msgid "Could not read from '%s'"

7217 msgstr "No s'ha pogut llegir de '%s'"

7218

7107 -#: builtin/merge.c:803

7219 +#: builtin/merge.c:781

7220 #, c-format

7221 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7222 msgstr "No cometent la fusió; useu 'git commit' per a completar la fusió.\n"

7223

7112 -#: builtin/merge.c:809

7224 +#: builtin/merge.c:787

7225 #, c-format

7226 msgid ""

7227 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7125,49 +7237,54 @@ msgstr ""

7237 "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"

7238 "avorta la comissió.\n"

7239

7128 -#: builtin/merge.c:833

7240 +#: builtin/merge.c:811

7241 msgid "Empty commit message."

7242 msgstr "Missatge de comissió buit."

7243

7132 -#: builtin/merge.c:845

7244 +#: builtin/merge.c:823

7245 #, c-format

7246 msgid "Wonderful.\n"

7247 msgstr "Meravellós.\n"

7248

7137 -#: builtin/merge.c:900

7249 +#: builtin/merge.c:878

7250 #, c-format

7251 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7252 msgstr ""

7253 "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "

7254 "resultat.\n"

7255

7144 -#: builtin/merge.c:916

7256 +#: builtin/merge.c:894

7257 #, c-format

7258 msgid "'%s' is not a commit"

7259 msgstr "'%s' no és una comissió"

7260

7149 -#: builtin/merge.c:957

7261 +#: builtin/merge.c:935

7262 msgid "No current branch."

7263 msgstr "Cap branca actual."

7264

7153 -#: builtin/merge.c:959

7265 +#: builtin/merge.c:937

7266 msgid "No remote for the current branch."

7267 msgstr "No hi ha cap remot per a la branca actual."

7268

7157 -#: builtin/merge.c:961

7269 +#: builtin/merge.c:939

7270 msgid "No default upstream defined for the current branch."

7271 msgstr "No hi ha cap font per defecte definida per a la branca actual."

7272

7161 -#: builtin/merge.c:966

7273 +#: builtin/merge.c:944

7274 #, c-format

7275 msgid "No remote-tracking branch for %s from %s"

7164 -msgstr "No hi ha cap branca de seguiment remot per a %s de %s"

7276 +msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"

7277

7166 -#: builtin/merge.c:1122

7278 +#: builtin/merge.c:1081

7279 +#, c-format

7280 +msgid "could not close '%s'"

7281 +msgstr "no s'ha pogut tancar '%s'"

7282 +

7283 +#: builtin/merge.c:1208

7284 msgid "There is no merge to abort (MERGE_HEAD missing)."

7285 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."

7286

7170 -#: builtin/merge.c:1138

7287 +#: builtin/merge.c:1224

7288 msgid ""

7289 "You have not concluded your merge (MERGE_HEAD exists).\n"

7290 "Please, commit your changes before you merge."

@@ -7175,11 +7292,11 @@ msgstr ""

7292 "No heu completat la vostra fusió (MERGE_HEAD existeix).\n"

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

7294

7178 -#: builtin/merge.c:1141 git-pull.sh:34

7295 +#: builtin/merge.c:1227 git-pull.sh:74

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

7297 msgstr "No heu completat la vostra fusió (MERGE_HEAD existeix)."

7298

7182 -#: builtin/merge.c:1145

7299 +#: builtin/merge.c:1231

7300 msgid ""

7301 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7302 "Please, commit your changes before you merge."

@@ -7187,103 +7304,103 @@ msgstr ""

7304 "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n"

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

7306

7190 -#: builtin/merge.c:1148

7307 +#: builtin/merge.c:1234

7308 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7309 msgstr ""

7310 "No heu completat el vostre recull de cireres (CHERRY_PICK_HEAD existeix)."

7311

7195 -#: builtin/merge.c:1157

7312 +#: builtin/merge.c:1243

7313 msgid "You cannot combine --squash with --no-ff."

7314 msgstr "No podeu combinar --squash amb --no-ff."

7315

7199 -#: builtin/merge.c:1166

7316 +#: builtin/merge.c:1251

7317 msgid "No commit specified and merge.defaultToUpstream not set."

7318 msgstr ""

7319 "No hi ha una comissió especificada i merge.defaultToUpstream no està "

7320 "establert."

7321

7205 -#: builtin/merge.c:1198

7206 -msgid "Can merge only exactly one commit into empty head"

7207 -msgstr "Es pot fusionar només exactament una comissió a un cap buit"

7208 -

7209 -#: builtin/merge.c:1201

7322 +#: builtin/merge.c:1268

7323 msgid "Squash commit into empty head not supported yet"

7324 msgstr "Aixafar una comissió a un cap buit encara no es permet"

7325

7213 -#: builtin/merge.c:1203

7326 +#: builtin/merge.c:1270

7327 msgid "Non-fast-forward commit does not make sense into an empty head"

7328 msgstr "Una comissió no d'avanç ràpid no té sentit a un cap buit"

7329

7217 -#: builtin/merge.c:1208

7330 +#: builtin/merge.c:1276

7331 #, c-format

7332 msgid "%s - not something we can merge"

7333 msgstr "%s - no és una cosa que puguem fusionar"

7334

7222 -#: builtin/merge.c:1259

7335 +#: builtin/merge.c:1278

7336 +msgid "Can merge only exactly one commit into empty head"

7337 +msgstr "Es pot fusionar només exactament una comissió a un cap buit"

7338 +

7339 +#: builtin/merge.c:1333

7340 #, c-format

7341 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7342 msgstr "La comissió %s té una firma GPG no fiable, suposadament de %s."

7343

7227 -#: builtin/merge.c:1262

7344 +#: builtin/merge.c:1336

7345 #, c-format

7346 msgid "Commit %s has a bad GPG signature allegedly by %s."

7347 msgstr "La comissió %s té una firma GPG dolenta suposadament de %s."

7348

7232 -#: builtin/merge.c:1265

7349 +#: builtin/merge.c:1339

7350 #, c-format

7351 msgid "Commit %s does not have a GPG signature."

7352 msgstr "La comissió %s no té firma GPG."

7353

7237 -#: builtin/merge.c:1268

7354 +#: builtin/merge.c:1342

7355 #, c-format

7356 msgid "Commit %s has a good GPG signature by %s\n"

7357 msgstr "La comissió %s té una firma GPG bona de %s\n"

7358

7242 -#: builtin/merge.c:1349

7359 +#: builtin/merge.c:1423

7360 #, c-format

7361 msgid "Updating %s..%s\n"

7362 msgstr "Actualitzant %s..%s\n"

7363

7247 -#: builtin/merge.c:1388

7364 +#: builtin/merge.c:1462

7365 #, c-format

7366 msgid "Trying really trivial in-index merge...\n"

7367 msgstr "Intentant una fusió molt trivial en l'índex...\n"

7368

7252 -#: builtin/merge.c:1395

7369 +#: builtin/merge.c:1469

7370 #, c-format

7371 msgid "Nope.\n"

7372 msgstr "No.\n"

7373

7257 -#: builtin/merge.c:1427

7374 +#: builtin/merge.c:1501

7375 msgid "Not possible to fast-forward, aborting."

7376 msgstr "No és possible avançar ràpidament, avortant."

7377

7261 -#: builtin/merge.c:1450 builtin/merge.c:1529

7378 +#: builtin/merge.c:1524 builtin/merge.c:1603

7379 #, c-format

7380 msgid "Rewinding the tree to pristine...\n"

7381 msgstr "Rebobinant l'arbre a la pristina...\n"

7382

7266 -#: builtin/merge.c:1454

7383 +#: builtin/merge.c:1528

7384 #, c-format

7385 msgid "Trying merge strategy %s...\n"

7386 msgstr "Intentant l'estratègia de fusió %s...\n"

7387

7271 -#: builtin/merge.c:1520

7388 +#: builtin/merge.c:1594

7389 #, c-format

7390 msgid "No merge strategy handled the merge.\n"

7391 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"

7392

7276 -#: builtin/merge.c:1522

7393 +#: builtin/merge.c:1596

7394 #, c-format

7395 msgid "Merge with strategy %s failed.\n"

7396 msgstr "L'estratègia de fusió %s ha fallat.\n"

7397

7281 -#: builtin/merge.c:1531

7398 +#: builtin/merge.c:1605

7399 #, c-format

7400 msgid "Using the %s to prepare resolving by hand.\n"

7401 msgstr "Usant el %s per a preparar la resolució a mà.\n"

7402

7286 -#: builtin/merge.c:1543

7403 +#: builtin/merge.c:1617

7404 #, c-format

7405 msgid "Automatic merge went well; stopped before committing as requested\n"

7406 msgstr ""

@@ -7476,7 +7593,7 @@ msgstr "%s, origen=%s, destí=%s"

7593 msgid "Renaming %s to %s\n"

7594 msgstr "Canviant el nom de %s a %s\n"

7595

7479 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7596 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361

7597 #, c-format

7598 msgid "renaming '%s' failed"

7599 msgstr "el canvi del nom de '%s' ha fallat"

@@ -7854,7 +7971,7 @@ msgstr "referència de notes"

7971 msgid "use notes from <notes-ref>"

7972 msgstr "usa les notes de <referència-de-notes>"

7973

7857 -#: builtin/notes.c:989 builtin/remote.c:1621

7974 +#: builtin/notes.c:989 builtin/remote.c:1618

7975 #, c-format

7976 msgid "Unknown subcommand: %s"

7977 msgstr "Subordre desconegut: %s"

@@ -7880,182 +7997,182 @@ msgstr "error de deflació (%d)"

7997 msgid "Writing objects"

7998 msgstr "Escrivint els objectes"

7999

7883 -#: builtin/pack-objects.c:1013

8000 +#: builtin/pack-objects.c:1011

8001 msgid "disabling bitmap writing, as some objects are not being packed"

8002 msgstr ""

8003 "inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "

8004 "s'estan empaquetant"

8005

7889 -#: builtin/pack-objects.c:2173

8006 +#: builtin/pack-objects.c:2171

8007 msgid "Compressing objects"

8008 msgstr "Comprimint objectes"

8009

7893 -#: builtin/pack-objects.c:2570

8010 +#: builtin/pack-objects.c:2568

8011 #, c-format

8012 msgid "unsupported index version %s"

8013 msgstr "versió d'índex no compatible %s"

8014

7898 -#: builtin/pack-objects.c:2574

8015 +#: builtin/pack-objects.c:2572

8016 #, c-format

8017 msgid "bad index version '%s'"

8018 msgstr "versió d'índex dolenta '%s'"

8019

7903 -#: builtin/pack-objects.c:2597

8020 +#: builtin/pack-objects.c:2595

8021 #, c-format

8022 msgid "option %s does not accept negative form"

8023 msgstr "l'opció %s no accepta la forma negativa"

8024

7908 -#: builtin/pack-objects.c:2601

8025 +#: builtin/pack-objects.c:2599

8026 #, c-format

8027 msgid "unable to parse value '%s' for option %s"

8028 msgstr "no s'ha pogut analitzar el valor '%s' per a l'opció %s"

8029

7913 -#: builtin/pack-objects.c:2621

8030 +#: builtin/pack-objects.c:2619

8031 msgid "do not show progress meter"

8032 msgstr "no mostris l'indicador de progrés"

8033

7917 -#: builtin/pack-objects.c:2623

8034 +#: builtin/pack-objects.c:2621

8035 msgid "show progress meter"

8036 msgstr "mostra l'indicador de progrés"

8037

7921 -#: builtin/pack-objects.c:2625

8038 +#: builtin/pack-objects.c:2623

8039 msgid "show progress meter during object writing phase"

8040 msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"

8041

7925 -#: builtin/pack-objects.c:2628

8042 +#: builtin/pack-objects.c:2626

8043 msgid "similar to --all-progress when progress meter is shown"

8044 msgstr "similar a --all-progress quan l'indicador de progrés es mostra"

8045

7929 -#: builtin/pack-objects.c:2629

8046 +#: builtin/pack-objects.c:2627

8047 msgid "version[,offset]"

8048 msgstr "versió[,desplaçament]"

8049

7933 -#: builtin/pack-objects.c:2630

8050 +#: builtin/pack-objects.c:2628

8051 msgid "write the pack index file in the specified idx format version"

8052 msgstr ""

8053 "escriu el fitxer d'índex de paquet en la versió de format d'índex "

8054 "especificada"

8055

7939 -#: builtin/pack-objects.c:2633

8056 +#: builtin/pack-objects.c:2631

8057 msgid "maximum size of each output pack file"

8058 msgstr "mida màxima de cada fitxer de paquet de sortida"

8059

7943 -#: builtin/pack-objects.c:2635

8060 +#: builtin/pack-objects.c:2633

8061 msgid "ignore borrowed objects from alternate object store"

8062 msgstr ""

8063 "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"

8064

7948 -#: builtin/pack-objects.c:2637

8065 +#: builtin/pack-objects.c:2635

8066 msgid "ignore packed objects"

8067 msgstr "ignora els objectes empaquetats"

8068

7952 -#: builtin/pack-objects.c:2639

8069 +#: builtin/pack-objects.c:2637

8070 msgid "limit pack window by objects"

8071 msgstr "limita la finestra d'empaquetament per objectes"

8072

7956 -#: builtin/pack-objects.c:2641

8073 +#: builtin/pack-objects.c:2639

8074 msgid "limit pack window by memory in addition to object limit"

8075 msgstr ""

8076 "limita la finestra d'empaquetament per memòria a més del límit d'objectes"

l10n: ca.po: update translation