2b95ebb4fd · matheusbsbs/matheus-bagliano

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

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

11 -"POT-Creation-Date: 2021-03-04 22:41+0800\n"

11 +"POT-Creation-Date: 2021-05-17 16:02+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr ""

25

26 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292

27 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538

28 -#: builtin/rebase.c:1963

26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

27 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

28 +#: builtin/rebase.c:1953

29 msgid "could not read index"

30 msgstr ""

31

@@ -53,7 +53,7 @@ msgstr ""

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

57 msgid "could not write index"

58 msgstr ""

59

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

69 msgid "note: %s is untracked now.\n"

70 msgstr ""

71

72 -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295

72 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

73 #: builtin/reset.c:145

74 #, c-format

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

@@ -209,12 +209,12 @@ msgstr ""

209 msgid "unstaged"

210 msgstr ""

211

212 -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257

213 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

214 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190

215 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

212 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

213 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

214 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

215 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

216 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

217 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

218 #: git-add--interactive.perl:213

219 msgid "path"

220 msgstr ""

@@ -660,66 +660,79 @@ msgstr ""

660 msgid "'git apply' failed"

661 msgstr ""

662

663 -#: advice.c:143

663 +#: advice.c:145

664 #, c-format

665 msgid ""

666 "\n"

667 "Disable this message with \"git config advice.%s false\""

668 msgstr ""

669

670 -#: advice.c:159

670 +#: advice.c:161

671 #, c-format

672 msgid "%shint: %.*s%s\n"

673 msgstr ""

674

675 -#: advice.c:250

675 +#: advice.c:252

676 msgid "Cherry-picking is not possible because you have unmerged files."

677 msgstr ""

678

679 -#: advice.c:252

679 +#: advice.c:254

680 msgid "Committing is not possible because you have unmerged files."

681 msgstr ""

682

683 -#: advice.c:254

683 +#: advice.c:256

684 msgid "Merging is not possible because you have unmerged files."

685 msgstr ""

686

687 -#: advice.c:256

687 +#: advice.c:258

688 msgid "Pulling is not possible because you have unmerged files."

689 msgstr ""

690

691 -#: advice.c:258

691 +#: advice.c:260

692 msgid "Reverting is not possible because you have unmerged files."

693 msgstr ""

694

695 -#: advice.c:260

695 +#: advice.c:262

696 #, c-format

697 msgid "It is not possible to %s because you have unmerged files."

698 msgstr ""

699

700 -#: advice.c:268

700 +#: advice.c:270

701 msgid ""

702 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

703 "as appropriate to mark resolution and make a commit."

704 msgstr ""

705

706 -#: advice.c:276

706 +#: advice.c:278

707 msgid "Exiting because of an unresolved conflict."

708 msgstr ""

709

710 -#: advice.c:281 builtin/merge.c:1370

710 +#: advice.c:283 builtin/merge.c:1374

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

712 msgstr ""

713

714 -#: advice.c:283

714 +#: advice.c:285

715 msgid "Please, commit your changes before merging."

716 msgstr ""

717

718 -#: advice.c:284

718 +#: advice.c:286

719 msgid "Exiting because of unfinished merge."

720 msgstr ""

721

722 -#: advice.c:290

722 +#: advice.c:296

723 +#, c-format

724 +msgid ""

725 +"The following pathspecs didn't match any eligible path, but they do match "

726 +"index\n"

727 +"entries outside the current sparse checkout:\n"

728 +msgstr ""

729 +

730 +#: advice.c:303

731 +msgid ""

732 +"Disable or modify the sparsity rules if you intend to update such entries."

733 +msgstr ""

734 +

735 +#: advice.c:310

736 #, c-format

737 msgid ""

738 "Note: switching to '%s'.\n"

@@ -750,82 +763,78 @@ msgstr ""

763 msgid "unclosed quote"

764 msgstr ""

765

753 -#: apply.c:69

766 +#: apply.c:70

767 #, c-format

768 msgid "unrecognized whitespace option '%s'"

769 msgstr ""

770

758 -#: apply.c:85

771 +#: apply.c:86

772 #, c-format

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

774 msgstr ""

775

763 -#: apply.c:135

776 +#: apply.c:136

777 msgid "--reject and --3way cannot be used together."

778 msgstr ""

779

767 -#: apply.c:137

768 -msgid "--cached and --3way cannot be used together."

769 -msgstr ""

770 -

771 -#: apply.c:140

780 +#: apply.c:139

781 msgid "--3way outside a repository"

782 msgstr ""

783

775 -#: apply.c:151

784 +#: apply.c:150

785 msgid "--index outside a repository"

786 msgstr ""

787

779 -#: apply.c:154

788 +#: apply.c:153

789 msgid "--cached outside a repository"

790 msgstr ""

791

783 -#: apply.c:801

792 +#: apply.c:800

793 #, c-format

794 msgid "Cannot prepare timestamp regexp %s"

795 msgstr ""

796

788 -#: apply.c:810

797 +#: apply.c:809

798 #, c-format

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

800 msgstr ""

801

793 -#: apply.c:884

802 +#: apply.c:883

803 #, c-format

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

805 msgstr ""

806

798 -#: apply.c:922

807 +#: apply.c:921

808 #, c-format

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

810 msgstr ""

811

803 -#: apply.c:928

812 +#: apply.c:927

813 #, c-format

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

815 msgstr ""

816

808 -#: apply.c:929

817 +#: apply.c:928

818 #, c-format

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

820 msgstr ""

821

813 -#: apply.c:934

822 +#: apply.c:933

823 #, c-format

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

825 msgstr ""

826

818 -#: apply.c:963

827 +#: apply.c:962

828 #, c-format

829 msgid "invalid mode on line %d: %s"

830 msgstr ""

831

823 -#: apply.c:1282

832 +#: apply.c:1281

833 #, c-format

834 msgid "inconsistent header lines %d and %d"

835 msgstr ""

836

828 -#: apply.c:1372

837 +#: apply.c:1371

838 #, c-format

839 msgid ""

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

@@ -836,524 +845,530 @@ msgid_plural ""

845 msgstr[0] ""

846 msgstr[1] ""

847

839 -#: apply.c:1385

848 +#: apply.c:1384

849 #, c-format

850 msgid "git diff header lacks filename information (line %d)"

851 msgstr ""

852

844 -#: apply.c:1481

853 +#: apply.c:1480

854 #, c-format

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

856 msgstr ""

857

849 -#: apply.c:1550

858 +#: apply.c:1549

859 #, c-format

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

861 msgstr ""

862

854 -#: apply.c:1753

863 +#: apply.c:1752

864 msgid "new file depends on old contents"

865 msgstr ""

866

858 -#: apply.c:1755

867 +#: apply.c:1754

868 msgid "deleted file still has contents"

869 msgstr ""

870

862 -#: apply.c:1789

871 +#: apply.c:1788

872 #, c-format

873 msgid "corrupt patch at line %d"

874 msgstr ""

875

867 -#: apply.c:1826

876 +#: apply.c:1825

877 #, c-format

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

879 msgstr ""

880

872 -#: apply.c:1828

881 +#: apply.c:1827

882 #, c-format

883 msgid "deleted file %s still has contents"

884 msgstr ""

885

877 -#: apply.c:1831

886 +#: apply.c:1830

887 #, c-format

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

889 msgstr ""

890

882 -#: apply.c:1978

891 +#: apply.c:1977

892 #, c-format

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

894 msgstr ""

895

887 -#: apply.c:2015

896 +#: apply.c:2014

897 #, c-format

898 msgid "unrecognized binary patch at line %d"

899 msgstr ""

900

892 -#: apply.c:2177

901 +#: apply.c:2176

902 #, c-format

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

904 msgstr ""

905

897 -#: apply.c:2263

906 +#: apply.c:2262

907 #, c-format

908 msgid "unable to read symlink %s"

909 msgstr ""

910

902 -#: apply.c:2267

911 +#: apply.c:2266

912 #, c-format

913 msgid "unable to open or read %s"

914 msgstr ""

915

907 -#: apply.c:2936

916 +#: apply.c:2935

917 #, c-format

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

919 msgstr ""

920

912 -#: apply.c:3057

921 +#: apply.c:3056

922 #, c-format

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

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

925 msgstr[0] ""

926 msgstr[1] ""

927

919 -#: apply.c:3069

928 +#: apply.c:3068

929 #, c-format

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

931 msgstr ""

932

924 -#: apply.c:3075

933 +#: apply.c:3074

934 #, c-format

935 msgid ""

936 "while searching for:\n"

937 "%.*s"

938 msgstr ""

939

931 -#: apply.c:3097

940 +#: apply.c:3096

941 #, c-format

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

943 msgstr ""

944

936 -#: apply.c:3105

945 +#: apply.c:3104

946 #, c-format

947 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

948 msgstr ""

949

941 -#: apply.c:3152

950 +#: apply.c:3151

951 #, c-format

952 msgid "cannot apply binary patch to '%s' without full index line"

953 msgstr ""

954

946 -#: apply.c:3163

955 +#: apply.c:3162

956 #, c-format

957 msgid ""

958 "the patch applies to '%s' (%s), which does not match the current contents."

959 msgstr ""

960

952 -#: apply.c:3171

961 +#: apply.c:3170

962 #, c-format

963 msgid "the patch applies to an empty '%s' but it is not empty"

964 msgstr ""

965

957 -#: apply.c:3189

966 +#: apply.c:3188

967 #, c-format

968 msgid "the necessary postimage %s for '%s' cannot be read"

969 msgstr ""

970

962 -#: apply.c:3202

971 +#: apply.c:3201

972 #, c-format

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

974 msgstr ""

975

967 -#: apply.c:3209

976 +#: apply.c:3208

977 #, c-format

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

979 msgstr ""

980

972 -#: apply.c:3230

981 +#: apply.c:3229

982 #, c-format

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

984 msgstr ""

985

977 -#: apply.c:3353

986 +#: apply.c:3352

987 #, c-format

988 msgid "cannot checkout %s"

989 msgstr ""

990

982 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213

991 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

992 #: setup.c:308

993 #, c-format

994 msgid "failed to read %s"

995 msgstr ""

996

988 -#: apply.c:3413

997 +#: apply.c:3412

998 #, c-format

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

1000 msgstr ""

1001

993 -#: apply.c:3442 apply.c:3685

1002 +#: apply.c:3441 apply.c:3687

1003 #, c-format

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

1005 msgstr ""

1006

998 -#: apply.c:3528 apply.c:3700

1007 +#: apply.c:3527 apply.c:3702

1008 #, c-format

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

1010 msgstr ""

1011

1003 -#: apply.c:3537 apply.c:3708 apply.c:3952

1012 +#: apply.c:3536 apply.c:3710 apply.c:3954

1013 #, c-format

1014 msgid "%s: does not match index"

1015 msgstr ""

1016

1008 -#: apply.c:3572

1009 -msgid "repository lacks the necessary blob to fall back on 3-way merge."

1017 +#: apply.c:3571

1018 +msgid "repository lacks the necessary blob to perform 3-way merge."

1019 msgstr ""

1020

1012 -#: apply.c:3575

1021 +#: apply.c:3574

1022 #, c-format

1014 -msgid "Falling back to three-way merge...\n"

1023 +msgid "Performing three-way merge...\n"

1024 msgstr ""

1025

1017 -#: apply.c:3591 apply.c:3595

1026 +#: apply.c:3590 apply.c:3594

1027 #, c-format

1028 msgid "cannot read the current contents of '%s'"

1029 msgstr ""

1030

1022 -#: apply.c:3607

1031 +#: apply.c:3606

1032 #, c-format

1024 -msgid "Failed to fall back on three-way merge...\n"

1033 +msgid "Failed to perform three-way merge...\n"

1034 msgstr ""

1035

1027 -#: apply.c:3621

1036 +#: apply.c:3620

1037 #, c-format

1038 msgid "Applied patch to '%s' with conflicts.\n"

1039 msgstr ""

1040

1032 -#: apply.c:3626

1041 +#: apply.c:3625

1042 #, c-format

1043 msgid "Applied patch to '%s' cleanly.\n"

1044 msgstr ""

1045

1037 -#: apply.c:3652

1046 +#: apply.c:3642

1047 +#, c-format

1048 +msgid "Falling back to direct application...\n"

1049 +msgstr ""

1050 +

1051 +#: apply.c:3654

1052 msgid "removal patch leaves file contents"

1053 msgstr ""

1054

1041 -#: apply.c:3725

1055 +#: apply.c:3727

1056 #, c-format

1057 msgid "%s: wrong type"

1058 msgstr ""

1059

1046 -#: apply.c:3727

1060 +#: apply.c:3729

1061 #, c-format

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

1063 msgstr ""

1064

1051 -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1052 -#: read-cache.c:1313

1065 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1066 +#: read-cache.c:1351

1067 #, c-format

1068 msgid "invalid path '%s'"

1069 msgstr ""

1070

1057 -#: apply.c:3950

1071 +#: apply.c:3952

1072 #, c-format

1073 msgid "%s: already exists in index"

1074 msgstr ""

1075

1062 -#: apply.c:3954

1076 +#: apply.c:3956

1077 #, c-format

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

1079 msgstr ""

1080

1067 -#: apply.c:3974

1081 +#: apply.c:3976

1082 #, c-format

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

1084 msgstr ""

1085

1072 -#: apply.c:3979

1086 +#: apply.c:3981

1087 #, c-format

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

1089 msgstr ""

1090

1077 -#: apply.c:3999

1091 +#: apply.c:4001

1092 #, c-format

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

1094 msgstr ""

1095

1082 -#: apply.c:4003

1096 +#: apply.c:4005

1097 #, c-format

1098 msgid "%s: patch does not apply"

1099 msgstr ""

1100

1087 -#: apply.c:4018

1101 +#: apply.c:4020

1102 #, c-format

1103 msgid "Checking patch %s..."

1104 msgstr ""

1105

1092 -#: apply.c:4110

1106 +#: apply.c:4112

1107 #, c-format

1108 msgid "sha1 information is lacking or useless for submodule %s"

1109 msgstr ""

1110

1097 -#: apply.c:4117

1111 +#: apply.c:4119

1112 #, c-format

1113 msgid "mode change for %s, which is not in current HEAD"

1114 msgstr ""

1115

1102 -#: apply.c:4120

1116 +#: apply.c:4122

1117 #, c-format

1118 msgid "sha1 information is lacking or useless (%s)."

1119 msgstr ""

1120

1107 -#: apply.c:4129

1121 +#: apply.c:4131

1122 #, c-format

1123 msgid "could not add %s to temporary index"

1124 msgstr ""

1125

1112 -#: apply.c:4139

1126 +#: apply.c:4141

1127 #, c-format

1128 msgid "could not write temporary index to %s"

1129 msgstr ""

1130

1117 -#: apply.c:4277

1131 +#: apply.c:4279

1132 #, c-format

1133 msgid "unable to remove %s from index"

1134 msgstr ""

1135

1122 -#: apply.c:4311

1136 +#: apply.c:4313

1137 #, c-format

1138 msgid "corrupt patch for submodule %s"

1139 msgstr ""

1140

1127 -#: apply.c:4317

1141 +#: apply.c:4319

1142 #, c-format

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

1144 msgstr ""

1145

1132 -#: apply.c:4325

1146 +#: apply.c:4327

1147 #, c-format

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

1149 msgstr ""

1150

1137 -#: apply.c:4331 apply.c:4476

1151 +#: apply.c:4333 apply.c:4478

1152 #, c-format

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

1154 msgstr ""

1155

1142 -#: apply.c:4374 builtin/bisect--helper.c:523

1156 +#: apply.c:4376 builtin/bisect--helper.c:523

1157 #, c-format

1158 msgid "failed to write to '%s'"

1159 msgstr ""

1160

1147 -#: apply.c:4378

1161 +#: apply.c:4380

1162 #, c-format

1163 msgid "closing file '%s'"

1164 msgstr ""

1165

1152 -#: apply.c:4448

1166 +#: apply.c:4450

1167 #, c-format

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

1169 msgstr ""

1170

1157 -#: apply.c:4546

1171 +#: apply.c:4548

1172 #, c-format

1173 msgid "Applied patch %s cleanly."

1174 msgstr ""

1175

1162 -#: apply.c:4554

1176 +#: apply.c:4556

1177 msgid "internal error"

1178 msgstr ""

1179

1166 -#: apply.c:4557

1180 +#: apply.c:4559

1181 #, c-format

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

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

1184 msgstr[0] ""

1185 msgstr[1] ""

1186

1173 -#: apply.c:4568

1187 +#: apply.c:4570

1188 #, c-format

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

1190 msgstr ""

1191

1178 -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334

1192 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1193 #, c-format

1194 msgid "cannot open %s"

1195 msgstr ""

1196

1183 -#: apply.c:4590

1197 +#: apply.c:4592

1198 #, c-format

1199 msgid "Hunk #%d applied cleanly."

1200 msgstr ""

1201

1188 -#: apply.c:4594

1202 +#: apply.c:4596

1203 #, c-format

1204 msgid "Rejected hunk #%d."

1205 msgstr ""

1206

1193 -#: apply.c:4718

1207 +#: apply.c:4725

1208 #, c-format

1209 msgid "Skipped patch '%s'."

1210 msgstr ""

1211

1198 -#: apply.c:4726

1212 +#: apply.c:4733

1213 msgid "unrecognized input"

1214 msgstr ""

1215

1202 -#: apply.c:4746

1216 +#: apply.c:4753

1217 msgid "unable to read index file"

1218 msgstr ""

1219

1206 -#: apply.c:4903

1220 +#: apply.c:4910

1221 #, c-format

1222 msgid "can't open patch '%s': %s"

1223 msgstr ""

1224

1211 -#: apply.c:4930

1225 +#: apply.c:4937

1226 #, c-format

1227 msgid "squelched %d whitespace error"

1228 msgid_plural "squelched %d whitespace errors"

1229 msgstr[0] ""

1230 msgstr[1] ""

1231

1218 -#: apply.c:4936 apply.c:4951

1232 +#: apply.c:4943 apply.c:4958

1233 #, c-format

1234 msgid "%d line adds whitespace errors."

1235 msgid_plural "%d lines add whitespace errors."

1236 msgstr[0] ""

1237 msgstr[1] ""

1238

1225 -#: apply.c:4944

1239 +#: apply.c:4951

1240 #, c-format

1241 msgid "%d line applied after fixing whitespace errors."

1242 msgid_plural "%d lines applied after fixing whitespace errors."

1243 msgstr[0] ""

1244 msgstr[1] ""

1245

1232 -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406

1246 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1247 msgid "Unable to write new index file"

1248 msgstr ""

1249

1236 -#: apply.c:4988

1250 +#: apply.c:4995

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

1252 msgstr ""

1253

1240 -#: apply.c:4991

1254 +#: apply.c:4998

1255 msgid "apply changes matching the given path"

1256 msgstr ""

1257

1244 -#: apply.c:4993 builtin/am.c:2266

1258 +#: apply.c:5000 builtin/am.c:2317

1259 msgid "num"

1260 msgstr ""

1261

1248 -#: apply.c:4994

1262 +#: apply.c:5001

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

1264 msgstr ""

1265

1252 -#: apply.c:4997

1266 +#: apply.c:5004

1267 msgid "ignore additions made by the patch"

1268 msgstr ""

1269

1256 -#: apply.c:4999

1270 +#: apply.c:5006

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

1272 msgstr ""

1273

1260 -#: apply.c:5003

1274 +#: apply.c:5010

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

1276 msgstr ""

1277

1264 -#: apply.c:5005

1278 +#: apply.c:5012

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

1280 msgstr ""

1281

1268 -#: apply.c:5007

1282 +#: apply.c:5014

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

1284 msgstr ""

1285

1272 -#: apply.c:5009

1286 +#: apply.c:5016

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

1288 msgstr ""

1289

1276 -#: apply.c:5011

1290 +#: apply.c:5018

1291 msgid "mark new files with `git add --intent-to-add`"

1292 msgstr ""

1293

1280 -#: apply.c:5013

1294 +#: apply.c:5020

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

1296 msgstr ""

1297

1284 -#: apply.c:5015

1298 +#: apply.c:5022

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

1300 msgstr ""

1301

1288 -#: apply.c:5018

1302 +#: apply.c:5025

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

1304 msgstr ""

1305

1292 -#: apply.c:5020

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

1306 +#: apply.c:5027

1307 +msgid "attempt three-way merge, fall back on normal patch if that fails"

1308 msgstr ""

1309

1296 -#: apply.c:5022

1310 +#: apply.c:5029

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

1312 msgstr ""

1313

1300 -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540

1314 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1315 msgid "paths are separated with NUL character"

1316 msgstr ""

1317

1304 -#: apply.c:5027

1318 +#: apply.c:5034

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

1320 msgstr ""

1321

1308 -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98

1309 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1310 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352

1322 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1323 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1324 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1325 +#: builtin/rebase.c:1347

1326 msgid "action"

1327 msgstr ""

1328

1314 -#: apply.c:5029

1329 +#: apply.c:5036

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

1331 msgstr ""

1332

1318 -#: apply.c:5032 apply.c:5035

1333 +#: apply.c:5039 apply.c:5042

1334 msgid "ignore changes in whitespace when finding context"

1335 msgstr ""

1336

1322 -#: apply.c:5038

1337 +#: apply.c:5045

1338 msgid "apply the patch in reverse"

1339 msgstr ""

1340

1326 -#: apply.c:5040

1341 +#: apply.c:5047

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

1343 msgstr ""

1344

1330 -#: apply.c:5042

1345 +#: apply.c:5049

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

1347 msgstr ""

1348

1334 -#: apply.c:5044

1349 +#: apply.c:5051

1350 msgid "allow overlapping hunks"

1351 msgstr ""

1352

1338 -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22

1339 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757

1340 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128

1353 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1354 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1355 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1356 msgid "be verbose"

1357 msgstr ""

1358

1344 -#: apply.c:5047

1359 +#: apply.c:5054

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

1361 msgstr ""

1362

1348 -#: apply.c:5050

1363 +#: apply.c:5057

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

1365 msgstr ""

1366

1352 -#: apply.c:5052 builtin/am.c:2254

1367 +#: apply.c:5059 builtin/am.c:2305

1368 msgid "root"

1369 msgstr ""

1370

1356 -#: apply.c:5053

1371 +#: apply.c:5060

1372 msgid "prepend <root> to all filenames"

1373 msgstr ""

1374

@@ -1418,141 +1433,141 @@ msgstr ""

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

1434 msgstr ""

1435

1421 -#: archive.c:192

1436 +#: archive.c:188

1437 #, c-format

1438 msgid "cannot read %s"

1439 msgstr ""

1440

1426 -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894

1427 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786

1428 -#: builtin/merge.c:1139

1441 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1442 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1443 +#: builtin/merge.c:1143

1444 #, c-format

1445 msgid "could not read '%s'"

1446 msgstr ""

1447

1433 -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315

1448 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1449 #, c-format

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

1451 msgstr ""

1452

1438 -#: archive.c:454

1453 +#: archive.c:451

1454 #, c-format

1455 msgid "no such ref: %.*s"

1456 msgstr ""

1457

1443 -#: archive.c:460

1458 +#: archive.c:457

1459 #, c-format

1460 msgid "not a valid object name: %s"

1461 msgstr ""

1462

1448 -#: archive.c:473

1463 +#: archive.c:470

1464 #, c-format

1465 msgid "not a tree object: %s"

1466 msgstr ""

1467

1453 -#: archive.c:485

1468 +#: archive.c:482

1469 msgid "current working directory is untracked"

1470 msgstr ""

1471

1457 -#: archive.c:526

1472 +#: archive.c:523

1473 #, c-format

1474 msgid "File not found: %s"

1475 msgstr ""

1476

1462 -#: archive.c:528

1477 +#: archive.c:525

1478 #, c-format

1479 msgid "Not a regular file: %s"

1480 msgstr ""

1481

1467 -#: archive.c:555

1482 +#: archive.c:552

1483 msgid "fmt"

1484 msgstr ""

1485

1471 -#: archive.c:555

1486 +#: archive.c:552

1487 msgid "archive format"

1488 msgstr ""

1489

1475 -#: archive.c:556 builtin/log.c:1764

1490 +#: archive.c:553 builtin/log.c:1772

1491 msgid "prefix"

1492 msgstr ""

1493

1479 -#: archive.c:557

1494 +#: archive.c:554

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

1496 msgstr ""

1497

1483 -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888

1498 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1499 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1500 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1486 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105

1487 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412

1488 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1501 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1502 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1503 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1504 msgid "file"

1505 msgstr ""

1506

1492 -#: archive.c:559

1507 +#: archive.c:556

1508 msgid "add untracked file to archive"

1509 msgstr ""

1510

1496 -#: archive.c:562 builtin/archive.c:90

1511 +#: archive.c:559 builtin/archive.c:90

1512 msgid "write the archive to this file"

1513 msgstr ""

1514

1500 -#: archive.c:564

1515 +#: archive.c:561

1516 msgid "read .gitattributes in working directory"

1517 msgstr ""

1518

1504 -#: archive.c:565

1519 +#: archive.c:562

1520 msgid "report archived files on stderr"

1521 msgstr ""

1522

1508 -#: archive.c:567

1523 +#: archive.c:564

1524 msgid "set compression level"

1525 msgstr ""

1526

1512 -#: archive.c:570

1527 +#: archive.c:567

1528 msgid "list supported archive formats"

1529 msgstr ""

1530

1516 -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1517 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1531 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1532 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1533 msgid "repo"

1534 msgstr ""

1535

1521 -#: archive.c:573 builtin/archive.c:92

1536 +#: archive.c:570 builtin/archive.c:92

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

1538 msgstr ""

1539

1525 -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1540 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1541 #: builtin/notes.c:498

1542 msgid "command"

1543 msgstr ""

1544

1530 -#: archive.c:575 builtin/archive.c:94

1545 +#: archive.c:572 builtin/archive.c:94

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

1547 msgstr ""

1548

1534 -#: archive.c:582

1549 +#: archive.c:579

1550 msgid "Unexpected option --remote"

1551 msgstr ""

1552

1538 -#: archive.c:584

1553 +#: archive.c:581

1554 msgid "Option --exec can only be used together with --remote"

1555 msgstr ""

1556

1542 -#: archive.c:586

1557 +#: archive.c:583

1558 msgid "Unexpected option --output"

1559 msgstr ""

1560

1546 -#: archive.c:588

1561 +#: archive.c:585

1562 msgid "Options --add-file and --remote cannot be used together"

1563 msgstr ""

1564

1550 -#: archive.c:610

1565 +#: archive.c:607

1566 #, c-format

1567 msgid "Unknown archive format '%s'"

1568 msgstr ""

1569

1555 -#: archive.c:619

1570 +#: archive.c:616

1571 #, c-format

1572 msgid "Argument not supported for format '%s': -%d"

1573 msgstr ""

@@ -1562,12 +1577,12 @@ msgstr ""

1577 msgid "%.*s is not a valid attribute name"

1578 msgstr ""

1579

1565 -#: attr.c:359

1580 +#: attr.c:363

1581 #, c-format

1582 msgid "%s not allowed: %s:%d"

1583 msgstr ""

1584

1570 -#: attr.c:399

1585 +#: attr.c:403

1586 msgid ""

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

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

@@ -1635,7 +1650,7 @@ msgstr ""

1650 msgid "a %s revision is needed"

1651 msgstr ""

1652

1638 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287

1653 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1654 #, c-format

1655 msgid "could not create file '%s'"

1656 msgstr ""

@@ -1678,37 +1693,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1693 msgstr[0] ""

1694 msgstr[1] ""

1695

1681 -#: blame.c:2777

1696 +#: blame.c:2776

1697 msgid "--contents and --reverse do not blend well."

1698 msgstr ""

1699

1685 -#: blame.c:2791

1700 +#: blame.c:2790

1701 msgid "cannot use --contents with final commit object name"

1702 msgstr ""

1703

1689 -#: blame.c:2812

1704 +#: blame.c:2811

1705 msgid "--reverse and --first-parent together require specified latest commit"

1706 msgstr ""

1707

1693 -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146

1694 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411

1695 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335

1696 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410

1697 -#: builtin/shortlog.c:255

1708 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

1709 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

1710 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

1711 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

1712 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

1713 msgid "revision walk setup failed"

1714 msgstr ""

1715

1701 -#: blame.c:2839

1716 +#: blame.c:2838

1717 msgid ""

1718 "--reverse --first-parent together require range along first-parent chain"

1719 msgstr ""

1720

1706 -#: blame.c:2850

1721 +#: blame.c:2849

1722 #, c-format

1723 msgid "no such path %s in %s"

1724 msgstr ""

1725

1711 -#: blame.c:2861

1726 +#: blame.c:2860

1727 #, c-format

1728 msgid "cannot read blob %s for path %s"

1729 msgstr ""

@@ -1827,12 +1842,12 @@ msgstr ""

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

1843 msgstr ""

1844

1830 -#: branch.c:365

1845 +#: branch.c:366

1846 #, c-format

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

1848 msgstr ""

1849

1835 -#: branch.c:388

1850 +#: branch.c:389

1851 #, c-format

1852 msgid "HEAD of working tree %s is not updated"

1853 msgstr ""

@@ -1857,8 +1872,8 @@ msgstr ""

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

1873 msgstr ""

1874

1860 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184

1861 -#: builtin/commit.c:814

1875 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1876 +#: builtin/commit.c:861

1877 #, c-format

1878 msgid "could not open '%s'"

1879 msgstr ""

@@ -1916,7 +1931,7 @@ msgstr ""

1931 msgid "cannot write bundle version %d with algorithm %s"

1932 msgstr ""

1933

1919 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396

1934 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

1935 #, c-format

1936 msgid "unrecognized argument: %s"

1937 msgstr ""

@@ -1958,252 +1973,252 @@ msgstr ""

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

1974 msgstr ""

1975

1961 -#: commit-graph.c:197 midx.c:46

1976 +#: commit-graph.c:204 midx.c:47

1977 msgid "invalid hash version"

1978 msgstr ""

1979

1965 -#: commit-graph.c:255

1980 +#: commit-graph.c:262

1981 msgid "commit-graph file is too small"

1982 msgstr ""

1983

1969 -#: commit-graph.c:348

1984 +#: commit-graph.c:355

1985 #, c-format

1986 msgid "commit-graph signature %X does not match signature %X"

1987 msgstr ""

1988

1974 -#: commit-graph.c:355

1989 +#: commit-graph.c:362

1990 #, c-format

1991 msgid "commit-graph version %X does not match version %X"

1992 msgstr ""

1993

1979 -#: commit-graph.c:362

1994 +#: commit-graph.c:369

1995 #, c-format

1996 msgid "commit-graph hash version %X does not match version %X"

1997 msgstr ""

1998

1984 -#: commit-graph.c:379

1999 +#: commit-graph.c:386

2000 #, c-format

2001 msgid "commit-graph file is too small to hold %u chunks"

2002 msgstr ""

2003

1989 -#: commit-graph.c:472

2004 +#: commit-graph.c:482

2005 msgid "commit-graph has no base graphs chunk"

2006 msgstr ""

2007

1993 -#: commit-graph.c:482

2008 +#: commit-graph.c:492

2009 msgid "commit-graph chain does not match"

2010 msgstr ""

2011

1997 -#: commit-graph.c:530

2012 +#: commit-graph.c:540

2013 #, c-format

2014 msgid "invalid commit-graph chain: line '%s' not a hash"

2015 msgstr ""

2016

2002 -#: commit-graph.c:554

2017 +#: commit-graph.c:564

2018 msgid "unable to find all commit-graph files"

2019 msgstr ""

2020

2006 -#: commit-graph.c:735 commit-graph.c:772

2021 +#: commit-graph.c:745 commit-graph.c:782

2022 msgid "invalid commit position. commit-graph is likely corrupt"

2023 msgstr ""

2024

2010 -#: commit-graph.c:756

2025 +#: commit-graph.c:766

2026 #, c-format

2027 msgid "could not find commit %s"

2028 msgstr ""

2029

2015 -#: commit-graph.c:789

2030 +#: commit-graph.c:799

2031 msgid "commit-graph requires overflow generation data but has none"

2032 msgstr ""

2033

2019 -#: commit-graph.c:1065 builtin/am.c:1292

2034 +#: commit-graph.c:1075 builtin/am.c:1340

2035 #, c-format

2036 msgid "unable to parse commit %s"

2037 msgstr ""

2038

2024 -#: commit-graph.c:1327 builtin/pack-objects.c:2872

2039 +#: commit-graph.c:1337 builtin/pack-objects.c:2897

2040 #, c-format

2041 msgid "unable to get type of object %s"

2042 msgstr ""

2043

2029 -#: commit-graph.c:1358

2044 +#: commit-graph.c:1368

2045 msgid "Loading known commits in commit graph"

2046 msgstr ""

2047

2033 -#: commit-graph.c:1375

2048 +#: commit-graph.c:1385

2049 msgid "Expanding reachable commits in commit graph"

2050 msgstr ""

2051

2037 -#: commit-graph.c:1395

2052 +#: commit-graph.c:1405

2053 msgid "Clearing commit marks in commit graph"

2054 msgstr ""

2055

2041 -#: commit-graph.c:1414

2056 +#: commit-graph.c:1424

2057 msgid "Computing commit graph topological levels"

2058 msgstr ""

2059

2045 -#: commit-graph.c:1467

2060 +#: commit-graph.c:1477

2061 msgid "Computing commit graph generation numbers"

2062 msgstr ""

2063

2049 -#: commit-graph.c:1548

2064 +#: commit-graph.c:1558

2065 msgid "Computing commit changed paths Bloom filters"

2066 msgstr ""

2067

2053 -#: commit-graph.c:1625

2068 +#: commit-graph.c:1635

2069 msgid "Collecting referenced commits"

2070 msgstr ""

2071

2057 -#: commit-graph.c:1650

2072 +#: commit-graph.c:1660

2073 #, c-format

2074 msgid "Finding commits for commit graph in %d pack"

2075 msgid_plural "Finding commits for commit graph in %d packs"

2076 msgstr[0] ""

2077 msgstr[1] ""

2078

2064 -#: commit-graph.c:1663

2079 +#: commit-graph.c:1673

2080 #, c-format

2081 msgid "error adding pack %s"

2082 msgstr ""

2083

2069 -#: commit-graph.c:1667

2084 +#: commit-graph.c:1677

2085 #, c-format

2086 msgid "error opening index for %s"

2087 msgstr ""

2088

2074 -#: commit-graph.c:1704

2089 +#: commit-graph.c:1714

2090 msgid "Finding commits for commit graph among packed objects"

2091 msgstr ""

2092

2078 -#: commit-graph.c:1722

2093 +#: commit-graph.c:1732

2094 msgid "Finding extra edges in commit graph"

2095 msgstr ""

2096

2082 -#: commit-graph.c:1771

2097 +#: commit-graph.c:1781

2098 msgid "failed to write correct number of base graph ids"

2099 msgstr ""

2100

2086 -#: commit-graph.c:1802 midx.c:794

2101 +#: commit-graph.c:1812 midx.c:906

2102 #, c-format

2103 msgid "unable to create leading directories of %s"

2104 msgstr ""

2105

2091 -#: commit-graph.c:1815

2106 +#: commit-graph.c:1825

2107 msgid "unable to create temporary graph layer"

2108 msgstr ""

2109

2095 -#: commit-graph.c:1820

2110 +#: commit-graph.c:1830

2111 #, c-format

2112 msgid "unable to adjust shared permissions for '%s'"

2113 msgstr ""

2114

2100 -#: commit-graph.c:1879

2115 +#: commit-graph.c:1887

2116 #, c-format

2117 msgid "Writing out commit graph in %d pass"

2118 msgid_plural "Writing out commit graph in %d passes"

2119 msgstr[0] ""

2120 msgstr[1] ""

2121

2107 -#: commit-graph.c:1915

2122 +#: commit-graph.c:1923

2123 msgid "unable to open commit-graph chain file"

2124 msgstr ""

2125

2111 -#: commit-graph.c:1931

2126 +#: commit-graph.c:1939

2127 msgid "failed to rename base commit-graph file"

2128 msgstr ""

2129

2115 -#: commit-graph.c:1951

2130 +#: commit-graph.c:1959

2131 msgid "failed to rename temporary commit-graph file"

2132 msgstr ""

2133

2119 -#: commit-graph.c:2084

2134 +#: commit-graph.c:2092

2135 msgid "Scanning merged commits"

2136 msgstr ""

2137

2123 -#: commit-graph.c:2128

2138 +#: commit-graph.c:2136

2139 msgid "Merging commit-graph"

2140 msgstr ""

2141

2127 -#: commit-graph.c:2235

2142 +#: commit-graph.c:2244

2143 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2144 msgstr ""

2145

2131 -#: commit-graph.c:2342

2146 +#: commit-graph.c:2351

2147 msgid "too many commits to write graph"

2148 msgstr ""

2149

2135 -#: commit-graph.c:2440

2150 +#: commit-graph.c:2450

2151 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2152 msgstr ""

2153

2139 -#: commit-graph.c:2450

2154 +#: commit-graph.c:2460

2155 #, c-format

2156 msgid "commit-graph has incorrect OID order: %s then %s"

2157 msgstr ""

2158

2144 -#: commit-graph.c:2460 commit-graph.c:2475

2159 +#: commit-graph.c:2470 commit-graph.c:2485

2160 #, c-format

2161 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2162 msgstr ""

2163

2149 -#: commit-graph.c:2467

2164 +#: commit-graph.c:2477

2165 #, c-format

2166 msgid "failed to parse commit %s from commit-graph"

2167 msgstr ""

2168

2154 -#: commit-graph.c:2485

2169 +#: commit-graph.c:2495

2170 msgid "Verifying commits in commit graph"

2171 msgstr ""

2172

2158 -#: commit-graph.c:2500

2173 +#: commit-graph.c:2510

2174 #, c-format

2175 msgid "failed to parse commit %s from object database for commit-graph"

2176 msgstr ""

2177

2163 -#: commit-graph.c:2507

2178 +#: commit-graph.c:2517

2179 #, c-format

2180 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2181 msgstr ""

2182

2168 -#: commit-graph.c:2517

2183 +#: commit-graph.c:2527

2184 #, c-format

2185 msgid "commit-graph parent list for commit %s is too long"

2186 msgstr ""

2187

2173 -#: commit-graph.c:2526

2188 +#: commit-graph.c:2536

2189 #, c-format

2190 msgid "commit-graph parent for %s is %s != %s"

2191 msgstr ""

2192

2178 -#: commit-graph.c:2540

2193 +#: commit-graph.c:2550

2194 #, c-format

2195 msgid "commit-graph parent list for commit %s terminates early"

2196 msgstr ""

2197

2183 -#: commit-graph.c:2545

2198 +#: commit-graph.c:2555

2199 #, c-format

2200 msgid ""

2201 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2202 msgstr ""

2203

2189 -#: commit-graph.c:2549

2204 +#: commit-graph.c:2559

2205 #, c-format

2206 msgid ""

2207 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2208 msgstr ""

2209

2195 -#: commit-graph.c:2566

2210 +#: commit-graph.c:2576

2211 #, c-format

2212 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2213 msgstr ""

2214

2200 -#: commit-graph.c:2572

2215 +#: commit-graph.c:2582

2216 #, c-format

2217 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2218 msgstr ""

2219

2205 -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403

2206 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2220 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2221 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2222 #, c-format

2223 msgid "could not parse %s"

2224 msgstr ""

@@ -2225,27 +2240,27 @@ msgid ""

2240 "\"git config advice.graftFileDeprecated false\""

2241 msgstr ""

2242

2228 -#: commit.c:1223

2243 +#: commit.c:1237

2244 #, c-format

2245 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2246 msgstr ""

2247

2233 -#: commit.c:1227

2248 +#: commit.c:1241

2249 #, c-format

2250 msgid "Commit %s has a bad GPG signature allegedly by %s."

2251 msgstr ""

2252

2238 -#: commit.c:1230

2253 +#: commit.c:1244

2254 #, c-format

2255 msgid "Commit %s does not have a GPG signature."

2256 msgstr ""

2257

2243 -#: commit.c:1233

2258 +#: commit.c:1247

2259 #, c-format

2260 msgid "Commit %s has a good GPG signature by %s\n"

2261 msgstr ""

2262

2248 -#: commit.c:1487

2263 +#: commit.c:1501

2264 msgid ""

2265 "Warning: commit message did not conform to UTF-8.\n"

2266 "You may want to amend it after fixing the message, or set the config\n"

@@ -2304,7 +2319,7 @@ msgstr ""

2319 msgid "key does not contain variable name: %s"

2320 msgstr ""

2321

2307 -#: config.c:472 sequencer.c:2588

2322 +#: config.c:472 sequencer.c:2785

2323 #, c-format

2324 msgid "invalid key: %s"

2325 msgstr ""

@@ -2421,70 +2436,70 @@ msgstr ""

2436 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2437 msgstr ""

2438

2424 -#: config.c:1194

2439 +#: config.c:1257

2440 #, c-format

2441 msgid "bad boolean config value '%s' for '%s'"

2442 msgstr ""

2443

2429 -#: config.c:1289

2444 +#: config.c:1275

2445 #, c-format

2446 msgid "failed to expand user dir in: '%s'"

2447 msgstr ""

2448

2434 -#: config.c:1298

2449 +#: config.c:1284

2450 #, c-format

2451 msgid "'%s' for '%s' is not a valid timestamp"

2452 msgstr ""

2453

2439 -#: config.c:1391

2454 +#: config.c:1377

2455 #, c-format

2456 msgid "abbrev length out of range: %d"

2457 msgstr ""

2458

2444 -#: config.c:1405 config.c:1416

2459 +#: config.c:1391 config.c:1402

2460 #, c-format

2461 msgid "bad zlib compression level %d"

2462 msgstr ""

2463

2449 -#: config.c:1508

2464 +#: config.c:1494

2465 msgid "core.commentChar should only be one character"

2466 msgstr ""

2467

2453 -#: config.c:1541

2468 +#: config.c:1527

2469 #, c-format

2470 msgid "invalid mode for object creation: %s"

2471 msgstr ""

2472

2458 -#: config.c:1613

2473 +#: config.c:1599

2474 #, c-format

2475 msgid "malformed value for %s"

2476 msgstr ""

2477

2463 -#: config.c:1639

2478 +#: config.c:1625

2479 #, c-format

2480 msgid "malformed value for %s: %s"

2481 msgstr ""

2482

2468 -#: config.c:1640

2483 +#: config.c:1626

2484 msgid "must be one of nothing, matching, simple, upstream or current"

2485 msgstr ""

2486

2472 -#: config.c:1701 builtin/pack-objects.c:3666

2487 +#: config.c:1687 builtin/pack-objects.c:3924

2488 #, c-format

2489 msgid "bad pack compression level %d"

2490 msgstr ""

2491

2477 -#: config.c:1823

2492 +#: config.c:1809

2493 #, c-format

2494 msgid "unable to load config blob object '%s'"

2495 msgstr ""

2496

2482 -#: config.c:1826

2497 +#: config.c:1812

2498 #, c-format

2499 msgid "reference '%s' does not point to a blob"

2500 msgstr ""

2501

2487 -#: config.c:1843

2502 +#: config.c:1829

2503 #, c-format

2504 msgid "unable to resolve config blob '%s'"

2505 msgstr ""

@@ -2494,105 +2509,105 @@ msgstr ""

2509 msgid "failed to parse %s"

2510 msgstr ""

2511

2497 -#: config.c:1927

2512 +#: config.c:1929

2513 msgid "unable to parse command-line config"

2514 msgstr ""

2515

2501 -#: config.c:2290

2516 +#: config.c:2293

2517 msgid "unknown error occurred while reading the configuration files"

2518 msgstr ""

2519

2505 -#: config.c:2464

2520 +#: config.c:2467

2521 #, c-format

2522 msgid "Invalid %s: '%s'"

2523 msgstr ""

2524

2510 -#: config.c:2509

2525 +#: config.c:2512

2526 #, c-format

2527 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2528 msgstr ""

2529

2515 -#: config.c:2555

2530 +#: config.c:2558

2531 #, c-format

2532 msgid "unable to parse '%s' from command-line config"

2533 msgstr ""

2534

2520 -#: config.c:2557

2535 +#: config.c:2560

2536 #, c-format

2537 msgid "bad config variable '%s' in file '%s' at line %d"

2538 msgstr ""

2539

2525 -#: config.c:2641

2540 +#: config.c:2644

2541 #, c-format

2542 msgid "invalid section name '%s'"

2543 msgstr ""

2544

2530 -#: config.c:2673

2545 +#: config.c:2676

2546 #, c-format

2547 msgid "%s has multiple values"

2548 msgstr ""

2549

2535 -#: config.c:2702

2550 +#: config.c:2705

2551 #, c-format

2552 msgid "failed to write new configuration file %s"

2553 msgstr ""

2554

2540 -#: config.c:2954 config.c:3280

2555 +#: config.c:2957 config.c:3283

2556 #, c-format

2557 msgid "could not lock config file %s"

2558 msgstr ""

2559

2545 -#: config.c:2965

2560 +#: config.c:2968

2561 #, c-format

2562 msgid "opening %s"

2563 msgstr ""

2564

2550 -#: config.c:3002 builtin/config.c:361

2565 +#: config.c:3005 builtin/config.c:361

2566 #, c-format

2567 msgid "invalid pattern: %s"

2568 msgstr ""

2569

2555 -#: config.c:3027

2570 +#: config.c:3030

2571 #, c-format

2572 msgid "invalid config file %s"

2573 msgstr ""

2574

2560 -#: config.c:3040 config.c:3293

2575 +#: config.c:3043 config.c:3296

2576 #, c-format

2577 msgid "fstat on %s failed"

2578 msgstr ""

2579

2565 -#: config.c:3051

2580 +#: config.c:3054

2581 #, c-format

2582 msgid "unable to mmap '%s'"

2583 msgstr ""

2584

2570 -#: config.c:3060 config.c:3298

2585 +#: config.c:3063 config.c:3301

2586 #, c-format

2587 msgid "chmod on %s failed"

2588 msgstr ""

2589

2575 -#: config.c:3145 config.c:3395

2590 +#: config.c:3148 config.c:3398

2591 #, c-format

2592 msgid "could not write config file %s"

2593 msgstr ""

2594

2580 -#: config.c:3179

2595 +#: config.c:3182

2596 #, c-format

2597 msgid "could not set '%s' to '%s'"

2598 msgstr ""

2599

2585 -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2600 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2601 #, c-format

2602 msgid "could not unset '%s'"

2603 msgstr ""

2604

2590 -#: config.c:3271

2605 +#: config.c:3274

2606 #, c-format

2607 msgid "invalid section name: %s"

2608 msgstr ""

2609

2595 -#: config.c:3438

2610 +#: config.c:3441

2611 #, c-format

2612 msgid "missing value for '%s'"

2613 msgstr ""

@@ -2761,7 +2776,7 @@ msgstr ""

2776 msgid "unable to fork"

2777 msgstr ""

2778

2764 -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45

2779 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

2780 msgid "Checking connectivity"

2781 msgstr ""

2782

@@ -2777,119 +2792,119 @@ msgstr ""

2792 msgid "failed to close rev-list's stdin"

2793 msgstr ""

2794

2780 -#: convert.c:194

2795 +#: convert.c:183

2796 #, c-format

2797 msgid "illegal crlf_action %d"

2798 msgstr ""

2799

2785 -#: convert.c:207

2800 +#: convert.c:196

2801 #, c-format

2802 msgid "CRLF would be replaced by LF in %s"

2803 msgstr ""

2804

2790 -#: convert.c:209

2805 +#: convert.c:198

2806 #, c-format

2807 msgid ""

2808 "CRLF will be replaced by LF in %s.\n"

2809 "The file will have its original line endings in your working directory"

2810 msgstr ""

2811

2797 -#: convert.c:217

2812 +#: convert.c:206

2813 #, c-format

2814 msgid "LF would be replaced by CRLF in %s"

2815 msgstr ""

2816

2802 -#: convert.c:219

2817 +#: convert.c:208

2818 #, c-format

2819 msgid ""

2820 "LF will be replaced by CRLF in %s.\n"

2821 "The file will have its original line endings in your working directory"

2822 msgstr ""

2823

2809 -#: convert.c:284

2824 +#: convert.c:273

2825 #, c-format

2826 msgid "BOM is prohibited in '%s' if encoded as %s"

2827 msgstr ""

2828

2814 -#: convert.c:291

2829 +#: convert.c:280

2830 #, c-format

2831 msgid ""

2832 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "

2833 "working-tree-encoding."

2834 msgstr ""

2835

2821 -#: convert.c:304

2836 +#: convert.c:293

2837 #, c-format

2838 msgid "BOM is required in '%s' if encoded as %s"

2839 msgstr ""

2840

2826 -#: convert.c:306

2841 +#: convert.c:295

2842 #, c-format

2843 msgid ""

2844 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

2845 "%sLE (depending on the byte order) as working-tree-encoding."

2846 msgstr ""

2847

2833 -#: convert.c:419 convert.c:490

2848 +#: convert.c:408 convert.c:479

2849 #, c-format

2850 msgid "failed to encode '%s' from %s to %s"

2851 msgstr ""

2852

2838 -#: convert.c:462

2853 +#: convert.c:451

2854 #, c-format

2855 msgid "encoding '%s' from %s to %s and back is not the same"

2856 msgstr ""

2857

2843 -#: convert.c:665

2858 +#: convert.c:654

2859 #, c-format

2860 msgid "cannot fork to run external filter '%s'"

2861 msgstr ""

2862

2848 -#: convert.c:685

2863 +#: convert.c:674

2864 #, c-format

2865 msgid "cannot feed the input to external filter '%s'"

2866 msgstr ""

2867

2853 -#: convert.c:692

2868 +#: convert.c:681

2869 #, c-format

2870 msgid "external filter '%s' failed %d"

2871 msgstr ""

2872

2858 -#: convert.c:727 convert.c:730

2873 +#: convert.c:716 convert.c:719

2874 #, c-format

2875 msgid "read from external filter '%s' failed"

2876 msgstr ""

2877

2863 -#: convert.c:733 convert.c:788

2878 +#: convert.c:722 convert.c:777

2879 #, c-format

2880 msgid "external filter '%s' failed"

2881 msgstr ""

2882

2868 -#: convert.c:837

2883 +#: convert.c:826

2884 msgid "unexpected filter type"

2885 msgstr ""

2886

2872 -#: convert.c:848

2887 +#: convert.c:837

2888 msgid "path name too long for external filter"

2889 msgstr ""

2890

2876 -#: convert.c:940

2891 +#: convert.c:934

2892 #, c-format

2893 msgid ""

2894 "external filter '%s' is not available anymore although not all paths have "

2895 "been filtered"

2896 msgstr ""

2897

2883 -#: convert.c:1240

2898 +#: convert.c:1234

2899 msgid "true/false are no valid working-tree-encodings"

2900 msgstr ""

2901

2887 -#: convert.c:1428 convert.c:1462

2902 +#: convert.c:1414 convert.c:1447

2903 #, c-format

2904 msgid "%s: clean filter '%s' failed"

2905 msgstr ""

2906

2892 -#: convert.c:1508

2907 +#: convert.c:1490

2908 #, c-format

2909 msgid "%s: smudge filter %s failed"

2910 msgstr ""

@@ -3014,28 +3029,28 @@ msgstr ""

3029 msgid "Marked %d islands, done.\n"

3030 msgstr ""

3031

3017 -#: diff-merges.c:70

3032 +#: diff-merges.c:80

3033 #, c-format

3034 msgid "unknown value for --diff-merges: %s"

3035 msgstr ""

3036

3022 -#: diff-lib.c:534

3037 +#: diff-lib.c:538

3038 msgid "--merge-base does not work with ranges"

3039 msgstr ""

3040

3026 -#: diff-lib.c:536

3041 +#: diff-lib.c:540

3042 msgid "--merge-base only works with commits"

3043 msgstr ""

3044

3030 -#: diff-lib.c:553

3045 +#: diff-lib.c:557

3046 msgid "unable to get HEAD"

3047 msgstr ""

3048

3034 -#: diff-lib.c:560

3049 +#: diff-lib.c:564

3050 msgid "no merge base found"

3051 msgstr ""

3052

3038 -#: diff-lib.c:562

3053 +#: diff-lib.c:566

3054 msgid "multiple merge bases found"

3055 msgstr ""

3056

@@ -3090,544 +3105,544 @@ msgid ""

3105 "%s"

3106 msgstr ""

3107

3093 -#: diff.c:4276

3108 +#: diff.c:4278

3109 #, c-format

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

3111 msgstr ""

3112

3098 -#: diff.c:4628

3113 +#: diff.c:4630

3114 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3115 msgstr ""

3116

3102 -#: diff.c:4631

3117 +#: diff.c:4633

3118 msgid "-G, -S and --find-object are mutually exclusive"

3119 msgstr ""

3120

3106 -#: diff.c:4710

3121 +#: diff.c:4712

3122 msgid "--follow requires exactly one pathspec"

3123 msgstr ""

3124

3110 -#: diff.c:4758

3125 +#: diff.c:4760

3126 #, c-format

3127 msgid "invalid --stat value: %s"

3128 msgstr ""

3129

3115 -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306

3130 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3131 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3132 #, c-format

3133 msgid "%s expects a numerical value"

3134 msgstr ""

3135

3121 -#: diff.c:4795

3136 +#: diff.c:4797

3137 #, c-format

3138 msgid ""

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

3140 "%s"

3141 msgstr ""

3142

3128 -#: diff.c:4880

3143 +#: diff.c:4882

3144 #, c-format

3145 msgid "unknown change class '%c' in --diff-filter=%s"

3146 msgstr ""

3147

3133 -#: diff.c:4904

3148 +#: diff.c:4906

3149 #, c-format

3150 msgid "unknown value after ws-error-highlight=%.*s"

3151 msgstr ""

3152

3138 -#: diff.c:4918

3153 +#: diff.c:4920

3154 #, c-format

3155 msgid "unable to resolve '%s'"

3156 msgstr ""

3157

3143 -#: diff.c:4968 diff.c:4974

3158 +#: diff.c:4970 diff.c:4976

3159 #, c-format

3160 msgid "%s expects <n>/<m> form"

3161 msgstr ""

3162

3148 -#: diff.c:4986

3163 +#: diff.c:4988

3164 #, c-format

3165 msgid "%s expects a character, got '%s'"

3166 msgstr ""

3167

3153 -#: diff.c:5007

3168 +#: diff.c:5009

3169 #, c-format

3170 msgid "bad --color-moved argument: %s"

3171 msgstr ""

3172

3158 -#: diff.c:5026

3173 +#: diff.c:5028

3174 #, c-format

3175 msgid "invalid mode '%s' in --color-moved-ws"

3176 msgstr ""

3177

3163 -#: diff.c:5066

3178 +#: diff.c:5068

3179 msgid ""

3180 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3181 "\"histogram\""

3182 msgstr ""

3183

3169 -#: diff.c:5102 diff.c:5122

3184 +#: diff.c:5104 diff.c:5124

3185 #, c-format

3186 msgid "invalid argument to %s"

3187 msgstr ""

3188

3174 -#: diff.c:5226

3189 +#: diff.c:5228

3190 #, c-format

3191 msgid "invalid regex given to -I: '%s'"

3192 msgstr ""

3193

3179 -#: diff.c:5275

3194 +#: diff.c:5277

3195 #, c-format

3196 msgid "failed to parse --submodule option parameter: '%s'"

3197 msgstr ""

3198

3184 -#: diff.c:5331

3199 +#: diff.c:5333

3200 #, c-format

3201 msgid "bad --word-diff argument: %s"

3202 msgstr ""

3203

3189 -#: diff.c:5367

3204 +#: diff.c:5369

3205 msgid "Diff output format options"

3206 msgstr ""

3207

3193 -#: diff.c:5369 diff.c:5375

3208 +#: diff.c:5371 diff.c:5377

3209 msgid "generate patch"

3210 msgstr ""

3211

3197 -#: diff.c:5372 builtin/log.c:179

3212 +#: diff.c:5374 builtin/log.c:179

3213 msgid "suppress diff output"

3214 msgstr ""

3215

3201 -#: diff.c:5377 diff.c:5491 diff.c:5498

3216 +#: diff.c:5379 diff.c:5493 diff.c:5500

3217 msgid "<n>"

3218 msgstr ""

3219

3205 -#: diff.c:5378 diff.c:5381

3220 +#: diff.c:5380 diff.c:5383

3221 msgid "generate diffs with <n> lines context"

3222 msgstr ""

3223

3209 -#: diff.c:5383

3224 +#: diff.c:5385

3225 msgid "generate the diff in raw format"

3226 msgstr ""

3227

3213 -#: diff.c:5386

3228 +#: diff.c:5388

3229 msgid "synonym for '-p --raw'"

3230 msgstr ""

3231

3217 -#: diff.c:5390

3232 +#: diff.c:5392

3233 msgid "synonym for '-p --stat'"

3234 msgstr ""

3235

3221 -#: diff.c:5394

3236 +#: diff.c:5396

3237 msgid "machine friendly --stat"

3238 msgstr ""

3239

3225 -#: diff.c:5397

3240 +#: diff.c:5399

3241 msgid "output only the last line of --stat"

3242 msgstr ""

3243

3229 -#: diff.c:5399 diff.c:5407

3244 +#: diff.c:5401 diff.c:5409

3245 msgid "<param1,param2>..."

3246 msgstr ""

3247

3233 -#: diff.c:5400

3248 +#: diff.c:5402

3249 msgid ""

3250 "output the distribution of relative amount of changes for each sub-directory"

3251 msgstr ""

3252

3238 -#: diff.c:5404

3253 +#: diff.c:5406

3254 msgid "synonym for --dirstat=cumulative"

3255 msgstr ""

3256

3242 -#: diff.c:5408

3257 +#: diff.c:5410

3258 msgid "synonym for --dirstat=files,param1,param2..."

3259 msgstr ""

3260

3246 -#: diff.c:5412

3261 +#: diff.c:5414

3262 msgid "warn if changes introduce conflict markers or whitespace errors"

3263 msgstr ""

3264

3250 -#: diff.c:5415

3265 +#: diff.c:5417

3266 msgid "condensed summary such as creations, renames and mode changes"

3267 msgstr ""

3268

3254 -#: diff.c:5418

3269 +#: diff.c:5420

3270 msgid "show only names of changed files"

3271 msgstr ""

3272

3258 -#: diff.c:5421

3273 +#: diff.c:5423

3274 msgid "show only names and status of changed files"

3275 msgstr ""

3276

3262 -#: diff.c:5423

3277 +#: diff.c:5425

3278 msgid "<width>[,<name-width>[,<count>]]"

3279 msgstr ""

3280

3266 -#: diff.c:5424

3281 +#: diff.c:5426

3282 msgid "generate diffstat"

3283 msgstr ""

3284

3270 -#: diff.c:5426 diff.c:5429 diff.c:5432

3285 +#: diff.c:5428 diff.c:5431 diff.c:5434

3286 msgid "<width>"

3287 msgstr ""

3288

3274 -#: diff.c:5427

3289 +#: diff.c:5429

3290 msgid "generate diffstat with a given width"

3291 msgstr ""

3292

3278 -#: diff.c:5430

3293 +#: diff.c:5432

3294 msgid "generate diffstat with a given name width"

3295 msgstr ""

3296

3282 -#: diff.c:5433

3297 +#: diff.c:5435

3298 msgid "generate diffstat with a given graph width"

3299 msgstr ""

3300

3286 -#: diff.c:5435

3301 +#: diff.c:5437

3302 msgid "<count>"

3303 msgstr ""

3304

3290 -#: diff.c:5436

3305 +#: diff.c:5438

3306 msgid "generate diffstat with limited lines"

3307 msgstr ""

3308

3294 -#: diff.c:5439

3309 +#: diff.c:5441

3310 msgid "generate compact summary in diffstat"

3311 msgstr ""

3312

3298 -#: diff.c:5442

3313 +#: diff.c:5444

3314 msgid "output a binary diff that can be applied"

3315 msgstr ""

3316

3302 -#: diff.c:5445

3317 +#: diff.c:5447

3318 msgid "show full pre- and post-image object names on the \"index\" lines"

3319 msgstr ""

3320

3306 -#: diff.c:5447

3321 +#: diff.c:5449

3322 msgid "show colored diff"

3323 msgstr ""

3324

3310 -#: diff.c:5448

3325 +#: diff.c:5450

3326 msgid "<kind>"

3327 msgstr ""

3328

3314 -#: diff.c:5449

3329 +#: diff.c:5451

3330 msgid ""

3331 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3332 "diff"

3333 msgstr ""

3334

3320 -#: diff.c:5452

3335 +#: diff.c:5454

3336 msgid ""

3337 "do not munge pathnames and use NULs as output field terminators in --raw or "

3338 "--numstat"

3339 msgstr ""

3340

3326 -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570

3341 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3342 msgid "<prefix>"

3343 msgstr ""

3344

3330 -#: diff.c:5456

3345 +#: diff.c:5458

3346 msgid "show the given source prefix instead of \"a/\""

3347 msgstr ""

3348

3334 -#: diff.c:5459

3349 +#: diff.c:5461

3350 msgid "show the given destination prefix instead of \"b/\""

3351 msgstr ""

3352

3338 -#: diff.c:5462

3353 +#: diff.c:5464

3354 msgid "prepend an additional prefix to every line of output"

3355 msgstr ""

3356

3342 -#: diff.c:5465

3357 +#: diff.c:5467

3358 msgid "do not show any source or destination prefix"

3359 msgstr ""

3360

3346 -#: diff.c:5468

3361 +#: diff.c:5470

3362 msgid "show context between diff hunks up to the specified number of lines"

3363 msgstr ""

3364

3350 -#: diff.c:5472 diff.c:5477 diff.c:5482

3365 +#: diff.c:5474 diff.c:5479 diff.c:5484

3366 msgid "<char>"

3367 msgstr ""

3368

3354 -#: diff.c:5473

3369 +#: diff.c:5475

3370 msgid "specify the character to indicate a new line instead of '+'"

3371 msgstr ""

3372

3358 -#: diff.c:5478

3373 +#: diff.c:5480

3374 msgid "specify the character to indicate an old line instead of '-'"

3375 msgstr ""

3376

3362 -#: diff.c:5483

3377 +#: diff.c:5485

3378 msgid "specify the character to indicate a context instead of ' '"

3379 msgstr ""

3380

3366 -#: diff.c:5486

3381 +#: diff.c:5488

3382 msgid "Diff rename options"

3383 msgstr ""

3384

3370 -#: diff.c:5487

3385 +#: diff.c:5489

3386 msgid "<n>[/<m>]"

3387 msgstr ""

3388

3374 -#: diff.c:5488

3389 +#: diff.c:5490

3390 msgid "break complete rewrite changes into pairs of delete and create"

3391 msgstr ""

3392

3378 -#: diff.c:5492

3393 +#: diff.c:5494

3394 msgid "detect renames"

3395 msgstr ""

3396

3382 -#: diff.c:5496

3397 +#: diff.c:5498

3398 msgid "omit the preimage for deletes"

3399 msgstr ""

3400

3386 -#: diff.c:5499

3401 +#: diff.c:5501

3402 msgid "detect copies"

3403 msgstr ""

3404

3390 -#: diff.c:5503

3405 +#: diff.c:5505

3406 msgid "use unmodified files as source to find copies"

3407 msgstr ""

3408

3394 -#: diff.c:5505

3409 +#: diff.c:5507

3410 msgid "disable rename detection"

3411 msgstr ""

3412

3398 -#: diff.c:5508

3413 +#: diff.c:5510

3414 msgid "use empty blobs as rename source"

3415 msgstr ""

3416

3402 -#: diff.c:5510

3417 +#: diff.c:5512

3418 msgid "continue listing the history of a file beyond renames"

3419 msgstr ""

3420

3406 -#: diff.c:5513

3421 +#: diff.c:5515

3422 msgid ""

3423 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3424 "given limit"

3425 msgstr ""

3426

3412 -#: diff.c:5515

3427 +#: diff.c:5517

3428 msgid "Diff algorithm options"

3429 msgstr ""

3430

3416 -#: diff.c:5517

3431 +#: diff.c:5519

3432 msgid "produce the smallest possible diff"

3433 msgstr ""

3434

3420 -#: diff.c:5520

3435 +#: diff.c:5522

3436 msgid "ignore whitespace when comparing lines"

3437 msgstr ""

3438

3424 -#: diff.c:5523

3439 +#: diff.c:5525

3440 msgid "ignore changes in amount of whitespace"

3441 msgstr ""

3442

3428 -#: diff.c:5526

3443 +#: diff.c:5528

3444 msgid "ignore changes in whitespace at EOL"

3445 msgstr ""

3446

3432 -#: diff.c:5529

3447 +#: diff.c:5531

3448 msgid "ignore carrier-return at the end of line"

3449 msgstr ""

3450

3436 -#: diff.c:5532

3451 +#: diff.c:5534

3452 msgid "ignore changes whose lines are all blank"

3453 msgstr ""

3454

3440 -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604

3455 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3456 msgid "<regex>"

3457 msgstr ""

3458

3444 -#: diff.c:5535

3459 +#: diff.c:5537

3460 msgid "ignore changes whose all lines match <regex>"

3461 msgstr ""

3462

3448 -#: diff.c:5538

3463 +#: diff.c:5540

3464 msgid "heuristic to shift diff hunk boundaries for easy reading"

3465 msgstr ""

3466

3452 -#: diff.c:5541

3467 +#: diff.c:5543

3468 msgid "generate diff using the \"patience diff\" algorithm"

3469 msgstr ""

3470

3456 -#: diff.c:5545

3471 +#: diff.c:5547

3472 msgid "generate diff using the \"histogram diff\" algorithm"

3473 msgstr ""

3474

3460 -#: diff.c:5547

3475 +#: diff.c:5549

3476 msgid "<algorithm>"

3477 msgstr ""

3478

3464 -#: diff.c:5548

3479 +#: diff.c:5550

3480 msgid "choose a diff algorithm"

3481 msgstr ""

3482

3468 -#: diff.c:5550

3483 +#: diff.c:5552

3484 msgid "<text>"

3485 msgstr ""

3486

3472 -#: diff.c:5551

3487 +#: diff.c:5553

3488 msgid "generate diff using the \"anchored diff\" algorithm"

3489 msgstr ""

3490

3476 -#: diff.c:5553 diff.c:5562 diff.c:5565

3491 +#: diff.c:5555 diff.c:5564 diff.c:5567

3492 msgid "<mode>"

3493 msgstr ""

3494

3480 -#: diff.c:5554

3495 +#: diff.c:5556

3496 msgid "show word diff, using <mode> to delimit changed words"

3497 msgstr ""

3498

3484 -#: diff.c:5557

3499 +#: diff.c:5559

3500 msgid "use <regex> to decide what a word is"

3501 msgstr ""

3502

3488 -#: diff.c:5560

3503 +#: diff.c:5562

3504 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3505 msgstr ""

3506

3492 -#: diff.c:5563

3507 +#: diff.c:5565

3508 msgid "moved lines of code are colored differently"

3509 msgstr ""

3510

3496 -#: diff.c:5566

3511 +#: diff.c:5568

3512 msgid "how white spaces are ignored in --color-moved"

3513 msgstr ""

3514

3500 -#: diff.c:5569

3515 +#: diff.c:5571

3516 msgid "Other diff options"

3517 msgstr ""

3518

3504 -#: diff.c:5571

3519 +#: diff.c:5573

3520 msgid "when run from subdir, exclude changes outside and show relative paths"

3521 msgstr ""

3522

3508 -#: diff.c:5575

3523 +#: diff.c:5577

3524 msgid "treat all files as text"

3525 msgstr ""

3526

3512 -#: diff.c:5577

3527 +#: diff.c:5579

3528 msgid "swap two inputs, reverse the diff"

3529 msgstr ""

3530

3516 -#: diff.c:5579

3531 +#: diff.c:5581

3532 msgid "exit with 1 if there were differences, 0 otherwise"

3533 msgstr ""

3534

3520 -#: diff.c:5581

3535 +#: diff.c:5583

3536 msgid "disable all output of the program"

3537 msgstr ""

3538

3524 -#: diff.c:5583

3539 +#: diff.c:5585

3540 msgid "allow an external diff helper to be executed"

3541 msgstr ""

3542

3528 -#: diff.c:5585

3543 +#: diff.c:5587

3544 msgid "run external text conversion filters when comparing binary files"

3545 msgstr ""

3546

3532 -#: diff.c:5587

3547 +#: diff.c:5589

3548 msgid "<when>"

3549 msgstr ""

3550

3536 -#: diff.c:5588

3551 +#: diff.c:5590

3552 msgid "ignore changes to submodules in the diff generation"

3553 msgstr ""

3554

3540 -#: diff.c:5591

3555 +#: diff.c:5593

3556 msgid "<format>"

3557 msgstr ""

3558

3544 -#: diff.c:5592

3559 +#: diff.c:5594

3560 msgid "specify how differences in submodules are shown"

3561 msgstr ""

3562

3548 -#: diff.c:5596

3563 +#: diff.c:5598

3564 msgid "hide 'git add -N' entries from the index"

3565 msgstr ""

3566

3552 -#: diff.c:5599

3567 +#: diff.c:5601

3568 msgid "treat 'git add -N' entries as real in the index"

3569 msgstr ""

3570

3556 -#: diff.c:5601

3571 +#: diff.c:5603

3572 msgid "<string>"

3573 msgstr ""

3574

3560 -#: diff.c:5602

3575 +#: diff.c:5604

3576 msgid ""

3577 "look for differences that change the number of occurrences of the specified "

3578 "string"

3579 msgstr ""

3580

3566 -#: diff.c:5605

3581 +#: diff.c:5607

3582 msgid ""

3583 "look for differences that change the number of occurrences of the specified "

3584 "regex"

3585 msgstr ""

3586

3572 -#: diff.c:5608

3587 +#: diff.c:5610

3588 msgid "show all changes in the changeset with -S or -G"

3589 msgstr ""

3590

3576 -#: diff.c:5611

3591 +#: diff.c:5613

3592 msgid "treat <string> in -S as extended POSIX regular expression"

3593 msgstr ""

3594

3580 -#: diff.c:5614

3595 +#: diff.c:5616

3596 msgid "control the order in which files appear in the output"

3597 msgstr ""

3598

3584 -#: diff.c:5615 diff.c:5618

3599 +#: diff.c:5617 diff.c:5620

3600 msgid "<path>"

3601 msgstr ""

3602

3588 -#: diff.c:5616

3603 +#: diff.c:5618

3604 msgid "show the change in the specified path first"

3605 msgstr ""

3606

3592 -#: diff.c:5619

3607 +#: diff.c:5621

3608 msgid "skip the output to the specified path"

3609 msgstr ""

3610

3596 -#: diff.c:5621

3611 +#: diff.c:5623

3612 msgid "<object-id>"

3613 msgstr ""

3614

3600 -#: diff.c:5622

3615 +#: diff.c:5624

3616 msgid ""

3617 "look for differences that change the number of occurrences of the specified "

3618 "object"

3619 msgstr ""

3620

3606 -#: diff.c:5624

3621 +#: diff.c:5626

3622 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3623 msgstr ""

3624

3610 -#: diff.c:5625

3625 +#: diff.c:5627

3626 msgid "select files by diff type"

3627 msgstr ""

3628

3614 -#: diff.c:5627

3629 +#: diff.c:5629

3630 msgid "<file>"

3631 msgstr ""

3632

3618 -#: diff.c:5628

3633 +#: diff.c:5630

3634 msgid "Output to a specific file"

3635 msgstr ""

3636

3622 -#: diff.c:6285

3637 +#: diff.c:6287

3638 msgid "inexact rename detection was skipped due to too many files."

3639 msgstr ""

3640

3626 -#: diff.c:6288

3641 +#: diff.c:6290

3642 msgid "only found copies from modified paths due to too many files."

3643 msgstr ""

3644

3630 -#: diff.c:6291

3645 +#: diff.c:6293

3646 #, c-format

3647 msgid ""

3648 "you may want to set your %s variable to at least %d and retry the command."

@@ -3638,7 +3653,7 @@ msgstr ""

3653 msgid "failed to read orderfile '%s'"

3654 msgstr ""

3655

3641 -#: diffcore-rename.c:786

3656 +#: diffcore-rename.c:1418

3657 msgid "Performing inexact rename detection"

3658 msgstr ""

3659

@@ -3671,35 +3686,35 @@ msgstr ""

3686 msgid "disabling cone pattern matching"

3687 msgstr ""

3688

3674 -#: dir.c:1198

3689 +#: dir.c:1206

3690 #, c-format

3691 msgid "cannot use %s as an exclude file"

3692 msgstr ""

3693

3679 -#: dir.c:2305

3694 +#: dir.c:2314

3695 #, c-format

3696 msgid "could not open directory '%s'"

3697 msgstr ""

3698

3684 -#: dir.c:2605

3699 +#: dir.c:2614

3700 msgid "failed to get kernel name and information"

3701 msgstr ""

3702

3688 -#: dir.c:2729

3703 +#: dir.c:2738

3704 msgid "untracked cache is disabled on this system or location"

3705 msgstr ""

3706

3692 -#: dir.c:3534

3707 +#: dir.c:3543

3708 #, c-format

3709 msgid "index file corrupt in repo %s"

3710 msgstr ""

3711

3697 -#: dir.c:3579 dir.c:3584

3712 +#: dir.c:3590 dir.c:3595

3713 #, c-format

3714 msgid "could not create directories for %s"

3715 msgstr ""

3716

3702 -#: dir.c:3613

3717 +#: dir.c:3624

3718 #, c-format

3719 msgid "could not migrate git directory from '%s' to '%s'"

3720 msgstr ""

@@ -3709,11 +3724,11 @@ msgstr ""

3724 msgid "hint: Waiting for your editor to close the file...%c"

3725 msgstr ""

3726

3712 -#: entry.c:177

3727 +#: entry.c:179

3728 msgid "Filtering content"

3729 msgstr ""

3730

3716 -#: entry.c:478

3731 +#: entry.c:500

3732 #, c-format

3733 msgid "could not stat file '%s'"

3734 msgstr ""

@@ -3733,249 +3748,257 @@ msgstr ""

3748 msgid "too many args to run %s"

3749 msgstr ""

3750

3736 -#: fetch-pack.c:177

3751 +#: fetch-pack.c:182

3752 msgid "git fetch-pack: expected shallow list"

3753 msgstr ""

3754

3740 -#: fetch-pack.c:180

3755 +#: fetch-pack.c:185

3756 msgid "git fetch-pack: expected a flush packet after shallow list"

3757 msgstr ""

3758

3744 -#: fetch-pack.c:191

3759 +#: fetch-pack.c:196

3760 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3761 msgstr ""

3762

3748 -#: fetch-pack.c:211

3763 +#: fetch-pack.c:216

3764 #, c-format

3765 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3766 msgstr ""

3767

3753 -#: fetch-pack.c:222

3768 +#: fetch-pack.c:227

3769 msgid "unable to write to remote"

3770 msgstr ""

3771

3757 -#: fetch-pack.c:283

3772 +#: fetch-pack.c:288

3773 msgid "--stateless-rpc requires multi_ack_detailed"

3774 msgstr ""

3775

3761 -#: fetch-pack.c:378 fetch-pack.c:1457

3776 +#: fetch-pack.c:383 fetch-pack.c:1423

3777 #, c-format

3778 msgid "invalid shallow line: %s"

3779 msgstr ""

3780

3766 -#: fetch-pack.c:384 fetch-pack.c:1463

3781 +#: fetch-pack.c:389 fetch-pack.c:1429

3782 #, c-format

3783 msgid "invalid unshallow line: %s"

3784 msgstr ""

3785

3771 -#: fetch-pack.c:386 fetch-pack.c:1465

3786 +#: fetch-pack.c:391 fetch-pack.c:1431

3787 #, c-format

3788 msgid "object not found: %s"

3789 msgstr ""

3790

3776 -#: fetch-pack.c:389 fetch-pack.c:1468

3791 +#: fetch-pack.c:394 fetch-pack.c:1434

3792 #, c-format

3793 msgid "error in object: %s"

3794 msgstr ""

3795

3781 -#: fetch-pack.c:391 fetch-pack.c:1470

3796 +#: fetch-pack.c:396 fetch-pack.c:1436

3797 #, c-format

3798 msgid "no shallow found: %s"

3799 msgstr ""

3800

3786 -#: fetch-pack.c:394 fetch-pack.c:1474

3801 +#: fetch-pack.c:399 fetch-pack.c:1440

3802 #, c-format

3803 msgid "expected shallow/unshallow, got %s"

3804 msgstr ""

3805

3791 -#: fetch-pack.c:434

3806 +#: fetch-pack.c:439

3807 #, c-format

3808 msgid "got %s %d %s"

3809 msgstr ""

3810

3796 -#: fetch-pack.c:451

3811 +#: fetch-pack.c:456

3812 #, c-format

3813 msgid "invalid commit %s"

3814 msgstr ""

3815

3801 -#: fetch-pack.c:482

3816 +#: fetch-pack.c:487

3817 msgid "giving up"

3818 msgstr ""

3819

3805 -#: fetch-pack.c:495 progress.c:339

3820 +#: fetch-pack.c:500 progress.c:339

3821 msgid "done"

3822 msgstr ""

3823

3809 -#: fetch-pack.c:507

3824 +#: fetch-pack.c:512

3825 #, c-format

3826 msgid "got %s (%d) %s"

3827 msgstr ""

3828

3814 -#: fetch-pack.c:543

3829 +#: fetch-pack.c:548

3830 #, c-format

3831 msgid "Marking %s as complete"

3832 msgstr ""

3833

3819 -#: fetch-pack.c:758

3834 +#: fetch-pack.c:763

3835 #, c-format

3836 msgid "already have %s (%s)"

3837 msgstr ""

3838

3824 -#: fetch-pack.c:844

3839 +#: fetch-pack.c:849

3840 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3841 msgstr ""

3842

3828 -#: fetch-pack.c:852

3843 +#: fetch-pack.c:857

3844 msgid "protocol error: bad pack header"

3845 msgstr ""

3846

3832 -#: fetch-pack.c:946

3847 +#: fetch-pack.c:951

3848 #, c-format

3849 msgid "fetch-pack: unable to fork off %s"

3850 msgstr ""

3851

3837 -#: fetch-pack.c:952

3852 +#: fetch-pack.c:957

3853 msgid "fetch-pack: invalid index-pack output"

3854 msgstr ""

3855

3841 -#: fetch-pack.c:969

3856 +#: fetch-pack.c:974

3857 #, c-format

3858 msgid "%s failed"

3859 msgstr ""

3860

3846 -#: fetch-pack.c:971

3861 +#: fetch-pack.c:976

3862 msgid "error in sideband demultiplexer"

3863 msgstr ""

3864

3850 -#: fetch-pack.c:1031

3865 +#: fetch-pack.c:1019

3866 #, c-format

3867 msgid "Server version is %.*s"

3868 msgstr ""

3869

3855 -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054

3856 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070

3857 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086

3858 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108

3870 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

3871 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

3872 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

3873 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

3874 #, c-format

3875 msgid "Server supports %s"

3876 msgstr ""

3877

3863 -#: fetch-pack.c:1041

3878 +#: fetch-pack.c:1029

3879 msgid "Server does not support shallow clients"

3880 msgstr ""

3881

3867 -#: fetch-pack.c:1101

3882 +#: fetch-pack.c:1089

3883 msgid "Server does not support --shallow-since"

3884 msgstr ""

3885

3871 -#: fetch-pack.c:1106

3886 +#: fetch-pack.c:1094

3887 msgid "Server does not support --shallow-exclude"

3888 msgstr ""

3889

3875 -#: fetch-pack.c:1110

3890 +#: fetch-pack.c:1098

3891 msgid "Server does not support --deepen"

3892 msgstr ""

3893

3879 -#: fetch-pack.c:1112

3894 +#: fetch-pack.c:1100

3895 msgid "Server does not support this repository's object format"

3896 msgstr ""

3897

3883 -#: fetch-pack.c:1125

3898 +#: fetch-pack.c:1113

3899 msgid "no common commits"

3900 msgstr ""

3901

3887 -#: fetch-pack.c:1138 fetch-pack.c:1682

3902 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

3903 +msgid "source repository is shallow, reject to clone."

3904 +msgstr ""

3905 +

3906 +#: fetch-pack.c:1128 fetch-pack.c:1651

3907 msgid "git fetch-pack: fetch failed."

3908 msgstr ""

3909

3891 -#: fetch-pack.c:1265

3910 +#: fetch-pack.c:1242

3911 #, c-format

3912 msgid "mismatched algorithms: client %s; server %s"

3913 msgstr ""

3914

3896 -#: fetch-pack.c:1269

3915 +#: fetch-pack.c:1246

3916 #, c-format

3917 msgid "the server does not support algorithm '%s'"

3918 msgstr ""

3919

3901 -#: fetch-pack.c:1289

3920 +#: fetch-pack.c:1279

3921 msgid "Server does not support shallow requests"

3922 msgstr ""

3923

3905 -#: fetch-pack.c:1296

3924 +#: fetch-pack.c:1286

3925 msgid "Server supports filter"

3926 msgstr ""

3927

3909 -#: fetch-pack.c:1335

3928 +#: fetch-pack.c:1329 fetch-pack.c:2034

3929 msgid "unable to write request to remote"

3930 msgstr ""

3931

3913 -#: fetch-pack.c:1353

3932 +#: fetch-pack.c:1347

3933 #, c-format

3934 msgid "error reading section header '%s'"

3935 msgstr ""

3936

3918 -#: fetch-pack.c:1359

3937 +#: fetch-pack.c:1353

3938 #, c-format

3939 msgid "expected '%s', received '%s'"

3940 msgstr ""

3941

3923 -#: fetch-pack.c:1420

3942 +#: fetch-pack.c:1387

3943 #, c-format

3944 msgid "unexpected acknowledgment line: '%s'"

3945 msgstr ""

3946

3928 -#: fetch-pack.c:1425

3947 +#: fetch-pack.c:1392

3948 #, c-format

3949 msgid "error processing acks: %d"

3950 msgstr ""

3951

3933 -#: fetch-pack.c:1435

3952 +#: fetch-pack.c:1402

3953 msgid "expected packfile to be sent after 'ready'"

3954 msgstr ""

3955

3937 -#: fetch-pack.c:1437

3956 +#: fetch-pack.c:1404

3957 msgid "expected no other sections to be sent after no 'ready'"

3958 msgstr ""

3959

3941 -#: fetch-pack.c:1479

3960 +#: fetch-pack.c:1445

3961 #, c-format

3962 msgid "error processing shallow info: %d"

3963 msgstr ""

3964

3946 -#: fetch-pack.c:1526

3965 +#: fetch-pack.c:1494

3966 #, c-format

3967 msgid "expected wanted-ref, got '%s'"

3968 msgstr ""

3969

3951 -#: fetch-pack.c:1531

3970 +#: fetch-pack.c:1499

3971 #, c-format

3972 msgid "unexpected wanted-ref: '%s'"

3973 msgstr ""

3974

3956 -#: fetch-pack.c:1536

3975 +#: fetch-pack.c:1504

3976 #, c-format

3977 msgid "error processing wanted refs: %d"

3978 msgstr ""

3979

3961 -#: fetch-pack.c:1566

3980 +#: fetch-pack.c:1534

3981 msgid "git fetch-pack: expected response end packet"

3982 msgstr ""

3983

3965 -#: fetch-pack.c:1960

3984 +#: fetch-pack.c:1930

3985 msgid "no matching remote head"

3986 msgstr ""

3987

3969 -#: fetch-pack.c:1983 builtin/clone.c:693

3988 +#: fetch-pack.c:1953 builtin/clone.c:697

3989 msgid "remote did not send all necessary objects"

3990 msgstr ""

3991

3973 -#: fetch-pack.c:2010

3992 +#: fetch-pack.c:2056

3993 +msgid "unexpected 'ready' from remote"

3994 +msgstr ""

3995 +

3996 +#: fetch-pack.c:2079

3997 #, c-format

3998 msgid "no such remote ref %s"

3999 msgstr ""

4000

3978 -#: fetch-pack.c:2013

4001 +#: fetch-pack.c:2082

4002 #, c-format

4003 msgid "Server does not allow request for unadvertised object %s"

4004 msgstr ""

@@ -3998,24 +4021,24 @@ msgstr ""

4021 msgid "ignore invalid color '%.*s' in log.graphColors"

4022 msgstr ""

4023

4001 -#: grep.c:543

4024 +#: grep.c:531

4025 msgid ""

4026 "given pattern contains NULL byte (via -f <file>). This is only supported "

4027 "with -P under PCRE v2"

4028 msgstr ""

4029

4007 -#: grep.c:1906

4030 +#: grep.c:1893

4031 #, c-format

4032 msgid "'%s': unable to read %s"

4033 msgstr ""

4034

4012 -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90

4013 -#: builtin/rm.c:135

4035 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4036 +#: builtin/rm.c:136

4037 #, c-format

4038 msgid "failed to stat '%s'"

4039 msgstr ""

4040

4018 -#: grep.c:1934

4041 +#: grep.c:1921

4042 #, c-format

4043 msgid "'%s': short read"

4044 msgstr ""

@@ -4217,47 +4240,52 @@ msgstr ""

4240 msgid "name consists only of disallowed characters: %s"

4241 msgstr ""

4242

4220 -#: ident.c:454 builtin/commit.c:634

4243 +#: ident.c:454 builtin/commit.c:647

4244 #, c-format

4245 msgid "invalid date format: %s"

4246 msgstr ""

4247

4225 -#: list-objects-filter-options.c:81

4248 +#: list-objects-filter-options.c:83

4249 msgid "expected 'tree:<depth>'"

4250 msgstr ""

4251

4229 -#: list-objects-filter-options.c:96

4252 +#: list-objects-filter-options.c:98

4253 msgid "sparse:path filters support has been dropped"

4254 msgstr ""

4255

4233 -#: list-objects-filter-options.c:109

4256 +#: list-objects-filter-options.c:105

4257 +#, c-format

4258 +msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4259 +msgstr ""

4260 +

4261 +#: list-objects-filter-options.c:124

4262 #, c-format

4263 msgid "invalid filter-spec '%s'"

4264 msgstr ""

4265

4238 -#: list-objects-filter-options.c:125

4266 +#: list-objects-filter-options.c:140

4267 #, c-format

4268 msgid "must escape char in sub-filter-spec: '%c'"

4269 msgstr ""

4270

4243 -#: list-objects-filter-options.c:167

4271 +#: list-objects-filter-options.c:182

4272 msgid "expected something after combine:"

4273 msgstr ""

4274

4247 -#: list-objects-filter-options.c:249

4275 +#: list-objects-filter-options.c:264

4276 msgid "multiple filter-specs cannot be combined"

4277 msgstr ""

4278

4251 -#: list-objects-filter-options.c:361

4279 +#: list-objects-filter-options.c:376

4280 msgid "unable to upgrade repository format to support partial clone"

4281 msgstr ""

4282

4255 -#: list-objects-filter.c:492

4283 +#: list-objects-filter.c:532

4284 #, c-format

4285 msgid "unable to access sparse blob in '%s'"

4286 msgstr ""

4287

4260 -#: list-objects-filter.c:495

4288 +#: list-objects-filter.c:535

4289 #, c-format

4290 msgid "unable to parse sparse filter data in %s"

4291 msgstr ""

@@ -4272,7 +4300,7 @@ msgstr ""

4300 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4301 msgstr ""

4302

4275 -#: list-objects.c:375

4303 +#: list-objects.c:395

4304 #, c-format

4305 msgid "unable to load root tree for commit %s"

4306 msgstr ""

@@ -4303,39 +4331,48 @@ msgstr ""

4331 msgid "expected flush after ls-refs arguments"

4332 msgstr ""

4333

4306 -#: merge-ort.c:888 merge-recursive.c:1191

4334 +#: mailinfo.c:1050

4335 +msgid "quoted CRLF detected"

4336 +msgstr ""

4337 +

4338 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4339 +#, c-format

4340 +msgid "bad action '%s' for '%s'"

4341 +msgstr ""

4342 +

4343 +#: merge-ort.c:1116 merge-recursive.c:1205

4344 #, c-format

4345 msgid "Failed to merge submodule %s (not checked out)"

4346 msgstr ""

4347

4311 -#: merge-ort.c:897 merge-recursive.c:1198

4348 +#: merge-ort.c:1125 merge-recursive.c:1212

4349 #, c-format

4350 msgid "Failed to merge submodule %s (commits not present)"

4351 msgstr ""

4352

4316 -#: merge-ort.c:906 merge-recursive.c:1205

4353 +#: merge-ort.c:1134 merge-recursive.c:1219

4354 #, c-format

4355 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4356 msgstr ""

4357

4321 -#: merge-ort.c:916 merge-ort.c:923

4358 +#: merge-ort.c:1144 merge-ort.c:1151

4359 #, c-format

4360 msgid "Note: Fast-forwarding submodule %s to %s"

4361 msgstr ""

4362

4326 -#: merge-ort.c:944

4363 +#: merge-ort.c:1172

4364 #, c-format

4365 msgid "Failed to merge submodule %s"

4366 msgstr ""

4367

4331 -#: merge-ort.c:951

4368 +#: merge-ort.c:1179

4369 #, c-format

4370 msgid ""

4371 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

4372 "%s\n"

4373 msgstr ""

4374

4338 -#: merge-ort.c:955 merge-recursive.c:1259

4375 +#: merge-ort.c:1183 merge-recursive.c:1273

4376 #, c-format

4377 msgid ""

4378 "If this is correct simply add it to the index for example\n"

@@ -4346,42 +4383,42 @@ msgid ""

4383 "which will accept this suggestion.\n"

4384 msgstr ""

4385

4349 -#: merge-ort.c:968

4386 +#: merge-ort.c:1196

4387 #, c-format

4388 msgid ""

4389 "Failed to merge submodule %s, but multiple possible merges exist:\n"

4390 "%s"

4391 msgstr ""

4392

4356 -#: merge-ort.c:1127 merge-recursive.c:1341

4393 +#: merge-ort.c:1415 merge-recursive.c:1362

4394 msgid "Failed to execute internal merge"

4395 msgstr ""

4396

4360 -#: merge-ort.c:1132 merge-recursive.c:1346

4397 +#: merge-ort.c:1420 merge-recursive.c:1367

4398 #, c-format

4399 msgid "Unable to add %s to database"

4400 msgstr ""

4401

4365 -#: merge-ort.c:1139 merge-recursive.c:1378

4402 +#: merge-ort.c:1427 merge-recursive.c:1400

4403 #, c-format

4404 msgid "Auto-merging %s"

4405 msgstr ""

4406

4370 -#: merge-ort.c:1278 merge-recursive.c:2100

4407 +#: merge-ort.c:1566 merge-recursive.c:2122

4408 #, c-format

4409 msgid ""

4410 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4411 "implicit directory rename(s) putting the following path(s) there: %s."

4412 msgstr ""

4413

4377 -#: merge-ort.c:1288 merge-recursive.c:2110

4414 +#: merge-ort.c:1576 merge-recursive.c:2132

4415 #, c-format

4416 msgid ""

4417 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4418 "implicit directory renames tried to put these paths there: %s"

4419 msgstr ""

4420

4384 -#: merge-ort.c:1471

4421 +#: merge-ort.c:1634

4422 #, c-format

4423 msgid ""

4424 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4389,47 +4426,47 @@ msgid ""

4426 "majority of the files."

4427 msgstr ""

4428

4392 -#: merge-ort.c:1637 merge-recursive.c:2447

4429 +#: merge-ort.c:1788 merge-recursive.c:2468

4430 #, c-format

4431 msgid ""

4432 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4433 "renamed."

4434 msgstr ""

4435

4399 -#: merge-ort.c:1781 merge-recursive.c:3215

4436 +#: merge-ort.c:1932 merge-recursive.c:3244

4437 #, c-format

4438 msgid ""

4439 "Path updated: %s added in %s inside a directory that was renamed in %s; "

4440 "moving it to %s."

4441 msgstr ""

4442

4406 -#: merge-ort.c:1788 merge-recursive.c:3222

4443 +#: merge-ort.c:1939 merge-recursive.c:3251

4444 #, c-format

4445 msgid ""

4446 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4447 "%s; moving it to %s."

4448 msgstr ""

4449

4413 -#: merge-ort.c:1801 merge-recursive.c:3218

4450 +#: merge-ort.c:1952 merge-recursive.c:3247

4451 #, c-format

4452 msgid ""

4453 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

4454 "in %s, suggesting it should perhaps be moved to %s."

4455 msgstr ""

4456

4420 -#: merge-ort.c:1809 merge-recursive.c:3225

4457 +#: merge-ort.c:1960 merge-recursive.c:3254

4458 #, c-format

4459 msgid ""

4460 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4461 "was renamed in %s, suggesting it should perhaps be moved to %s."

4462 msgstr ""

4463

4427 -#: merge-ort.c:1952

4464 +#: merge-ort.c:2103

4465 #, c-format

4466 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4467 msgstr ""

4468

4432 -#: merge-ort.c:2047

4469 +#: merge-ort.c:2198

4470 #, c-format

4471 msgid ""

4472 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4437,75 +4474,90 @@ msgid ""

4474 "markers."

4475 msgstr ""

4476

4440 -#: merge-ort.c:2066 merge-ort.c:2090

4477 +#: merge-ort.c:2217 merge-ort.c:2241

4478 #, c-format

4479 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4480 msgstr ""

4481

4445 -#: merge-ort.c:2735

4482 +#: merge-ort.c:2550 merge-recursive.c:3002

4483 +#, c-format

4484 +msgid "cannot read object %s"

4485 +msgstr ""

4486 +

4487 +#: merge-ort.c:2553 merge-recursive.c:3005

4488 +#, c-format

4489 +msgid "object %s is not a blob"

4490 +msgstr ""

4491 +

4492 +#: merge-ort.c:2981

4493 #, c-format

4494 msgid ""

4495 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4496 "%s instead."

4497 msgstr ""

4498

4452 -#: merge-ort.c:2808

4499 +#: merge-ort.c:3055

4500 #, c-format

4501 msgid ""

4455 -"CONFLICT (distinct types): %s had different types on each side; renamed %s "

4502 +"CONFLICT (distinct types): %s had different types on each side; renamed both "

4503 "of them so each can be recorded somewhere."

4504 msgstr ""

4505

4459 -#: merge-ort.c:2812

4460 -msgid "both"

4461 -msgstr ""

4462 -

4463 -#: merge-ort.c:2812

4464 -msgid "one"

4506 +#: merge-ort.c:3062

4507 +#, c-format

4508 +msgid ""

4509 +"CONFLICT (distinct types): %s had different types on each side; renamed one "

4510 +"of them so each can be recorded somewhere."

4511 msgstr ""

4512

4467 -#: merge-ort.c:2907 merge-recursive.c:3052

4513 +#: merge-ort.c:3162 merge-recursive.c:3081

4514 msgid "content"

4515 msgstr ""

4516

4471 -#: merge-ort.c:2909 merge-recursive.c:3056

4517 +#: merge-ort.c:3164 merge-recursive.c:3085

4518 msgid "add/add"

4519 msgstr ""

4520

4475 -#: merge-ort.c:2911 merge-recursive.c:3101

4521 +#: merge-ort.c:3166 merge-recursive.c:3130

4522 msgid "submodule"

4523 msgstr ""

4524

4479 -#: merge-ort.c:2913 merge-recursive.c:3102

4525 +#: merge-ort.c:3168 merge-recursive.c:3131

4526 #, c-format

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

4528 msgstr ""

4529

4484 -#: merge-ort.c:2938

4530 +#: merge-ort.c:3198

4531 #, c-format

4532 msgid ""

4533 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4534 "of %s left in tree."

4535 msgstr ""

4536

4537 +#: merge-ort.c:3433

4538 +#, c-format

4539 +msgid ""

4540 +"Note: %s not up to date and in way of checking out conflicted version; old "

4541 +"copy renamed to %s"

4542 +msgstr ""

4543 +

4544 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4545 #. base, and 2-3) the trees for the two trees we're merging.

4546 #.

4494 -#: merge-ort.c:3406

4547 +#: merge-ort.c:3730

4548 #, c-format

4549 msgid "collecting merge info failed for trees %s, %s, %s"

4550 msgstr ""

4551

4499 -#: merge-ort-wrappers.c:13 merge-recursive.c:3661

4552 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699

4553 #, c-format

4554 msgid ""

4555 "Your local changes to the following files would be overwritten by merge:\n"

4556 " %s"

4557 msgstr ""

4558

4506 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4507 -#, c-format

4508 -msgid "Already up to date!"

4559 +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

4560 +msgid "Already up to date."

4561 msgstr ""

4562

4563 #: merge-recursive.c:356

@@ -4522,162 +4574,162 @@ msgstr ""

4574 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4575 msgstr ""

4576

4525 -#: merge-recursive.c:874

4577 +#: merge-recursive.c:876

4578 #, c-format

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

4580 msgstr ""

4581

4530 -#: merge-recursive.c:885

4582 +#: merge-recursive.c:887

4583 #, c-format

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

4585 msgstr ""

4586

4535 -#: merge-recursive.c:899 merge-recursive.c:918

4587 +#: merge-recursive.c:901 merge-recursive.c:920

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

4589 msgstr ""

4590

4539 -#: merge-recursive.c:908

4591 +#: merge-recursive.c:910

4592 #, c-format

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

4594 msgstr ""

4595

4544 -#: merge-recursive.c:949 builtin/cat-file.c:41

4596 +#: merge-recursive.c:951 builtin/cat-file.c:41

4597 #, c-format

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

4599 msgstr ""

4600

4549 -#: merge-recursive.c:954

4601 +#: merge-recursive.c:956

4602 #, c-format

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

4604 msgstr ""

4605

4554 -#: merge-recursive.c:979

4606 +#: merge-recursive.c:981

4607 #, c-format

4608 msgid "failed to open '%s': %s"

4609 msgstr ""

4610

4559 -#: merge-recursive.c:990

4611 +#: merge-recursive.c:992

4612 #, c-format

4613 msgid "failed to symlink '%s': %s"

4614 msgstr ""

4615

4564 -#: merge-recursive.c:995

4616 +#: merge-recursive.c:997

4617 #, c-format

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

4619 msgstr ""

4620

4569 -#: merge-recursive.c:1213 merge-recursive.c:1225

4621 +#: merge-recursive.c:1227 merge-recursive.c:1239

4622 #, c-format

4623 msgid "Fast-forwarding submodule %s to the following commit:"

4624 msgstr ""

4625

4574 -#: merge-recursive.c:1216 merge-recursive.c:1228

4626 +#: merge-recursive.c:1230 merge-recursive.c:1242

4627 #, c-format

4628 msgid "Fast-forwarding submodule %s"

4629 msgstr ""

4630

4579 -#: merge-recursive.c:1251

4631 +#: merge-recursive.c:1265

4632 #, c-format

4633 msgid "Failed to merge submodule %s (merge following commits not found)"

4634 msgstr ""

4635

4584 -#: merge-recursive.c:1255

4636 +#: merge-recursive.c:1269

4637 #, c-format

4638 msgid "Failed to merge submodule %s (not fast-forward)"

4639 msgstr ""

4640

4589 -#: merge-recursive.c:1256

4641 +#: merge-recursive.c:1270

4642 msgid "Found a possible merge resolution for the submodule:\n"

4643 msgstr ""

4644

4593 -#: merge-recursive.c:1268

4645 +#: merge-recursive.c:1282

4646 #, c-format

4647 msgid "Failed to merge submodule %s (multiple merges found)"

4648 msgstr ""

4649

4598 -#: merge-recursive.c:1402

4650 +#: merge-recursive.c:1424

4651 #, c-format

4652 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4653 msgstr ""

4654

4603 -#: merge-recursive.c:1474

4655 +#: merge-recursive.c:1496

4656 #, c-format

4657 msgid ""

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

4659 "in tree."

4660 msgstr ""

4661

4610 -#: merge-recursive.c:1479

4662 +#: merge-recursive.c:1501

4663 #, c-format

4664 msgid ""

4665 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4666 "left in tree."

4667 msgstr ""

4668

4617 -#: merge-recursive.c:1486

4669 +#: merge-recursive.c:1508

4670 #, c-format

4671 msgid ""

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

4673 "in tree at %s."

4674 msgstr ""

4675

4624 -#: merge-recursive.c:1491

4676 +#: merge-recursive.c:1513

4677 #, c-format

4678 msgid ""

4679 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4680 "left in tree at %s."

4681 msgstr ""

4682

4631 -#: merge-recursive.c:1526

4683 +#: merge-recursive.c:1548

4684 msgid "rename"

4685 msgstr ""

4686

4635 -#: merge-recursive.c:1526

4687 +#: merge-recursive.c:1548

4688 msgid "renamed"

4689 msgstr ""

4690

4639 -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

4691 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

4692 #, c-format

4693 msgid "Refusing to lose dirty file at %s"

4694 msgstr ""

4695

4644 -#: merge-recursive.c:1587

4696 +#: merge-recursive.c:1609

4697 #, c-format

4698 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4699 msgstr ""

4700

4649 -#: merge-recursive.c:1645

4701 +#: merge-recursive.c:1667

4702 #, c-format

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

4704 msgstr ""

4705

4654 -#: merge-recursive.c:1676

4706 +#: merge-recursive.c:1698

4707 #, c-format

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

4709 msgstr ""

4710

4659 -#: merge-recursive.c:1681

4711 +#: merge-recursive.c:1703

4712 #, c-format

4713 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4714 msgstr ""

4715

4664 -#: merge-recursive.c:1708

4716 +#: merge-recursive.c:1730

4717 #, c-format

4718 msgid ""

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

4720 "\"->\"%s\" in \"%s\"%s"

4721 msgstr ""

4722

4671 -#: merge-recursive.c:1713

4723 +#: merge-recursive.c:1735

4724 msgid " (left unresolved)"

4725 msgstr ""

4726

4675 -#: merge-recursive.c:1805

4727 +#: merge-recursive.c:1827

4728 #, c-format

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

4730 msgstr ""

4731

4680 -#: merge-recursive.c:2068

4732 +#: merge-recursive.c:2090

4733 #, c-format

4734 msgid ""

4735 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4685,96 +4737,86 @@ msgid ""

4737 "getting a majority of the files."

4738 msgstr ""

4739

4688 -#: merge-recursive.c:2202

4740 +#: merge-recursive.c:2224

4741 #, c-format

4742 msgid ""

4743 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

4744 ">%s in %s"

4745 msgstr ""

4746

4695 -#: merge-recursive.c:2973

4696 -#, c-format

4697 -msgid "cannot read object %s"

4698 -msgstr ""

4699 -

4700 -#: merge-recursive.c:2976

4701 -#, c-format

4702 -msgid "object %s is not a blob"

4703 -msgstr ""

4704 -

4705 -#: merge-recursive.c:3040

4747 +#: merge-recursive.c:3069

4748 msgid "modify"

4749 msgstr ""

4750

4709 -#: merge-recursive.c:3040

4751 +#: merge-recursive.c:3069

4752 msgid "modified"

4753 msgstr ""

4754

4713 -#: merge-recursive.c:3079

4755 +#: merge-recursive.c:3108

4756 #, c-format

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

4758 msgstr ""

4759

4718 -#: merge-recursive.c:3132

4760 +#: merge-recursive.c:3161

4761 #, c-format

4762 msgid "Adding as %s instead"

4763 msgstr ""

4764

4723 -#: merge-recursive.c:3339

4765 +#: merge-recursive.c:3368

4766 #, c-format

4767 msgid "Removing %s"

4768 msgstr ""

4769

4728 -#: merge-recursive.c:3362

4770 +#: merge-recursive.c:3391

4771 msgid "file/directory"

4772 msgstr ""

4773

4732 -#: merge-recursive.c:3367

4774 +#: merge-recursive.c:3396

4775 msgid "directory/file"

4776 msgstr ""

4777

4736 -#: merge-recursive.c:3374

4778 +#: merge-recursive.c:3403

4779 #, c-format

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

4781 msgstr ""

4782

4741 -#: merge-recursive.c:3383

4783 +#: merge-recursive.c:3412

4784 #, c-format

4785 msgid "Adding %s"

4786 msgstr ""

4787

4746 -#: merge-recursive.c:3392

4788 +#: merge-recursive.c:3421

4789 #, c-format

4790 msgid "CONFLICT (add/add): Merge conflict in %s"

4791 msgstr ""

4792

4751 -#: merge-recursive.c:3445

4793 +#: merge-recursive.c:3474

4794 #, c-format

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

4796 msgstr ""

4797

4756 -#: merge-recursive.c:3539

4798 +#: merge-recursive.c:3568

4799 msgid "Merging:"

4800 msgstr ""

4801

4760 -#: merge-recursive.c:3552

4802 +#: merge-recursive.c:3581

4803 #, c-format

4804 msgid "found %u common ancestor:"

4805 msgid_plural "found %u common ancestors:"

4806 msgstr[0] ""

4807 msgstr[1] ""

4808

4767 -#: merge-recursive.c:3602

4809 +#: merge-recursive.c:3631

4810 msgid "merge returned no commit"

4811 msgstr ""

4812

4771 -#: merge-recursive.c:3758

4813 +#: merge-recursive.c:3796

4814 #, c-format

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

4816 msgstr ""

4817

4776 -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896

4777 -#: builtin/stash.c:471

4818 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

4819 +#: builtin/stash.c:473

4820 msgid "Unable to write index."

4821 msgstr ""

4822

@@ -4782,176 +4824,195 @@ msgstr ""

4824 msgid "failed to read the cache"

4825 msgstr ""

4826

4785 -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917

4786 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817

4787 -#: builtin/stash.c:265

4827 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

4828 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

4829 +#: builtin/stash.c:267

4830 msgid "unable to write new index file"

4831 msgstr ""

4832

4791 -#: midx.c:62

4833 +#: midx.c:74

4834 msgid "multi-pack-index OID fanout is of the wrong size"

4835 msgstr ""

4836

4795 -#: midx.c:93

4837 +#: midx.c:105

4838 #, c-format

4839 msgid "multi-pack-index file %s is too small"

4840 msgstr ""

4841

4800 -#: midx.c:109

4842 +#: midx.c:121

4843 #, c-format

4844 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4845 msgstr ""

4846

4805 -#: midx.c:114

4847 +#: midx.c:126

4848 #, c-format

4849 msgid "multi-pack-index version %d not recognized"

4850 msgstr ""

4851

4810 -#: midx.c:119

4852 +#: midx.c:131

4853 #, c-format

4854 msgid "multi-pack-index hash version %u does not match version %u"

4855 msgstr ""

4856

4815 -#: midx.c:136

4857 +#: midx.c:148

4858 msgid "multi-pack-index missing required pack-name chunk"

4859 msgstr ""

4860

4819 -#: midx.c:138

4861 +#: midx.c:150

4862 msgid "multi-pack-index missing required OID fanout chunk"

4863 msgstr ""

4864

4823 -#: midx.c:140

4865 +#: midx.c:152

4866 msgid "multi-pack-index missing required OID lookup chunk"

4867 msgstr ""

4868

4827 -#: midx.c:142

4869 +#: midx.c:154

4870 msgid "multi-pack-index missing required object offsets chunk"

4871 msgstr ""

4872

4831 -#: midx.c:158

4873 +#: midx.c:170

4874 #, c-format

4875 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4876 msgstr ""

4877

4836 -#: midx.c:202

4878 +#: midx.c:214

4879 #, c-format

4880 msgid "bad pack-int-id: %u (%u total packs)"

4881 msgstr ""

4882

4841 -#: midx.c:252

4883 +#: midx.c:264

4884 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4885 msgstr ""

4886

4845 -#: midx.c:467

4887 +#: midx.c:490

4888 #, c-format

4889 msgid "failed to add packfile '%s'"

4890 msgstr ""

4891

4850 -#: midx.c:473

4892 +#: midx.c:496

4893 #, c-format

4894 msgid "failed to open pack-index '%s'"

4895 msgstr ""

4896

4855 -#: midx.c:533

4897 +#: midx.c:564

4898 #, c-format

4899 msgid "failed to locate object %d in packfile"

4900 msgstr ""

4901

4860 -#: midx.c:821

4902 +#: midx.c:880 builtin/index-pack.c:1535

4903 +msgid "cannot store reverse index file"

4904 +msgstr ""

4905 +

4906 +#: midx.c:933

4907 msgid "Adding packfiles to multi-pack-index"

4908 msgstr ""

4909

4864 -#: midx.c:855

4910 +#: midx.c:979

4911 #, c-format

4912 msgid "did not see pack-file %s to drop"

4913 msgstr ""

4914

4869 -#: midx.c:904

4915 +#: midx.c:1024

4916 +#, c-format

4917 +msgid "unknown preferred pack: '%s'"

4918 +msgstr ""

4919 +

4920 +#: midx.c:1029

4921 +#, c-format

4922 +msgid "preferred pack '%s' is expired"

4923 +msgstr ""

4924 +

4925 +#: midx.c:1045

4926 msgid "no pack files to index."

4927 msgstr ""

4928

4873 -#: midx.c:965

4929 +#: midx.c:1125 builtin/clean.c:37

4930 +#, c-format

4931 +msgid "failed to remove %s"

4932 +msgstr ""

4933 +

4934 +#: midx.c:1156

4935 #, c-format

4936 msgid "failed to clear multi-pack-index at %s"

4937 msgstr ""

4938

4878 -#: midx.c:1021

4939 +#: midx.c:1214

4940 msgid "multi-pack-index file exists, but failed to parse"

4941 msgstr ""

4942

4882 -#: midx.c:1029

4943 +#: midx.c:1222

4944 msgid "Looking for referenced packfiles"

4945 msgstr ""

4946

4886 -#: midx.c:1044

4947 +#: midx.c:1237

4948 #, c-format

4949 msgid ""

4950 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4951 msgstr ""

4952

4892 -#: midx.c:1049

4953 +#: midx.c:1242

4954 msgid "the midx contains no oid"

4955 msgstr ""

4956

4896 -#: midx.c:1058

4957 +#: midx.c:1251

4958 msgid "Verifying OID order in multi-pack-index"

4959 msgstr ""

4960

4900 -#: midx.c:1067

4961 +#: midx.c:1260

4962 #, c-format

4963 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4964 msgstr ""

4965

4905 -#: midx.c:1087

4966 +#: midx.c:1280

4967 msgid "Sorting objects by packfile"

4968 msgstr ""

4969

4909 -#: midx.c:1094

4970 +#: midx.c:1287

4971 msgid "Verifying object offsets"

4972 msgstr ""

4973

4913 -#: midx.c:1110

4974 +#: midx.c:1303

4975 #, c-format

4976 msgid "failed to load pack entry for oid[%d] = %s"

4977 msgstr ""

4978

4918 -#: midx.c:1116

4979 +#: midx.c:1309

4980 #, c-format

4981 msgid "failed to load pack-index for packfile %s"

4982 msgstr ""

4983

4923 -#: midx.c:1125

4984 +#: midx.c:1318

4985 #, c-format

4986 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4987 msgstr ""

4988

4928 -#: midx.c:1150

4989 +#: midx.c:1343

4990 msgid "Counting referenced objects"

4991 msgstr ""

4992

4932 -#: midx.c:1160

4993 +#: midx.c:1353

4994 msgid "Finding and deleting unreferenced packfiles"

4995 msgstr ""

4996

4936 -#: midx.c:1351

4997 +#: midx.c:1544

4998 msgid "could not start pack-objects"

4999 msgstr ""

5000

4940 -#: midx.c:1371

5001 +#: midx.c:1564

5002 msgid "could not finish pack-objects"

5003 msgstr ""

5004

4944 -#: name-hash.c:538

5005 +#: name-hash.c:542

5006 #, c-format

5007 msgid "unable to create lazy_dir thread: %s"

5008 msgstr ""

5009

4949 -#: name-hash.c:560

5010 +#: name-hash.c:564

5011 #, c-format

5012 msgid "unable to create lazy_name thread: %s"

5013 msgstr ""

5014

4954 -#: name-hash.c:566

5015 +#: name-hash.c:570

5016 #, c-format

5017 msgid "unable to join lazy_name thread: %s"

5018 msgstr ""

@@ -4992,256 +5053,256 @@ msgstr ""

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

5054 msgstr ""

5055

4995 -#: object-file.c:480

5056 +#: object-file.c:526

5057 #, c-format

5058 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5059 msgstr ""

5060

5000 -#: object-file.c:531

5061 +#: object-file.c:577

5062 #, c-format

5063 msgid "unable to normalize alternate object path: %s"

5064 msgstr ""

5065

5005 -#: object-file.c:603

5066 +#: object-file.c:649

5067 #, c-format

5068 msgid "%s: ignoring alternate object stores, nesting too deep"

5069 msgstr ""

5070

5010 -#: object-file.c:610

5071 +#: object-file.c:656

5072 #, c-format

5073 msgid "unable to normalize object directory: %s"

5074 msgstr ""

5075

5015 -#: object-file.c:653

5076 +#: object-file.c:699

5077 msgid "unable to fdopen alternates lockfile"

5078 msgstr ""

5079

5019 -#: object-file.c:671

5080 +#: object-file.c:717

5081 msgid "unable to read alternates file"

5082 msgstr ""

5083

5023 -#: object-file.c:678

5084 +#: object-file.c:724

5085 msgid "unable to move new alternates file into place"

5086 msgstr ""

5087

5027 -#: object-file.c:713

5088 +#: object-file.c:759

5089 #, c-format

5090 msgid "path '%s' does not exist"

5091 msgstr ""

5092

5032 -#: object-file.c:734

5093 +#: object-file.c:780

5094 #, c-format

5095 msgid "reference repository '%s' as a linked checkout is not supported yet."

5096 msgstr ""

5097

5037 -#: object-file.c:740

5098 +#: object-file.c:786

5099 #, c-format

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

5101 msgstr ""

5102

5042 -#: object-file.c:746

5103 +#: object-file.c:792

5104 #, c-format

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

5106 msgstr ""

5107

5047 -#: object-file.c:754

5108 +#: object-file.c:800

5109 #, c-format

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

5111 msgstr ""

5112

5052 -#: object-file.c:814

5113 +#: object-file.c:860

5114 #, c-format

5115 msgid "invalid line while parsing alternate refs: %s"

5116 msgstr ""

5117

5057 -#: object-file.c:964

5118 +#: object-file.c:1010

5119 #, c-format

5120 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5121 msgstr ""

5122

5062 -#: object-file.c:985

5123 +#: object-file.c:1031

5124 msgid "mmap failed"

5125 msgstr ""

5126

5066 -#: object-file.c:1149

5127 +#: object-file.c:1195

5128 #, c-format

5129 msgid "object file %s is empty"

5130 msgstr ""

5131

5071 -#: object-file.c:1284 object-file.c:2477

5132 +#: object-file.c:1330 object-file.c:2524

5133 #, c-format

5134 msgid "corrupt loose object '%s'"

5135 msgstr ""

5136

5076 -#: object-file.c:1286 object-file.c:2481

5137 +#: object-file.c:1332 object-file.c:2528

5138 #, c-format

5139 msgid "garbage at end of loose object '%s'"

5140 msgstr ""

5141

5081 -#: object-file.c:1328

5142 +#: object-file.c:1374

5143 msgid "invalid object type"

5144 msgstr ""

5145

5085 -#: object-file.c:1412

5146 +#: object-file.c:1458

5147 #, c-format

5148 msgid "unable to unpack %s header with --allow-unknown-type"

5149 msgstr ""

5150

5090 -#: object-file.c:1415

5151 +#: object-file.c:1461

5152 #, c-format

5153 msgid "unable to unpack %s header"

5154 msgstr ""

5155

5095 -#: object-file.c:1421

5156 +#: object-file.c:1467

5157 #, c-format

5158 msgid "unable to parse %s header with --allow-unknown-type"

5159 msgstr ""

5160

5100 -#: object-file.c:1424

5161 +#: object-file.c:1470

5162 #, c-format

5163 msgid "unable to parse %s header"

5164 msgstr ""

5165

5105 -#: object-file.c:1651

5166 +#: object-file.c:1697

5167 #, c-format

5168 msgid "failed to read object %s"

5169 msgstr ""

5170

5110 -#: object-file.c:1655

5171 +#: object-file.c:1701

5172 #, c-format

5173 msgid "replacement %s not found for %s"

5174 msgstr ""

5175

5115 -#: object-file.c:1659

5176 +#: object-file.c:1705

5177 #, c-format

5178 msgid "loose object %s (stored in %s) is corrupt"

5179 msgstr ""

5180

5120 -#: object-file.c:1663

5181 +#: object-file.c:1709

5182 #, c-format

5183 msgid "packed object %s (stored in %s) is corrupt"

5184 msgstr ""

5185

5125 -#: object-file.c:1768

5186 +#: object-file.c:1814

5187 #, c-format

5188 msgid "unable to write file %s"

5189 msgstr ""

5190

5130 -#: object-file.c:1775

5191 +#: object-file.c:1821

5192 #, c-format

5193 msgid "unable to set permission to '%s'"

5194 msgstr ""

5195

5135 -#: object-file.c:1782

5196 +#: object-file.c:1828

5197 msgid "file write error"

5198 msgstr ""

5199

5139 -#: object-file.c:1802

5200 +#: object-file.c:1848

5201 msgid "error when closing loose object file"

5202 msgstr ""

5203

5143 -#: object-file.c:1867

5204 +#: object-file.c:1913

5205 #, c-format

5206 msgid "insufficient permission for adding an object to repository database %s"

5207 msgstr ""

5208

5148 -#: object-file.c:1869

5209 +#: object-file.c:1915

5210 msgid "unable to create temporary file"

5211 msgstr ""

5212

5152 -#: object-file.c:1893

5213 +#: object-file.c:1939

5214 msgid "unable to write loose object file"

5215 msgstr ""

5216

5156 -#: object-file.c:1899

5217 +#: object-file.c:1945

5218 #, c-format

5219 msgid "unable to deflate new object %s (%d)"

5220 msgstr ""

5221

5161 -#: object-file.c:1903

5222 +#: object-file.c:1949

5223 #, c-format

5224 msgid "deflateEnd on object %s failed (%d)"

5225 msgstr ""

5226

5166 -#: object-file.c:1907

5227 +#: object-file.c:1953

5228 #, c-format

5229 msgid "confused by unstable object source data for %s"

5230 msgstr ""

5231

5171 -#: object-file.c:1917 builtin/pack-objects.c:1097

5232 +#: object-file.c:1963 builtin/pack-objects.c:1097

5233 #, c-format

5234 msgid "failed utime() on %s"

5235 msgstr ""

5236

5176 -#: object-file.c:1994

5237 +#: object-file.c:2040

5238 #, c-format

5239 msgid "cannot read object for %s"

5240 msgstr ""

5241

5181 -#: object-file.c:2045

5242 +#: object-file.c:2091

5243 msgid "corrupt commit"

5244 msgstr ""

5245

5185 -#: object-file.c:2053

5246 +#: object-file.c:2099

5247 msgid "corrupt tag"

5248 msgstr ""

5249

5189 -#: object-file.c:2153

5250 +#: object-file.c:2199

5251 #, c-format

5252 msgid "read error while indexing %s"

5253 msgstr ""

5254

5194 -#: object-file.c:2156

5255 +#: object-file.c:2202

5256 #, c-format

5257 msgid "short read while indexing %s"

5258 msgstr ""

5259

5199 -#: object-file.c:2229 object-file.c:2239

5260 +#: object-file.c:2275 object-file.c:2285

5261 #, c-format

5262 msgid "%s: failed to insert into database"

5263 msgstr ""

5264

5204 -#: object-file.c:2245

5265 +#: object-file.c:2291

5266 #, c-format

5267 msgid "%s: unsupported file type"

5268 msgstr ""

5269

5209 -#: object-file.c:2269

5270 +#: object-file.c:2315

5271 #, c-format

5272 msgid "%s is not a valid object"

5273 msgstr ""

5274

5214 -#: object-file.c:2271

5275 +#: object-file.c:2317

5276 #, c-format

5277 msgid "%s is not a valid '%s' object"

5278 msgstr ""

5279

5219 -#: object-file.c:2298 builtin/index-pack.c:192

5280 +#: object-file.c:2344 builtin/index-pack.c:192

5281 #, c-format

5282 msgid "unable to open %s"

5283 msgstr ""

5284

5224 -#: object-file.c:2488 object-file.c:2541

5285 +#: object-file.c:2535 object-file.c:2588

5286 #, c-format

5287 msgid "hash mismatch for %s (expected %s)"

5288 msgstr ""

5289

5229 -#: object-file.c:2512

5290 +#: object-file.c:2559

5291 #, c-format

5292 msgid "unable to mmap %s"

5293 msgstr ""

5294

5234 -#: object-file.c:2517

5295 +#: object-file.c:2564

5296 #, c-format

5297 msgid "unable to unpack header of %s"

5298 msgstr ""

5299

5239 -#: object-file.c:2523

5300 +#: object-file.c:2570

5301 #, c-format

5302 msgid "unable to parse header of %s"

5303 msgstr ""

5304

5244 -#: object-file.c:2534

5305 +#: object-file.c:2581

5306 #, c-format

5307 msgid "unable to unpack contents of %s"

5308 msgstr ""

@@ -5338,71 +5399,71 @@ msgstr ""

5399 msgid "object %s is a %s, not a %s"

5400 msgstr ""

5401

5341 -#: object.c:233

5402 +#: object.c:232

5403 #, c-format

5404 msgid "object %s has unknown type id %d"

5405 msgstr ""

5406

5346 -#: object.c:246

5407 +#: object.c:245

5408 #, c-format

5409 msgid "unable to parse object: %s"

5410 msgstr ""

5411

5351 -#: object.c:266 object.c:278

5412 +#: object.c:265 object.c:277

5413 #, c-format

5414 msgid "hash mismatch %s"

5415 msgstr ""

5416

5356 -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5417 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5418 #, c-format

5419 msgid "unable to get size of %s"

5420 msgstr ""

5421

5361 -#: pack-bitmap.c:1489 builtin/rev-list.c:92

5422 +#: pack-bitmap.c:1547 builtin/rev-list.c:92

5423 #, c-format

5424 msgid "unable to get disk usage of %s"

5425 msgstr ""

5426

5366 -#: pack-revindex.c:220

5427 +#: pack-revindex.c:221

5428 #, c-format

5429 msgid "reverse-index file %s is too small"

5430 msgstr ""

5431

5371 -#: pack-revindex.c:225

5432 +#: pack-revindex.c:226

5433 #, c-format

5434 msgid "reverse-index file %s is corrupt"

5435 msgstr ""

5436

5376 -#: pack-revindex.c:233

5437 +#: pack-revindex.c:234

5438 #, c-format

5439 msgid "reverse-index file %s has unknown signature"

5440 msgstr ""

5441

5381 -#: pack-revindex.c:237

5442 +#: pack-revindex.c:238

5443 #, c-format

5444 msgid "reverse-index file %s has unsupported version %<PRIu32>"

5445 msgstr ""

5446

5386 -#: pack-revindex.c:242

5447 +#: pack-revindex.c:243

5448 #, c-format

5449 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5450 msgstr ""

5451

5391 -#: pack-write.c:236

5452 +#: pack-write.c:250

5453 msgid "cannot both write and verify reverse index"

5454 msgstr ""

5455

5395 -#: pack-write.c:257

5456 +#: pack-write.c:271

5457 #, c-format

5458 msgid "could not stat: %s"

5459 msgstr ""

5460

5400 -#: pack-write.c:269

5461 +#: pack-write.c:283

5462 #, c-format

5463 msgid "failed to make %s readable"

5464 msgstr ""

5465

5405 -#: pack-write.c:508

5466 +#: pack-write.c:522

5467 #, c-format

5468 msgid "could not write '%s' promisor file"

5469 msgstr ""

@@ -5411,12 +5472,12 @@ msgstr ""

5472 msgid "offset before end of packfile (broken .idx?)"

5473 msgstr ""

5474

5414 -#: packfile.c:1934

5475 +#: packfile.c:1937

5476 #, c-format

5477 msgid "offset before start of pack index for %s (corrupt index?)"

5478 msgstr ""

5479

5419 -#: packfile.c:1938

5480 +#: packfile.c:1941

5481 #, c-format

5482 msgid "offset beyond end of pack index for %s (truncated index?)"

5483 msgstr ""

@@ -5481,31 +5542,31 @@ msgstr ""

5542 msgid "did you mean `--%s` (with two dashes)?"

5543 msgstr ""

5544

5484 -#: parse-options.c:666 parse-options.c:971

5545 +#: parse-options.c:668 parse-options.c:988

5546 #, c-format

5547 msgid "alias of --%s"

5548 msgstr ""

5549

5489 -#: parse-options.c:862

5550 +#: parse-options.c:879

5551 #, c-format

5552 msgid "unknown option `%s'"

5553 msgstr ""

5554

5494 -#: parse-options.c:864

5555 +#: parse-options.c:881

5556 #, c-format

5557 msgid "unknown switch `%c'"

5558 msgstr ""

5559

5499 -#: parse-options.c:866

5560 +#: parse-options.c:883

5561 #, c-format

5562 msgid "unknown non-ascii option in string: `%s'"

5563 msgstr ""

5564

5504 -#: parse-options.c:890

5565 +#: parse-options.c:907

5566 msgid "..."

5567 msgstr ""

5568

5508 -#: parse-options.c:909

5569 +#: parse-options.c:926

5570 #, c-format

5571 msgid "usage: %s"

5572 msgstr ""

@@ -5513,17 +5574,17 @@ msgstr ""

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

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

5576 #.

5516 -#: parse-options.c:915

5577 +#: parse-options.c:932

5578 #, c-format

5579 msgid " or: %s"

5580 msgstr ""

5581

5521 -#: parse-options.c:918

5582 +#: parse-options.c:935

5583 #, c-format

5584 msgid " %s"

5585 msgstr ""

5586

5526 -#: parse-options.c:957

5587 +#: parse-options.c:974

5588 msgid "-NUM"

5589 msgstr ""

5590

@@ -5532,78 +5593,78 @@ msgstr ""

5593 msgid "Could not make %s writable by group"

5594 msgstr ""

5595

5535 -#: pathspec.c:130

5596 +#: pathspec.c:151

5597 msgid "Escape character '\\' not allowed as last character in attr value"

5598 msgstr ""

5599

5539 -#: pathspec.c:148

5600 +#: pathspec.c:169

5601 msgid "Only one 'attr:' specification is allowed."

5602 msgstr ""

5603

5543 -#: pathspec.c:151

5604 +#: pathspec.c:172

5605 msgid "attr spec must not be empty"

5606 msgstr ""

5607

5547 -#: pathspec.c:194

5608 +#: pathspec.c:215

5609 #, c-format

5610 msgid "invalid attribute name %s"

5611 msgstr ""

5612

5552 -#: pathspec.c:259

5613 +#: pathspec.c:280

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

5615 msgstr ""

5616

5556 -#: pathspec.c:266

5617 +#: pathspec.c:287

5618 msgid ""

5619 "global 'literal' pathspec setting is incompatible with all other global "

5620 "pathspec settings"

5621 msgstr ""

5622

5562 -#: pathspec.c:306

5623 +#: pathspec.c:327

5624 msgid "invalid parameter for pathspec magic 'prefix'"

5625 msgstr ""

5626

5566 -#: pathspec.c:327

5627 +#: pathspec.c:348

5628 #, c-format

5629 msgid "Invalid pathspec magic '%.*s' in '%s'"

5630 msgstr ""

5631

5571 -#: pathspec.c:332

5632 +#: pathspec.c:353

5633 #, c-format

5634 msgid "Missing ')' at the end of pathspec magic in '%s'"

5635 msgstr ""

5636

5576 -#: pathspec.c:370

5637 +#: pathspec.c:391

5638 #, c-format

5639 msgid "Unimplemented pathspec magic '%c' in '%s'"

5640 msgstr ""

5641

5581 -#: pathspec.c:429

5642 +#: pathspec.c:450

5643 #, c-format

5644 msgid "%s: 'literal' and 'glob' are incompatible"

5645 msgstr ""

5646

5586 -#: pathspec.c:445

5647 +#: pathspec.c:466

5648 #, c-format

5649 msgid "%s: '%s' is outside repository at '%s'"

5650 msgstr ""

5651

5591 -#: pathspec.c:521

5652 +#: pathspec.c:542

5653 #, c-format

5654 msgid "'%s' (mnemonic: '%c')"

5655 msgstr ""

5656

5596 -#: pathspec.c:531

5657 +#: pathspec.c:552

5658 #, c-format

5659 msgid "%s: pathspec magic not supported by this command: %s"

5660 msgstr ""

5661

5601 -#: pathspec.c:598

5662 +#: pathspec.c:619

5663 #, c-format

5664 msgid "pathspec '%s' is beyond a symbolic link"

5665 msgstr ""

5666

5606 -#: pathspec.c:643

5667 +#: pathspec.c:664

5668 #, c-format

5669 msgid "line is badly quoted: %s"

5670 msgstr ""

@@ -5624,7 +5685,7 @@ msgstr ""

5685 msgid "flush packet write failed"

5686 msgstr ""

5687

5627 -#: pkt-line.c:153 pkt-line.c:239

5688 +#: pkt-line.c:153 pkt-line.c:265

5689 msgid "protocol error: impossibly long line"

5690 msgstr ""

5691

@@ -5632,33 +5693,34 @@ msgstr ""

5693 msgid "packet write with format failed"

5694 msgstr ""

5695

5635 -#: pkt-line.c:203

5696 +#: pkt-line.c:204

5697 msgid "packet write failed - data exceeds max packet size"

5698 msgstr ""

5699

5639 -#: pkt-line.c:210 pkt-line.c:217

5640 -msgid "packet write failed"

5700 +#: pkt-line.c:222

5701 +#, c-format

5702 +msgid "packet write failed: %s"

5703 msgstr ""

5704

5643 -#: pkt-line.c:302

5705 +#: pkt-line.c:328 pkt-line.c:329

5706 msgid "read error"

5707 msgstr ""

5708

5647 -#: pkt-line.c:310

5709 +#: pkt-line.c:339 pkt-line.c:340

5710 msgid "the remote end hung up unexpectedly"

5711 msgstr ""

5712

5651 -#: pkt-line.c:338

5713 +#: pkt-line.c:369 pkt-line.c:371

5714 #, c-format

5715 msgid "protocol error: bad line length character: %.4s"

5716 msgstr ""

5717

5656 -#: pkt-line.c:352 pkt-line.c:357

5718 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396

5719 #, c-format

5720 msgid "protocol error: bad line length %d"

5721 msgstr ""

5722

5661 -#: pkt-line.c:373 sideband.c:165

5723 +#: pkt-line.c:413 sideband.c:165

5724 #, c-format

5725 msgid "remote error: %s"

5726 msgstr ""

@@ -5672,7 +5734,7 @@ msgstr ""

5734 msgid "unable to create threaded lstat: %s"

5735 msgstr ""

5736

5675 -#: pretty.c:984

5737 +#: pretty.c:988

5738 msgid "unable to parse --pretty format"

5739 msgstr ""

5740

@@ -5693,6 +5755,10 @@ msgstr ""

5755 msgid "promisor remote name cannot begin with '/': %s"

5756 msgstr ""

5757

5758 +#: protocol-caps.c:103

5759 +msgid "object-info: expected flush after arguments"

5760 +msgstr ""

5761 +

5762 #: prune-packed.c:35

5763 msgid "Removing duplicate objects"

5764 msgstr ""

@@ -5705,7 +5771,7 @@ msgstr ""

5771 msgid "could not read `log` output"

5772 msgstr ""

5773

5708 -#: range-diff.c:101 sequencer.c:5318

5774 +#: range-diff.c:101 sequencer.c:5551

5775 #, c-format

5776 msgid "could not parse commit '%s'"

5777 msgstr ""

@@ -5735,196 +5801,200 @@ msgstr ""

5801 msgid "could not parse log for '%s'"

5802 msgstr ""

5803

5738 -#: read-cache.c:682

5804 +#: read-cache.c:708

5805 #, c-format

5806 msgid "will not add file alias '%s' ('%s' already exists in index)"

5807 msgstr ""

5808

5743 -#: read-cache.c:698

5809 +#: read-cache.c:724

5810 msgid "cannot create an empty blob in the object database"

5811 msgstr ""

5812

5747 -#: read-cache.c:720

5813 +#: read-cache.c:746

5814 #, c-format

5815 msgid "%s: can only add regular files, symbolic links or git-directories"

5816 msgstr ""

5817

5752 -#: read-cache.c:725

5818 +#: read-cache.c:751

5819 #, c-format

5820 msgid "'%s' does not have a commit checked out"

5821 msgstr ""

5822

5757 -#: read-cache.c:777

5823 +#: read-cache.c:803

5824 #, c-format

5825 msgid "unable to index file '%s'"

5826 msgstr ""

5827

5762 -#: read-cache.c:796

5828 +#: read-cache.c:822

5829 #, c-format

5830 msgid "unable to add '%s' to index"

5831 msgstr ""

5832

5767 -#: read-cache.c:807

5833 +#: read-cache.c:833

5834 #, c-format

5835 msgid "unable to stat '%s'"

5836 msgstr ""

5837

5772 -#: read-cache.c:1318

5838 +#: read-cache.c:1356

5839 #, c-format

5840 msgid "'%s' appears as both a file and as a directory"

5841 msgstr ""

5842

5777 -#: read-cache.c:1532

5843 +#: read-cache.c:1571

5844 msgid "Refresh index"

5845 msgstr ""

5846

5781 -#: read-cache.c:1657

5847 +#: read-cache.c:1700

5848 #, c-format

5849 msgid ""

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

5851 "Using version %i"

5852 msgstr ""

5853

5788 -#: read-cache.c:1667

5854 +#: read-cache.c:1710

5855 #, c-format

5856 msgid ""

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

5858 "Using version %i"

5859 msgstr ""

5860

5795 -#: read-cache.c:1723

5861 +#: read-cache.c:1766

5862 #, c-format

5863 msgid "bad signature 0x%08x"

5864 msgstr ""

5865

5800 -#: read-cache.c:1726

5866 +#: read-cache.c:1769

5867 #, c-format

5868 msgid "bad index version %d"

5869 msgstr ""

5870

5805 -#: read-cache.c:1735

5871 +#: read-cache.c:1778

5872 msgid "bad index file sha1 signature"

5873 msgstr ""

5874

5809 -#: read-cache.c:1765

5875 +#: read-cache.c:1812

5876 #, c-format

5877 msgid "index uses %.4s extension, which we do not understand"

5878 msgstr ""

5879

5814 -#: read-cache.c:1767

5880 +#: read-cache.c:1814

5881 #, c-format

5882 msgid "ignoring %.4s extension"

5883 msgstr ""

5884

5819 -#: read-cache.c:1804

5885 +#: read-cache.c:1851

5886 #, c-format

5887 msgid "unknown index entry format 0x%08x"

5888 msgstr ""

5889

5824 -#: read-cache.c:1820

5890 +#: read-cache.c:1867

5891 #, c-format

5892 msgid "malformed name field in the index, near path '%s'"

5893 msgstr ""

5894

5829 -#: read-cache.c:1877

5895 +#: read-cache.c:1924

5896 msgid "unordered stage entries in index"

5897 msgstr ""

5898

5833 -#: read-cache.c:1880

5899 +#: read-cache.c:1927

5900 #, c-format

5901 msgid "multiple stage entries for merged file '%s'"

5902 msgstr ""

5903

5838 -#: read-cache.c:1883

5904 +#: read-cache.c:1930

5905 #, c-format

5906 msgid "unordered stage entries for '%s'"

5907 msgstr ""

5908

5843 -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095

5844 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

5845 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

5846 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

5847 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5909 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

5910 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

5911 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

5912 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

5913 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

5914 #: builtin/submodule--helper.c:332

5915 msgid "index file corrupt"

5916 msgstr ""

5917

5852 -#: read-cache.c:2133

5918 +#: read-cache.c:2180

5919 #, c-format

5920 msgid "unable to create load_cache_entries thread: %s"

5921 msgstr ""

5922

5857 -#: read-cache.c:2146

5923 +#: read-cache.c:2193

5924 #, c-format

5925 msgid "unable to join load_cache_entries thread: %s"

5926 msgstr ""

5927

5862 -#: read-cache.c:2179

5928 +#: read-cache.c:2226

5929 #, c-format

5930 msgid "%s: index file open failed"

5931 msgstr ""

5932

5867 -#: read-cache.c:2183

5933 +#: read-cache.c:2230

5934 #, c-format

5935 msgid "%s: cannot stat the open index"

5936 msgstr ""

5937

5872 -#: read-cache.c:2187

5938 +#: read-cache.c:2234

5939 #, c-format

5940 msgid "%s: index file smaller than expected"

5941 msgstr ""

5942

5877 -#: read-cache.c:2191

5943 +#: read-cache.c:2238

5944 #, c-format

5945 msgid "%s: unable to map index file"

5946 msgstr ""

5947

5882 -#: read-cache.c:2233

5948 +#: read-cache.c:2280

5949 #, c-format

5950 msgid "unable to create load_index_extensions thread: %s"

5951 msgstr ""

5952

5887 -#: read-cache.c:2260

5953 +#: read-cache.c:2307

5954 #, c-format

5955 msgid "unable to join load_index_extensions thread: %s"

5956 msgstr ""

5957

5892 -#: read-cache.c:2292

5958 +#: read-cache.c:2345

5959 #, c-format

5960 msgid "could not freshen shared index '%s'"

5961 msgstr ""

5962

5897 -#: read-cache.c:2339

5963 +#: read-cache.c:2392

5964 #, c-format

5965 msgid "broken index, expect %s in %s, got %s"

5966 msgstr ""

5967

5902 -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

5968 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

5969 #, c-format

5970 msgid "could not close '%s'"

5971 msgstr ""

5972

5907 -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

5973 +#: read-cache.c:3138

5974 +msgid "failed to convert to a sparse-index"

5975 +msgstr ""

5976 +

5977 +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

5978 #, c-format

5979 msgid "could not stat '%s'"

5980 msgstr ""

5981

5912 -#: read-cache.c:3151

5982 +#: read-cache.c:3222

5983 #, c-format

5984 msgid "unable to open git dir: %s"

5985 msgstr ""

5986

5917 -#: read-cache.c:3163

5987 +#: read-cache.c:3234

5988 #, c-format

5989 msgid "unable to unlink: %s"

5990 msgstr ""

5991

5922 -#: read-cache.c:3188

5992 +#: read-cache.c:3263

5993 #, c-format

5994 msgid "cannot fix permission bits on '%s'"

5995 msgstr ""

5996

5927 -#: read-cache.c:3337

5997 +#: read-cache.c:3412

5998 #, c-format

5999 msgid "%s: cannot drop to stage #0"

6000 msgstr ""

@@ -5950,7 +6020,10 @@ msgid ""

6020 "r, reword <commit> = use commit, but edit the commit message\n"

6021 "e, edit <commit> = use commit, but stop for amending\n"

6022 "s, squash <commit> = use commit, but meld into previous commit\n"

5953 -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

6023 +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"

6024 +" commit's log message, unless -C is used, in which case\n"

6025 +" keep only this commit's message; -c is same as -C but\n"

6026 +" opens the editor\n"

6027 "x, exec <command> = run command (the rest of the line) using shell\n"

6028 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"

6029 "d, drop <commit> = remove commit\n"

@@ -5959,31 +6032,31 @@ msgid ""

6032 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6033 ". create a merge commit using the original merge commit's\n"

6034 ". message (or the oneline, if no original merge commit was\n"

5962 -". specified). Use -c <commit> to reword the commit message.\n"

6035 +". specified); use -c <commit> to reword the commit message\n"

6036 "\n"

6037 "These lines can be re-ordered; they are executed from top to bottom.\n"

6038 msgstr ""

6039

5967 -#: rebase-interactive.c:63

6040 +#: rebase-interactive.c:66

6041 #, c-format

6042 msgid "Rebase %s onto %s (%d command)"

6043 msgid_plural "Rebase %s onto %s (%d commands)"

6044 msgstr[0] ""

6045 msgstr[1] ""

6046

5974 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

6047 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218

6048 msgid ""

6049 "\n"

6050 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

6051 msgstr ""

6052

5980 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

6053 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222

6054 msgid ""

6055 "\n"

6056 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

6057 msgstr ""

6058

5986 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

6059 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861

6060 msgid ""

6061 "\n"

6062 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5992,33 +6065,33 @@ msgid ""

6065 "\n"

6066 msgstr ""

6067

5995 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

6068 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938

6069 msgid ""

6070 "\n"

6071 "However, if you remove everything, the rebase will be aborted.\n"

6072 "\n"

6073 msgstr ""

6074

6002 -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615

6003 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272

6075 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6076 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6077 #, c-format

6078 msgid "could not write '%s'"

6079 msgstr ""

6080

6008 -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230

6009 -#: builtin/rebase.c:254

6081 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229

6082 +#: builtin/rebase.c:253

6083 #, c-format

6084 msgid "could not write '%s'."

6085 msgstr ""

6086

6014 -#: rebase-interactive.c:193

6087 +#: rebase-interactive.c:196

6088 #, c-format

6089 msgid ""

6090 "Warning: some commits may have been dropped accidentally.\n"

6091 "Dropped commits (newer to older):\n"

6092 msgstr ""

6093

6021 -#: rebase-interactive.c:200

6094 +#: rebase-interactive.c:203

6095 #, c-format

6096 msgid ""

6097 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -6029,14 +6102,14 @@ msgid ""

6102 "\n"

6103 msgstr ""

6104

6032 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402

6033 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241

6034 -#: builtin/rebase.c:266

6105 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597

6106 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240

6107 +#: builtin/rebase.c:265

6108 #, c-format

6109 msgid "could not read '%s'."

6110 msgstr ""

6111

6039 -#: ref-filter.c:42 wt-status.c:1975

6112 +#: ref-filter.c:42 wt-status.c:1978

6113 msgid "gone"

6114 msgstr ""

6115

@@ -6191,111 +6264,111 @@ msgstr ""

6264 msgid "format: %%(if) atom used without a %%(then) atom"

6265 msgstr ""

6266

6194 -#: ref-filter.c:806

6267 +#: ref-filter.c:807

6268 #, c-format

6269 msgid "format: %%(then) atom used without an %%(if) atom"

6270 msgstr ""

6271

6199 -#: ref-filter.c:808

6272 +#: ref-filter.c:809

6273 #, c-format

6274 msgid "format: %%(then) atom used more than once"

6275 msgstr ""

6276

6204 -#: ref-filter.c:810

6277 +#: ref-filter.c:811

6278 #, c-format

6279 msgid "format: %%(then) atom used after %%(else)"

6280 msgstr ""

6281

6209 -#: ref-filter.c:838

6282 +#: ref-filter.c:839

6283 #, c-format

6284 msgid "format: %%(else) atom used without an %%(if) atom"

6285 msgstr ""

6286

6214 -#: ref-filter.c:840

6287 +#: ref-filter.c:841

6288 #, c-format

6289 msgid "format: %%(else) atom used without a %%(then) atom"

6290 msgstr ""

6291

6219 -#: ref-filter.c:842

6292 +#: ref-filter.c:843

6293 #, c-format

6294 msgid "format: %%(else) atom used more than once"

6295 msgstr ""

6296

6224 -#: ref-filter.c:857

6297 +#: ref-filter.c:858

6298 #, c-format

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

6300 msgstr ""

6301

6229 -#: ref-filter.c:914

6302 +#: ref-filter.c:915

6303 #, c-format

6304 msgid "malformed format string %s"

6305 msgstr ""

6306

6234 -#: ref-filter.c:1555

6307 +#: ref-filter.c:1556

6308 #, c-format

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

6310 msgstr ""

6311

6239 -#: ref-filter.c:1558

6312 +#: ref-filter.c:1559

6313 #, c-format

6314 msgid "(no branch, rebasing detached HEAD %s)"

6315 msgstr ""

6316

6244 -#: ref-filter.c:1561

6317 +#: ref-filter.c:1562

6318 #, c-format

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

6320 msgstr ""

6321

6249 -#: ref-filter.c:1565

6322 +#: ref-filter.c:1566

6323 #, c-format

6324 msgid "(HEAD detached at %s)"

6325 msgstr ""

6326

6254 -#: ref-filter.c:1568

6327 +#: ref-filter.c:1569

6328 #, c-format

6329 msgid "(HEAD detached from %s)"

6330 msgstr ""

6331

6259 -#: ref-filter.c:1571

6332 +#: ref-filter.c:1572

6333 msgid "(no branch)"

6334 msgstr ""

6335

6263 -#: ref-filter.c:1603 ref-filter.c:1812

6336 +#: ref-filter.c:1604 ref-filter.c:1813

6337 #, c-format

6338 msgid "missing object %s for %s"

6339 msgstr ""

6340

6268 -#: ref-filter.c:1613

6341 +#: ref-filter.c:1614

6342 #, c-format

l10n: git.pot: v2.32.0 round 1 (126 new, 26 removed)