1f511a9b56 · matheusbsbs/matheus-bagliano

@@ -8,223 +8,223 @@ 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-08-14 07:56+0800\n"

11 +"POT-Creation-Date: 2021-10-30 09:36+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"

15 "Language: \n"

16 "MIME-Version: 1.0\n"

17 -"Content-Type: text/plain; charset=CHARSET\n"

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

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

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: add-interactive.c:376

21 +#: add-interactive.c:380

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr ""

25

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

27 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

28 -#: builtin/rebase.c:1953

26 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510

27 +#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233

28 +#: builtin/rebase.c:1642

29 msgid "could not read index"

30 msgstr ""

31

32 -#: add-interactive.c:584 git-add--interactive.perl:269

32 +#: add-interactive.c:588 git-add--interactive.perl:269

33 #: git-add--interactive.perl:294

34 msgid "binary"

35 msgstr ""

36

37 -#: add-interactive.c:642 git-add--interactive.perl:278

37 +#: add-interactive.c:646 git-add--interactive.perl:278

38 #: git-add--interactive.perl:332

39 msgid "nothing"

40 msgstr ""

41

42 -#: add-interactive.c:643 git-add--interactive.perl:314

42 +#: add-interactive.c:647 git-add--interactive.perl:314

43 #: git-add--interactive.perl:329

44 msgid "unchanged"

45 msgstr ""

46

47 -#: add-interactive.c:680 git-add--interactive.perl:641

47 +#: add-interactive.c:684 git-add--interactive.perl:641

48 msgid "Update"

49 msgstr ""

50

51 -#: add-interactive.c:697 add-interactive.c:885

51 +#: add-interactive.c:701 add-interactive.c:889

52 #, c-format

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

56 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716

57 msgid "could not write index"

58 msgstr ""

59

60 -#: add-interactive.c:706 git-add--interactive.perl:626

60 +#: add-interactive.c:710 git-add--interactive.perl:626

61 #, c-format, perl-format

62 msgid "updated %d path\n"

63 msgid_plural "updated %d paths\n"

64 msgstr[0] ""

65 msgstr[1] ""

66

67 -#: add-interactive.c:724 git-add--interactive.perl:676

67 +#: add-interactive.c:728 git-add--interactive.perl:676

68 #, c-format, perl-format

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

70 msgstr ""

71

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

73 -#: builtin/reset.c:145

72 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

73 +#: builtin/reset.c:151

74 #, c-format

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

76 msgstr ""

77

78 -#: add-interactive.c:759 git-add--interactive.perl:653

78 +#: add-interactive.c:763 git-add--interactive.perl:653

79 msgid "Revert"

80 msgstr ""

81

82 -#: add-interactive.c:775

82 +#: add-interactive.c:779

83 msgid "Could not parse HEAD^{tree}"

84 msgstr ""

85

86 -#: add-interactive.c:813 git-add--interactive.perl:629

86 +#: add-interactive.c:817 git-add--interactive.perl:629

87 #, c-format, perl-format

88 msgid "reverted %d path\n"

89 msgid_plural "reverted %d paths\n"

90 msgstr[0] ""

91 msgstr[1] ""

92

93 -#: add-interactive.c:864 git-add--interactive.perl:693

93 +#: add-interactive.c:868 git-add--interactive.perl:693

94 #, c-format

95 msgid "No untracked files.\n"

96 msgstr ""

97

98 -#: add-interactive.c:868 git-add--interactive.perl:687

98 +#: add-interactive.c:872 git-add--interactive.perl:687

99 msgid "Add untracked"

100 msgstr ""

101

102 -#: add-interactive.c:895 git-add--interactive.perl:623

102 +#: add-interactive.c:899 git-add--interactive.perl:623

103 #, c-format, perl-format

104 msgid "added %d path\n"

105 msgid_plural "added %d paths\n"

106 msgstr[0] ""

107 msgstr[1] ""

108

109 -#: add-interactive.c:925

109 +#: add-interactive.c:929

110 #, c-format

111 msgid "ignoring unmerged: %s"

112 msgstr ""

113

114 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

114 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr ""

118

119 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

119 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr ""

123

124 -#: add-interactive.c:943 git-add--interactive.perl:1379

124 +#: add-interactive.c:947 git-add--interactive.perl:1379

125 msgid "Patch update"

126 msgstr ""

127

128 -#: add-interactive.c:982 git-add--interactive.perl:1792

128 +#: add-interactive.c:986 git-add--interactive.perl:1792

129 msgid "Review diff"

130 msgstr ""

131

132 -#: add-interactive.c:1010

132 +#: add-interactive.c:1014

133 msgid "show paths with changes"

134 msgstr ""

135

136 -#: add-interactive.c:1012

136 +#: add-interactive.c:1016

137 msgid "add working tree state to the staged set of changes"

138 msgstr ""

139

140 -#: add-interactive.c:1014

140 +#: add-interactive.c:1018

141 msgid "revert staged set of changes back to the HEAD version"

142 msgstr ""

143

144 -#: add-interactive.c:1016

144 +#: add-interactive.c:1020

145 msgid "pick hunks and update selectively"

146 msgstr ""

147

148 -#: add-interactive.c:1018

148 +#: add-interactive.c:1022

149 msgid "view diff between HEAD and index"

150 msgstr ""

151

152 -#: add-interactive.c:1020

152 +#: add-interactive.c:1024

153 msgid "add contents of untracked files to the staged set of changes"

154 msgstr ""

155

156 -#: add-interactive.c:1028 add-interactive.c:1077

156 +#: add-interactive.c:1032 add-interactive.c:1081

157 msgid "Prompt help:"

158 msgstr ""

159

160 -#: add-interactive.c:1030

160 +#: add-interactive.c:1034

161 msgid "select a single item"

162 msgstr ""

163

164 -#: add-interactive.c:1032

164 +#: add-interactive.c:1036

165 msgid "select a range of items"

166 msgstr ""

167

168 -#: add-interactive.c:1034

168 +#: add-interactive.c:1038

169 msgid "select multiple ranges"

170 msgstr ""

171

172 -#: add-interactive.c:1036 add-interactive.c:1081

172 +#: add-interactive.c:1040 add-interactive.c:1085

173 msgid "select item based on unique prefix"

174 msgstr ""

175

176 -#: add-interactive.c:1038

176 +#: add-interactive.c:1042

177 msgid "unselect specified items"

178 msgstr ""

179

180 -#: add-interactive.c:1040

180 +#: add-interactive.c:1044

181 msgid "choose all items"

182 msgstr ""

183

184 -#: add-interactive.c:1042

184 +#: add-interactive.c:1046

185 msgid "(empty) finish selecting"

186 msgstr ""

187

188 -#: add-interactive.c:1079

188 +#: add-interactive.c:1083

189 msgid "select a numbered item"

190 msgstr ""

191

192 -#: add-interactive.c:1083

192 +#: add-interactive.c:1087

193 msgid "(empty) select nothing"

194 msgstr ""

195

196 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

196 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr ""

199

200 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

200 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr ""

203

204 -#: add-interactive.c:1144 git-add--interactive.perl:213

204 +#: add-interactive.c:1148 git-add--interactive.perl:213

205 msgid "staged"

206 msgstr ""

207

208 -#: add-interactive.c:1144 git-add--interactive.perl:213

208 +#: add-interactive.c:1148 git-add--interactive.perl:213

209 msgid "unstaged"

210 msgstr ""

211

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

213 -#: builtin/am.c:2312 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:410 builtin/submodule--helper.c:1886

216 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

217 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

218 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

212 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

213 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

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

215 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

216 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

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

218 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

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

220 msgid "path"

221 msgstr ""

222

223 -#: add-interactive.c:1151

223 +#: add-interactive.c:1155

224 msgid "could not refresh index"

225 msgstr ""

226

227 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

227 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

228 #, c-format

229 msgid "Bye.\n"

230 msgstr ""

@@ -661,79 +661,85 @@ msgstr ""

661 msgid "'git apply' failed"

662 msgstr ""

663

664 -#: advice.c:145

664 +#: advice.c:78

665 #, c-format

666 msgid ""

667 "\n"

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

669 msgstr ""

670

671 -#: advice.c:161

671 +#: advice.c:94

672 #, c-format

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

674 msgstr ""

675

676 -#: advice.c:252

676 +#: advice.c:178

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

678 msgstr ""

679

680 -#: advice.c:254

680 +#: advice.c:180

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

682 msgstr ""

683

684 -#: advice.c:256

684 +#: advice.c:182

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

686 msgstr ""

687

688 -#: advice.c:258

688 +#: advice.c:184

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

690 msgstr ""

691

692 -#: advice.c:260

692 +#: advice.c:186

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

694 msgstr ""

695

696 -#: advice.c:262

696 +#: advice.c:188

697 #, c-format

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

699 msgstr ""

700

701 -#: advice.c:270

701 +#: advice.c:196

702 msgid ""

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

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

705 msgstr ""

706

707 -#: advice.c:278

707 +#: advice.c:204

708 msgid "Exiting because of an unresolved conflict."

709 msgstr ""

710

711 -#: advice.c:283 builtin/merge.c:1375

711 +#: advice.c:209 builtin/merge.c:1379

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

713 msgstr ""

714

715 -#: advice.c:285

715 +#: advice.c:211

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

717 msgstr ""

718

719 -#: advice.c:286

719 +#: advice.c:212

720 msgid "Exiting because of unfinished merge."

721 msgstr ""

722

723 -#: advice.c:296

723 +#: advice.c:217

724 +msgid "Not possible to fast-forward, aborting."

725 +msgstr ""

726 +

727 +#: advice.c:227

728 #, c-format

729 msgid ""

726 -"The following pathspecs didn't match any eligible path, but they do match "

727 -"index\n"

728 -"entries outside the current sparse checkout:\n"

730 +"The following paths and/or pathspecs matched paths that exist\n"

731 +"outside of your sparse-checkout definition, so will not be\n"

732 +"updated in the index:\n"

733 msgstr ""

734

731 -#: advice.c:303

735 +#: advice.c:234

736 msgid ""

733 -"Disable or modify the sparsity rules if you intend to update such entries."

737 +"If you intend to update such entries, try one of the following:\n"

738 +"* Use the --sparse option.\n"

739 +"* Disable or modify the sparsity rules."

740 msgstr ""

741

736 -#: advice.c:310

742 +#: advice.c:242

743 #, c-format

744 msgid ""

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

@@ -889,487 +895,488 @@ msgstr ""

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

896 msgstr ""

897

892 -#: apply.c:1977

898 +#: apply.c:1978

899 #, c-format

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

901 msgstr ""

902

897 -#: apply.c:2014

903 +#: apply.c:2015

904 #, c-format

905 msgid "unrecognized binary patch at line %d"

906 msgstr ""

907

902 -#: apply.c:2176

908 +#: apply.c:2177

909 #, c-format

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

911 msgstr ""

912

907 -#: apply.c:2262

913 +#: apply.c:2263

914 #, c-format

915 msgid "unable to read symlink %s"

916 msgstr ""

917

912 -#: apply.c:2266

918 +#: apply.c:2267

919 #, c-format

920 msgid "unable to open or read %s"

921 msgstr ""

922

917 -#: apply.c:2935

923 +#: apply.c:2936

924 #, c-format

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

926 msgstr ""

927

922 -#: apply.c:3056

928 +#: apply.c:3057

929 #, c-format

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

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

932 msgstr[0] ""

933 msgstr[1] ""

934

929 -#: apply.c:3068

935 +#: apply.c:3069

936 #, c-format

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

938 msgstr ""

939

934 -#: apply.c:3074

940 +#: apply.c:3075

941 #, c-format

942 msgid ""

943 "while searching for:\n"

944 "%.*s"

945 msgstr ""

946

941 -#: apply.c:3096

947 +#: apply.c:3097

948 #, c-format

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

950 msgstr ""

951

946 -#: apply.c:3104

952 +#: apply.c:3105

953 #, c-format

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

955 msgstr ""

956

951 -#: apply.c:3151

957 +#: apply.c:3152

958 #, c-format

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

960 msgstr ""

961

956 -#: apply.c:3162

962 +#: apply.c:3163

963 #, c-format

964 msgid ""

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

966 msgstr ""

967

962 -#: apply.c:3170

968 +#: apply.c:3171

969 #, c-format

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

971 msgstr ""

972

967 -#: apply.c:3188

973 +#: apply.c:3189

974 #, c-format

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

976 msgstr ""

977

972 -#: apply.c:3201

978 +#: apply.c:3202

979 #, c-format

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

981 msgstr ""

982

977 -#: apply.c:3208

983 +#: apply.c:3209

984 #, c-format

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

986 msgstr ""

987

982 -#: apply.c:3229

988 +#: apply.c:3230

989 #, c-format

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

991 msgstr ""

992

987 -#: apply.c:3352

993 +#: apply.c:3353

994 #, c-format

995 msgid "cannot checkout %s"

996 msgstr ""

997

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

998 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

999 #: setup.c:308

1000 #, c-format

1001 msgid "failed to read %s"

1002 msgstr ""

1003

998 -#: apply.c:3412

1004 +#: apply.c:3413

1005 #, c-format

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

1007 msgstr ""

1008

1003 -#: apply.c:3441 apply.c:3687

1009 +#: apply.c:3442 apply.c:3709

1010 #, c-format

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

1012 msgstr ""

1013

1008 -#: apply.c:3527 apply.c:3702

1014 +#: apply.c:3549 apply.c:3724

1015 #, c-format

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

1017 msgstr ""

1018

1013 -#: apply.c:3536 apply.c:3710 apply.c:3954

1019 +#: apply.c:3558 apply.c:3732 apply.c:3976

1020 #, c-format

1021 msgid "%s: does not match index"

1022 msgstr ""

1023

1018 -#: apply.c:3571

1024 +#: apply.c:3593

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

1026 msgstr ""

1027

1022 -#: apply.c:3574

1028 +#: apply.c:3596

1029 #, c-format

1030 msgid "Performing three-way merge...\n"

1031 msgstr ""

1032

1027 -#: apply.c:3590 apply.c:3594

1033 +#: apply.c:3612 apply.c:3616

1034 #, c-format

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

1036 msgstr ""

1037

1032 -#: apply.c:3606

1038 +#: apply.c:3628

1039 #, c-format

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

1041 msgstr ""

1042

1037 -#: apply.c:3620

1043 +#: apply.c:3642

1044 #, c-format

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

1046 msgstr ""

1047

1042 -#: apply.c:3625

1048 +#: apply.c:3647

1049 #, c-format

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

1051 msgstr ""

1052

1047 -#: apply.c:3642

1053 +#: apply.c:3664

1054 #, c-format

1055 msgid "Falling back to direct application...\n"

1056 msgstr ""

1057

1052 -#: apply.c:3654

1058 +#: apply.c:3676

1059 msgid "removal patch leaves file contents"

1060 msgstr ""

1061

1056 -#: apply.c:3727

1062 +#: apply.c:3749

1063 #, c-format

1064 msgid "%s: wrong type"

1065 msgstr ""

1066

1061 -#: apply.c:3729

1067 +#: apply.c:3751

1068 #, c-format

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

1070 msgstr ""

1071

1066 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1067 -#: read-cache.c:1353

1072 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1073 +#: read-cache.c:1368

1074 #, c-format

1075 msgid "invalid path '%s'"

1076 msgstr ""

1077

1072 -#: apply.c:3952

1078 +#: apply.c:3974

1079 #, c-format

1080 msgid "%s: already exists in index"

1081 msgstr ""

1082

1077 -#: apply.c:3956

1083 +#: apply.c:3978

1084 #, c-format

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

1086 msgstr ""

1087

1082 -#: apply.c:3976

1088 +#: apply.c:3998

1089 #, c-format

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

1091 msgstr ""

1092

1087 -#: apply.c:3981

1093 +#: apply.c:4003

1094 #, c-format

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

1096 msgstr ""

1097

1092 -#: apply.c:4001

1098 +#: apply.c:4023

1099 #, c-format

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

1101 msgstr ""

1102

1097 -#: apply.c:4005

1103 +#: apply.c:4027

1104 #, c-format

1105 msgid "%s: patch does not apply"

1106 msgstr ""

1107

1102 -#: apply.c:4020

1108 +#: apply.c:4042

1109 #, c-format

1110 msgid "Checking patch %s..."

1111 msgstr ""

1112

1107 -#: apply.c:4112

1113 +#: apply.c:4134

1114 #, c-format

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

1116 msgstr ""

1117

1112 -#: apply.c:4119

1118 +#: apply.c:4141

1119 #, c-format

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

1121 msgstr ""

1122

1117 -#: apply.c:4122

1123 +#: apply.c:4144

1124 #, c-format

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

1126 msgstr ""

1127

1122 -#: apply.c:4131

1128 +#: apply.c:4153

1129 #, c-format

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

1131 msgstr ""

1132

1127 -#: apply.c:4141

1133 +#: apply.c:4163

1134 #, c-format

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

1136 msgstr ""

1137

1132 -#: apply.c:4279

1138 +#: apply.c:4301

1139 #, c-format

1140 msgid "unable to remove %s from index"

1141 msgstr ""

1142

1137 -#: apply.c:4313

1143 +#: apply.c:4335

1144 #, c-format

1145 msgid "corrupt patch for submodule %s"

1146 msgstr ""

1147

1142 -#: apply.c:4319

1148 +#: apply.c:4341

1149 #, c-format

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

1151 msgstr ""

1152

1147 -#: apply.c:4327

1153 +#: apply.c:4349

1154 #, c-format

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

1156 msgstr ""

1157

1152 -#: apply.c:4333 apply.c:4478

1158 +#: apply.c:4355 apply.c:4500

1159 #, c-format

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

1161 msgstr ""

1162

1157 -#: apply.c:4376 builtin/bisect--helper.c:525

1163 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242

1164 +#: builtin/gc.c:2277

1165 #, c-format

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

1167 msgstr ""

1168

1162 -#: apply.c:4380

1169 +#: apply.c:4402

1170 #, c-format

1171 msgid "closing file '%s'"

1172 msgstr ""

1173

1167 -#: apply.c:4450

1174 +#: apply.c:4472

1175 #, c-format

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

1177 msgstr ""

1178

1172 -#: apply.c:4548

1179 +#: apply.c:4570

1180 #, c-format

1181 msgid "Applied patch %s cleanly."

1182 msgstr ""

1183

1177 -#: apply.c:4556

1184 +#: apply.c:4578

1185 msgid "internal error"

1186 msgstr ""

1187

1181 -#: apply.c:4559

1188 +#: apply.c:4581

1189 #, c-format

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

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

1192 msgstr[0] ""

1193 msgstr[1] ""

1194

1188 -#: apply.c:4570

1195 +#: apply.c:4592

1196 #, c-format

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

1198 msgstr ""

1199

1193 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1200 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1201 #, c-format

1202 msgid "cannot open %s"

1203 msgstr ""

1204

1198 -#: apply.c:4592

1205 +#: apply.c:4614

1206 #, c-format

1207 msgid "Hunk #%d applied cleanly."

1208 msgstr ""

1209

1203 -#: apply.c:4596

1210 +#: apply.c:4618

1211 #, c-format

1212 msgid "Rejected hunk #%d."

1213 msgstr ""

1214

1208 -#: apply.c:4725

1215 +#: apply.c:4747

1216 #, c-format

1217 msgid "Skipped patch '%s'."

1218 msgstr ""

1219

1213 -#: apply.c:4733

1220 +#: apply.c:4755

1221 msgid "unrecognized input"

1222 msgstr ""

1223

1217 -#: apply.c:4753

1224 +#: apply.c:4775

1225 msgid "unable to read index file"

1226 msgstr ""

1227

1221 -#: apply.c:4910

1228 +#: apply.c:4932

1229 #, c-format

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

1231 msgstr ""

1232

1226 -#: apply.c:4937

1233 +#: apply.c:4959

1234 #, c-format

1235 msgid "squelched %d whitespace error"

1236 msgid_plural "squelched %d whitespace errors"

1237 msgstr[0] ""

1238 msgstr[1] ""

1239

1233 -#: apply.c:4943 apply.c:4958

1240 +#: apply.c:4965 apply.c:4980

1241 #, c-format

1242 msgid "%d line adds whitespace errors."

1243 msgid_plural "%d lines add whitespace errors."

1244 msgstr[0] ""

1245 msgstr[1] ""

1246

1240 -#: apply.c:4951

1247 +#: apply.c:4973

1248 #, c-format

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

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

1251 msgstr[0] ""

1252 msgstr[1] ""

1253

1247 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1254 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1255 msgid "Unable to write new index file"

1256 msgstr ""

1257

1251 -#: apply.c:4995

1258 +#: apply.c:5017

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

1260 msgstr ""

1261

1255 -#: apply.c:4998

1262 +#: apply.c:5020

1263 msgid "apply changes matching the given path"

1264 msgstr ""

1265

1259 -#: apply.c:5000 builtin/am.c:2318

1266 +#: apply.c:5022 builtin/am.c:2320

1267 msgid "num"

1268 msgstr ""

1269

1263 -#: apply.c:5001

1270 +#: apply.c:5023

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

1272 msgstr ""

1273

1267 -#: apply.c:5004

1274 +#: apply.c:5026

1275 msgid "ignore additions made by the patch"

1276 msgstr ""

1277

1271 -#: apply.c:5006

1278 +#: apply.c:5028

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

1280 msgstr ""

1281

1275 -#: apply.c:5010

1282 +#: apply.c:5032

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

1284 msgstr ""

1285

1279 -#: apply.c:5012

1286 +#: apply.c:5034

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

1288 msgstr ""

1289

1283 -#: apply.c:5014

1290 +#: apply.c:5036

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

1292 msgstr ""

1293

1287 -#: apply.c:5016

1294 +#: apply.c:5038

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

1296 msgstr ""

1297

1291 -#: apply.c:5018

1298 +#: apply.c:5040

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

1300 msgstr ""

1301

1295 -#: apply.c:5020

1302 +#: apply.c:5042

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

1304 msgstr ""

1305

1299 -#: apply.c:5022

1306 +#: apply.c:5044

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

1308 msgstr ""

1309

1303 -#: apply.c:5025

1310 +#: apply.c:5047

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

1312 msgstr ""

1313

1307 -#: apply.c:5027

1314 +#: apply.c:5049

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

1316 msgstr ""

1317

1311 -#: apply.c:5029

1318 +#: apply.c:5051

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

1320 msgstr ""

1321

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

1322 +#: apply.c:5054 builtin/checkout-index.c:196

1323 msgid "paths are separated with NUL character"

1324 msgstr ""

1325

1319 -#: apply.c:5034

1326 +#: apply.c:5056

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

1328 msgstr ""

1329

1323 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1330 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1331 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1325 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1326 -#: builtin/rebase.c:1347

1332 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1333 +#: builtin/rebase.c:1051

1334 msgid "action"

1335 msgstr ""

1336

1330 -#: apply.c:5036

1337 +#: apply.c:5058

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

1339 msgstr ""

1340

1334 -#: apply.c:5039 apply.c:5042

1341 +#: apply.c:5061 apply.c:5064

1342 msgid "ignore changes in whitespace when finding context"

1343 msgstr ""

1344

1338 -#: apply.c:5045

1345 +#: apply.c:5067

1346 msgid "apply the patch in reverse"

1347 msgstr ""

1348

1342 -#: apply.c:5047

1349 +#: apply.c:5069

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

1351 msgstr ""

1352

1346 -#: apply.c:5049

1353 +#: apply.c:5071

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

1355 msgstr ""

1356

1350 -#: apply.c:5051

1357 +#: apply.c:5073

1358 msgid "allow overlapping hunks"

1359 msgstr ""

1360

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

1355 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1356 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1361 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1362 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1363 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1364 msgid "be verbose"

1365 msgstr ""

1366

1360 -#: apply.c:5054

1367 +#: apply.c:5076

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

1369 msgstr ""

1370

1364 -#: apply.c:5057

1371 +#: apply.c:5079

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

1373 msgstr ""

1374

1368 -#: apply.c:5059 builtin/am.c:2306

1375 +#: apply.c:5081 builtin/am.c:2308

1376 msgid "root"

1377 msgstr ""

1378

1372 -#: apply.c:5060

1379 +#: apply.c:5082

1380 msgid "prepend <root> to all filenames"

1381 msgstr ""

1382

@@ -1439,194 +1446,193 @@ msgstr ""

1446 msgid "cannot read %s"

1447 msgstr ""

1448

1442 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1443 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1444 -#: builtin/merge.c:1144

1449 +#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112

1450 +#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834

1451 +#: builtin/merge.c:1145

1452 #, c-format

1453 msgid "could not read '%s'"

1454 msgstr ""

1455

1449 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1456 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1457 #, c-format

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

1459 msgstr ""

1460

1454 -#: archive.c:451

1461 +#: archive.c:450

1462 #, c-format

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

1464 msgstr ""

1465

1459 -#: archive.c:457

1466 +#: archive.c:456

1467 #, c-format

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

1469 msgstr ""

1470

1464 -#: archive.c:470

1471 +#: archive.c:469

1472 #, c-format

1473 msgid "not a tree object: %s"

1474 msgstr ""

1475

1469 -#: archive.c:482

1476 +#: archive.c:481

1477 msgid "current working directory is untracked"

1478 msgstr ""

1479

1473 -#: archive.c:523

1480 +#: archive.c:522

1481 #, c-format

1482 msgid "File not found: %s"

1483 msgstr ""

1484

1478 -#: archive.c:525

1485 +#: archive.c:524

1486 #, c-format

1487 msgid "Not a regular file: %s"

1488 msgstr ""

1489

1483 -#: archive.c:552

1490 +#: archive.c:551

1491 msgid "fmt"

1492 msgstr ""

1493

1487 -#: archive.c:552

1494 +#: archive.c:551

1495 msgid "archive format"

1496 msgstr ""

1497

1491 -#: archive.c:553 builtin/log.c:1775

1498 +#: archive.c:552 builtin/log.c:1775

1499 msgid "prefix"

1500 msgstr ""

1501

1495 -#: archive.c:554

1502 +#: archive.c:553

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

1504 msgstr ""

1505

1499 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

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

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

1502 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

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

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

1506 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1507 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1508 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1509 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1510 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1511 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1512 msgid "file"

1513 msgstr ""

1514

1508 -#: archive.c:556

1515 +#: archive.c:555

1516 msgid "add untracked file to archive"

1517 msgstr ""

1518

1512 -#: archive.c:559 builtin/archive.c:90

1519 +#: archive.c:558 builtin/archive.c:88

1520 msgid "write the archive to this file"

1521 msgstr ""

1522

1516 -#: archive.c:561

1523 +#: archive.c:560

1524 msgid "read .gitattributes in working directory"

1525 msgstr ""

1526

1520 -#: archive.c:562

1527 +#: archive.c:561

1528 msgid "report archived files on stderr"

1529 msgstr ""

1530

1524 -#: archive.c:564

1531 +#: archive.c:563

1532 msgid "set compression level"

1533 msgstr ""

1534

1528 -#: archive.c:567

1535 +#: archive.c:566

1536 msgid "list supported archive formats"

1537 msgstr ""

1538

1532 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1533 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1534 -#: builtin/submodule--helper.c:2902

1539 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1540 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1541 msgid "repo"

1542 msgstr ""

1543

1538 -#: archive.c:570 builtin/archive.c:92

1544 +#: archive.c:569 builtin/archive.c:90

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

1546 msgstr ""

1547

1542 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1543 -#: builtin/notes.c:498

1548 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1549 +#: builtin/notes.c:496

1550 msgid "command"

1551 msgstr ""

1552

1547 -#: archive.c:572 builtin/archive.c:94

1553 +#: archive.c:571 builtin/archive.c:92

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

1555 msgstr ""

1556

1551 -#: archive.c:579

1557 +#: archive.c:578

1558 msgid "Unexpected option --remote"

1559 msgstr ""

1560

1555 -#: archive.c:581

1561 +#: archive.c:580

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

1563 msgstr ""

1564

1559 -#: archive.c:583

1565 +#: archive.c:582

1566 msgid "Unexpected option --output"

1567 msgstr ""

1568

1563 -#: archive.c:585

1569 +#: archive.c:584

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

1571 msgstr ""

1572

1567 -#: archive.c:607

1573 +#: archive.c:606

1574 #, c-format

1575 msgid "Unknown archive format '%s'"

1576 msgstr ""

1577

1572 -#: archive.c:616

1578 +#: archive.c:615

1579 #, c-format

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

1581 msgstr ""

1582

1577 -#: attr.c:202

1583 +#: attr.c:203

1584 #, c-format

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

1586 msgstr ""

1587

1582 -#: attr.c:363

1588 +#: attr.c:364

1589 #, c-format

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

1591 msgstr ""

1592

1587 -#: attr.c:403

1593 +#: attr.c:404

1594 msgid ""

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

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

1597 msgstr ""

1598

1593 -#: bisect.c:489

1599 +#: bisect.c:488

1600 #, c-format

1601 msgid "Badly quoted content in file '%s': %s"

1602 msgstr ""

1603

1598 -#: bisect.c:699

1604 +#: bisect.c:698

1605 #, c-format

1606 msgid "We cannot bisect more!\n"

1607 msgstr ""

1608

1603 -#: bisect.c:766

1609 +#: bisect.c:764

1610 #, c-format

1611 msgid "Not a valid commit name %s"

1612 msgstr ""

1613

1608 -#: bisect.c:791

1614 +#: bisect.c:789

1615 #, c-format

1616 msgid ""

1617 "The merge base %s is bad.\n"

1618 "This means the bug has been fixed between %s and [%s].\n"

1619 msgstr ""

1620

1615 -#: bisect.c:796

1621 +#: bisect.c:794

1622 #, c-format

1623 msgid ""

1624 "The merge base %s is new.\n"

1625 "The property has changed between %s and [%s].\n"

1626 msgstr ""

1627

1622 -#: bisect.c:801

1628 +#: bisect.c:799

1629 #, c-format

1630 msgid ""

1631 "The merge base %s is %s.\n"

1632 "This means the first '%s' commit is between %s and [%s].\n"

1633 msgstr ""

1634

1629 -#: bisect.c:809

1635 +#: bisect.c:807

1636 #, c-format

1637 msgid ""

1638 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1634,7 +1640,7 @@ msgid ""

1640 "Maybe you mistook %s and %s revs?\n"

1641 msgstr ""

1642

1637 -#: bisect.c:822

1643 +#: bisect.c:820

1644 #, c-format

1645 msgid ""

1646 "the merge base between %s and [%s] must be skipped.\n"

@@ -1642,43 +1648,43 @@ msgid ""

1648 "We continue anyway."

1649 msgstr ""

1650

1645 -#: bisect.c:861

1651 +#: bisect.c:859

1652 #, c-format

1653 msgid "Bisecting: a merge base must be tested\n"

1654 msgstr ""

1655

1650 -#: bisect.c:911

1656 +#: bisect.c:909

1657 #, c-format

1658 msgid "a %s revision is needed"

1659 msgstr ""

1660

1655 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1661 +#: bisect.c:939

1662 #, c-format

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

1664 msgstr ""

1665

1660 -#: bisect.c:987 builtin/merge.c:153

1666 +#: bisect.c:985 builtin/merge.c:154

1667 #, c-format

1668 msgid "could not read file '%s'"

1669 msgstr ""

1670

1665 -#: bisect.c:1027

1671 +#: bisect.c:1025

1672 msgid "reading bisect refs failed"

1673 msgstr ""

1674

1669 -#: bisect.c:1057

1675 +#: bisect.c:1055

1676 #, c-format

1677 msgid "%s was both %s and %s\n"

1678 msgstr ""

1679

1674 -#: bisect.c:1066

1680 +#: bisect.c:1064

1681 #, c-format

1682 msgid ""

1683 "No testable commit found.\n"

1684 "Maybe you started with bad path arguments?\n"

1685 msgstr ""

1686

1681 -#: bisect.c:1095

1687 +#: bisect.c:1093

1688 #, c-format

1689 msgid "(roughly %d step)"

1690 msgid_plural "(roughly %d steps)"

@@ -1688,7 +1694,7 @@ msgstr[1] ""

1694 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1695 #. steps)" translation.

1696 #.

1691 -#: bisect.c:1101

1697 +#: bisect.c:1099

1698 #, c-format

1699 msgid "Bisecting: %d revision left to test after this %s\n"

1700 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

@@ -1707,11 +1713,12 @@ msgstr ""

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

1714 msgstr ""

1715

1710 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

1711 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1712 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1713 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1714 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1716 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1717 +#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114

1718 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1719 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1720 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1721 +#: builtin/shortlog.c:255

1722 msgid "revision walk setup failed"

1723 msgstr ""

1724

@@ -1874,8 +1881,8 @@ msgstr ""

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

1882 msgstr ""

1883

1877 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1878 -#: builtin/commit.c:861

1884 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402

1885 +#: builtin/commit.c:862

1886 #, c-format

1887 msgid "could not open '%s'"

1888 msgstr ""

@@ -1933,7 +1940,7 @@ msgstr ""

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

1941 msgstr ""

1942

1936 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

1943 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

1944 #, c-format

1945 msgid "unrecognized argument: %s"

1946 msgstr ""

@@ -1975,7 +1982,7 @@ msgstr ""

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

1983 msgstr ""

1984

1978 -#: commit-graph.c:204 midx.c:47

1985 +#: commit-graph.c:204 midx.c:51

1986 msgid "invalid hash version"

1987 msgstr ""

1988

@@ -2020,217 +2027,217 @@ msgstr ""

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

2028 msgstr ""

2029

2023 -#: commit-graph.c:745 commit-graph.c:782

2030 +#: commit-graph.c:746 commit-graph.c:783

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

2032 msgstr ""

2033

2027 -#: commit-graph.c:766

2034 +#: commit-graph.c:767

2035 #, c-format

2036 msgid "could not find commit %s"

2037 msgstr ""

2038

2032 -#: commit-graph.c:799

2039 +#: commit-graph.c:800

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

2041 msgstr ""

2042

2036 -#: commit-graph.c:1075 builtin/am.c:1341

2043 +#: commit-graph.c:1105 builtin/am.c:1342

2044 #, c-format

2045 msgid "unable to parse commit %s"

2046 msgstr ""

2047

2041 -#: commit-graph.c:1337 builtin/pack-objects.c:3057

2048 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2049 #, c-format

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

2051 msgstr ""

2052

2046 -#: commit-graph.c:1368

2053 +#: commit-graph.c:1398

2054 msgid "Loading known commits in commit graph"

2055 msgstr ""

2056

2050 -#: commit-graph.c:1385

2057 +#: commit-graph.c:1415

2058 msgid "Expanding reachable commits in commit graph"

2059 msgstr ""

2060

2054 -#: commit-graph.c:1405

2061 +#: commit-graph.c:1435

2062 msgid "Clearing commit marks in commit graph"

2063 msgstr ""

2064

2058 -#: commit-graph.c:1424

2065 +#: commit-graph.c:1454

2066 msgid "Computing commit graph topological levels"

2067 msgstr ""

2068

2062 -#: commit-graph.c:1477

2069 +#: commit-graph.c:1507

2070 msgid "Computing commit graph generation numbers"

2071 msgstr ""

2072

2066 -#: commit-graph.c:1558

2073 +#: commit-graph.c:1588

2074 msgid "Computing commit changed paths Bloom filters"

2075 msgstr ""

2076

2070 -#: commit-graph.c:1635

2077 +#: commit-graph.c:1665

2078 msgid "Collecting referenced commits"

2079 msgstr ""

2080

2074 -#: commit-graph.c:1660

2081 +#: commit-graph.c:1690

2082 #, c-format

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

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

2085 msgstr[0] ""

2086 msgstr[1] ""

2087

2081 -#: commit-graph.c:1673

2088 +#: commit-graph.c:1703

2089 #, c-format

2090 msgid "error adding pack %s"

2091 msgstr ""

2092

2086 -#: commit-graph.c:1677

2093 +#: commit-graph.c:1707

2094 #, c-format

2095 msgid "error opening index for %s"

2096 msgstr ""

2097

2091 -#: commit-graph.c:1714

2098 +#: commit-graph.c:1744

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

2100 msgstr ""

2101

2095 -#: commit-graph.c:1732

2102 +#: commit-graph.c:1762

2103 msgid "Finding extra edges in commit graph"

2104 msgstr ""

2105

2099 -#: commit-graph.c:1781

2106 +#: commit-graph.c:1811

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

2108 msgstr ""

2109

2103 -#: commit-graph.c:1812 midx.c:911

2110 +#: commit-graph.c:1842 midx.c:1146

2111 #, c-format

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

2113 msgstr ""

2114

2108 -#: commit-graph.c:1825

2115 +#: commit-graph.c:1855

2116 msgid "unable to create temporary graph layer"

2117 msgstr ""

2118

2112 -#: commit-graph.c:1830

2119 +#: commit-graph.c:1860

2120 #, c-format

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

2122 msgstr ""

2123

2117 -#: commit-graph.c:1887

2124 +#: commit-graph.c:1917

2125 #, c-format

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

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

2128 msgstr[0] ""

2129 msgstr[1] ""

2130

2124 -#: commit-graph.c:1923

2131 +#: commit-graph.c:1953

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

2133 msgstr ""

2134

2128 -#: commit-graph.c:1939

2135 +#: commit-graph.c:1969

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

2137 msgstr ""

2138

2132 -#: commit-graph.c:1959

2139 +#: commit-graph.c:1989

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

2141 msgstr ""

2142

2136 -#: commit-graph.c:2092

2143 +#: commit-graph.c:2122

2144 msgid "Scanning merged commits"

2145 msgstr ""

2146

2140 -#: commit-graph.c:2136

2147 +#: commit-graph.c:2166

2148 msgid "Merging commit-graph"

2149 msgstr ""

2150

2144 -#: commit-graph.c:2244

2151 +#: commit-graph.c:2274

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

2153 msgstr ""

2154

2148 -#: commit-graph.c:2351

2155 +#: commit-graph.c:2381

2156 msgid "too many commits to write graph"

2157 msgstr ""

2158

2152 -#: commit-graph.c:2449

2159 +#: commit-graph.c:2479

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

2161 msgstr ""

2162

2156 -#: commit-graph.c:2459

2163 +#: commit-graph.c:2489

2164 #, c-format

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

2166 msgstr ""

2167

2161 -#: commit-graph.c:2469 commit-graph.c:2484

2168 +#: commit-graph.c:2499 commit-graph.c:2514

2169 #, c-format

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

2171 msgstr ""

2172

2166 -#: commit-graph.c:2476

2173 +#: commit-graph.c:2506

2174 #, c-format

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

2176 msgstr ""

2177

2171 -#: commit-graph.c:2494

2178 +#: commit-graph.c:2524

2179 msgid "Verifying commits in commit graph"

2180 msgstr ""

2181

2175 -#: commit-graph.c:2509

2182 +#: commit-graph.c:2539

2183 #, c-format

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

2185 msgstr ""

2186

2180 -#: commit-graph.c:2516

2187 +#: commit-graph.c:2546

2188 #, c-format

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

2190 msgstr ""

2191

2185 -#: commit-graph.c:2526

2192 +#: commit-graph.c:2556

2193 #, c-format

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

2195 msgstr ""

2196

2190 -#: commit-graph.c:2535

2197 +#: commit-graph.c:2565

2198 #, c-format

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

2200 msgstr ""

2201

2195 -#: commit-graph.c:2549

2202 +#: commit-graph.c:2579

2203 #, c-format

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

2205 msgstr ""

2206

2200 -#: commit-graph.c:2554

2207 +#: commit-graph.c:2584

2208 #, c-format

2209 msgid ""

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

2211 msgstr ""

2212

2206 -#: commit-graph.c:2558

2213 +#: commit-graph.c:2588

2214 #, c-format

2215 msgid ""

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

2217 msgstr ""

2218

2212 -#: commit-graph.c:2575

2219 +#: commit-graph.c:2605

2220 #, c-format

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

2222 msgstr ""

2223

2217 -#: commit-graph.c:2581

2224 +#: commit-graph.c:2611

2225 #, c-format

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

2227 msgstr ""

2228

2222 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2223 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2229 +#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418

2230 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2231 #, c-format

2232 msgid "could not parse %s"

2233 msgstr ""

2234

2228 -#: commit.c:54

2235 +#: commit.c:55

2236 #, c-format

2237 msgid "%s %s is not a commit!"

2238 msgstr ""

2239

2233 -#: commit.c:194

2240 +#: commit.c:196

2241 msgid ""

2242 "Support for <GIT_DIR>/info/grafts is deprecated\n"

2243 "and will be removed in a future Git version.\n"

@@ -2242,27 +2249,27 @@ msgid ""

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

2250 msgstr ""

2251

2245 -#: commit.c:1237

2252 +#: commit.c:1239

2253 #, c-format

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

2255 msgstr ""

2256

2250 -#: commit.c:1241

2257 +#: commit.c:1243

2258 #, c-format

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

2260 msgstr ""

2261

2255 -#: commit.c:1244

2262 +#: commit.c:1246

2263 #, c-format

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

2265 msgstr ""

2266

2260 -#: commit.c:1247

2267 +#: commit.c:1249

2268 #, c-format

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

2270 msgstr ""

2271

2265 -#: commit.c:1501

2272 +#: commit.c:1503

2273 msgid ""

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

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

@@ -2273,7 +2280,7 @@ msgstr ""

2280 msgid "memory exhausted"

2281 msgstr ""

2282

2276 -#: config.c:126

2283 +#: config.c:125

2284 #, c-format

2285 msgid ""

2286 "exceeded maximum include depth (%d) while including\n"

@@ -2283,35 +2290,35 @@ msgid ""

2290 "This might be due to circular includes."

2291 msgstr ""

2292

2286 -#: config.c:142

2293 +#: config.c:141

2294 #, c-format

2295 msgid "could not expand include path '%s'"

2296 msgstr ""

2297

2291 -#: config.c:153

2298 +#: config.c:152

2299 msgid "relative config includes must come from files"

2300 msgstr ""

2301

2295 -#: config.c:199

2302 +#: config.c:201

2303 msgid "relative config include conditionals must come from files"

2304 msgstr ""

2305

2299 -#: config.c:396

2306 +#: config.c:398

2307 #, c-format

2308 msgid "invalid config format: %s"

2309 msgstr ""

2310

2304 -#: config.c:400

2311 +#: config.c:402

2312 #, c-format

2313 msgid "missing environment variable name for configuration '%.*s'"

2314 msgstr ""

2315

2309 -#: config.c:405

2316 +#: config.c:407

2317 #, c-format

2318 msgid "missing environment variable '%s' for configuration '%.*s'"

2319 msgstr ""

2320

2314 -#: config.c:442

2321 +#: config.c:443

2322 #, c-format

2323 msgid "key does not contain a section: %s"

2324 msgstr ""

@@ -2321,295 +2328,295 @@ msgstr ""

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

2329 msgstr ""

2330

2324 -#: config.c:472 sequencer.c:2785

2331 +#: config.c:470 sequencer.c:2802

2332 #, c-format

2333 msgid "invalid key: %s"

2334 msgstr ""

2335

2329 -#: config.c:478

2336 +#: config.c:475

2337 #, c-format

2338 msgid "invalid key (newline): %s"

2339 msgstr ""

2340

2334 -#: config.c:511

2341 +#: config.c:495

2342 msgid "empty config key"

2343 msgstr ""

2344

2338 -#: config.c:529 config.c:541

2345 +#: config.c:513 config.c:525

2346 #, c-format

2347 msgid "bogus config parameter: %s"

2348 msgstr ""

2349

2343 -#: config.c:555 config.c:572 config.c:579 config.c:588

2350 +#: config.c:539 config.c:556 config.c:563 config.c:572

2351 #, c-format

2352 msgid "bogus format in %s"

2353 msgstr ""

2354

2348 -#: config.c:622

2355 +#: config.c:606

2356 #, c-format

2357 msgid "bogus count in %s"

2358 msgstr ""

2359

2353 -#: config.c:626

2360 +#: config.c:610

2361 #, c-format

2362 msgid "too many entries in %s"

2363 msgstr ""

2364

2358 -#: config.c:636

2365 +#: config.c:620

2366 #, c-format

2367 msgid "missing config key %s"

2368 msgstr ""

2369

2363 -#: config.c:644

2370 +#: config.c:628

2371 #, c-format

2372 msgid "missing config value %s"

2373 msgstr ""

2374

2368 -#: config.c:995

2375 +#: config.c:979

2376 #, c-format

2377 msgid "bad config line %d in blob %s"

2378 msgstr ""

2379

2373 -#: config.c:999

2380 +#: config.c:983

2381 #, c-format

2382 msgid "bad config line %d in file %s"

2383 msgstr ""

2384

2378 -#: config.c:1003

2385 +#: config.c:987

2386 #, c-format

2387 msgid "bad config line %d in standard input"

2388 msgstr ""

2389

2383 -#: config.c:1007

2390 +#: config.c:991

2391 #, c-format

2392 msgid "bad config line %d in submodule-blob %s"

2393 msgstr ""

2394

2388 -#: config.c:1011

2395 +#: config.c:995

2396 #, c-format

2397 msgid "bad config line %d in command line %s"

2398 msgstr ""

2399

2393 -#: config.c:1015

2400 +#: config.c:999

2401 #, c-format

2402 msgid "bad config line %d in %s"

2403 msgstr ""

2404

2398 -#: config.c:1152

2405 +#: config.c:1136

2406 msgid "out of range"

2407 msgstr ""

2408

2402 -#: config.c:1152

2409 +#: config.c:1136

2410 msgid "invalid unit"

2411 msgstr ""

2412

2406 -#: config.c:1153

2413 +#: config.c:1137

2414 #, c-format

2415 msgid "bad numeric config value '%s' for '%s': %s"

2416 msgstr ""

2417

2411 -#: config.c:1163

2418 +#: config.c:1147

2419 #, c-format

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

2421 msgstr ""

2422

2416 -#: config.c:1166

2423 +#: config.c:1150

2424 #, c-format

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

2426 msgstr ""

2427

2421 -#: config.c:1169

2428 +#: config.c:1153

2429 #, c-format

2430 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2431 msgstr ""

2432

2426 -#: config.c:1172

2433 +#: config.c:1156

2434 #, c-format

2435 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2436 msgstr ""

2437

2431 -#: config.c:1175

2438 +#: config.c:1159

2439 #, c-format

2440 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2441 msgstr ""

2442

2436 -#: config.c:1178

2443 +#: config.c:1162

2444 #, c-format

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

2446 msgstr ""

2447

2441 -#: config.c:1257

2448 +#: config.c:1241

2449 #, c-format

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

2451 msgstr ""

2452

2446 -#: config.c:1275

2453 +#: config.c:1259

2454 #, c-format

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

2456 msgstr ""

2457

2451 -#: config.c:1284

2458 +#: config.c:1268

2459 #, c-format

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

2461 msgstr ""

2462

2456 -#: config.c:1377

2463 +#: config.c:1361

2464 #, c-format

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

2466 msgstr ""

2467

2461 -#: config.c:1391 config.c:1402

2468 +#: config.c:1375 config.c:1386

2469 #, c-format

2470 msgid "bad zlib compression level %d"

2471 msgstr ""

2472

2466 -#: config.c:1494

2473 +#: config.c:1476

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

2475 msgstr ""

2476

2470 -#: config.c:1527

2477 +#: config.c:1509

2478 #, c-format

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

2480 msgstr ""

2481

2475 -#: config.c:1599

2482 +#: config.c:1581

2483 #, c-format

2484 msgid "malformed value for %s"

2485 msgstr ""

2486

2480 -#: config.c:1625

2487 +#: config.c:1607

2488 #, c-format

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

2490 msgstr ""

2491

2485 -#: config.c:1626

2492 +#: config.c:1608

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

2494 msgstr ""

2495

2489 -#: config.c:1687 builtin/pack-objects.c:4084

2496 +#: config.c:1669 builtin/pack-objects.c:4053

2497 #, c-format

2498 msgid "bad pack compression level %d"

2499 msgstr ""

2500

2494 -#: config.c:1809

2501 +#: config.c:1792

2502 #, c-format

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

2504 msgstr ""

2505

2499 -#: config.c:1812

2506 +#: config.c:1795

2507 #, c-format

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

2509 msgstr ""

2510

2504 -#: config.c:1829

2511 +#: config.c:1813

2512 #, c-format

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

2514 msgstr ""

2515

2509 -#: config.c:1874

2516 +#: config.c:1858

2517 #, c-format

2518 msgid "failed to parse %s"

2519 msgstr ""

2520

2514 -#: config.c:1930

2521 +#: config.c:1914

2522 msgid "unable to parse command-line config"

2523 msgstr ""

2524

2518 -#: config.c:2294

2525 +#: config.c:2282

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

2527 msgstr ""

2528

2522 -#: config.c:2468

2529 +#: config.c:2456

2530 #, c-format

2531 msgid "Invalid %s: '%s'"

2532 msgstr ""

2533

2527 -#: config.c:2513

2534 +#: config.c:2501

2535 #, c-format

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

2537 msgstr ""

2538

2532 -#: config.c:2559

2539 +#: config.c:2547

2540 #, c-format

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

2542 msgstr ""

2543

2537 -#: config.c:2561

2544 +#: config.c:2549

2545 #, c-format

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

2547 msgstr ""

2548

2542 -#: config.c:2645

2549 +#: config.c:2633

2550 #, c-format

2551 msgid "invalid section name '%s'"

2552 msgstr ""

2553

2547 -#: config.c:2677

2554 +#: config.c:2665

2555 #, c-format

2556 msgid "%s has multiple values"

2557 msgstr ""

2558

2552 -#: config.c:2706

2559 +#: config.c:2694

2560 #, c-format

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

2562 msgstr ""

2563

2557 -#: config.c:2958 config.c:3285

2564 +#: config.c:2946 config.c:3273

2565 #, c-format

2566 msgid "could not lock config file %s"

2567 msgstr ""

2568

2562 -#: config.c:2969

2569 +#: config.c:2957

2570 #, c-format

2571 msgid "opening %s"

2572 msgstr ""

2573

2567 -#: config.c:3006 builtin/config.c:361

2574 +#: config.c:2994 builtin/config.c:361

2575 #, c-format

2576 msgid "invalid pattern: %s"

2577 msgstr ""

2578

2572 -#: config.c:3031

2579 +#: config.c:3019

2580 #, c-format

2581 msgid "invalid config file %s"

2582 msgstr ""

2583

2577 -#: config.c:3044 config.c:3298

2584 +#: config.c:3032 config.c:3286

2585 #, c-format

2586 msgid "fstat on %s failed"

2587 msgstr ""

2588

2582 -#: config.c:3055

2589 +#: config.c:3043

2590 #, c-format

2591 msgid "unable to mmap '%s'%s"

2592 msgstr ""

2593

2587 -#: config.c:3065 config.c:3303

2594 +#: config.c:3053 config.c:3291

2595 #, c-format

2596 msgid "chmod on %s failed"

2597 msgstr ""

2598

2592 -#: config.c:3150 config.c:3400

2599 +#: config.c:3138 config.c:3388

2600 #, c-format

2601 msgid "could not write config file %s"

2602 msgstr ""

2603

2597 -#: config.c:3184

2604 +#: config.c:3172

2605 #, c-format

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

2607 msgstr ""

2608

2602 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2609 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2610 #, c-format

2611 msgid "could not unset '%s'"

2612 msgstr ""

2613

2607 -#: config.c:3276

2614 +#: config.c:3264

2615 #, c-format

2616 msgid "invalid section name: %s"

2617 msgstr ""

2618

2612 -#: config.c:3443

2619 +#: config.c:3431

2620 #, c-format

2621 msgid "missing value for '%s'"

2622 msgstr ""

@@ -2640,79 +2647,79 @@ msgstr ""

2647 msgid "expected flush after capabilities"

2648 msgstr ""

2649

2643 -#: connect.c:263

2650 +#: connect.c:265

2651 #, c-format

2652 msgid "ignoring capabilities after first line '%s'"

2653 msgstr ""

2654

2648 -#: connect.c:284

2655 +#: connect.c:286

2656 msgid "protocol error: unexpected capabilities^{}"

2657 msgstr ""

2658

2652 -#: connect.c:306

2659 +#: connect.c:308

2660 #, c-format

2661 msgid "protocol error: expected shallow sha-1, got '%s'"

2662 msgstr ""

2663

2657 -#: connect.c:308

2664 +#: connect.c:310

2665 msgid "repository on the other end cannot be shallow"

2666 msgstr ""

2667

2661 -#: connect.c:347

2668 +#: connect.c:349

2669 msgid "invalid packet"

2670 msgstr ""

2671

2665 -#: connect.c:367

2672 +#: connect.c:369

2673 #, c-format

2674 msgid "protocol error: unexpected '%s'"

2675 msgstr ""

2676

2670 -#: connect.c:497

2677 +#: connect.c:499

2678 #, c-format

2679 msgid "unknown object format '%s' specified by server"

2680 msgstr ""

2681

2675 -#: connect.c:526

2682 +#: connect.c:528

2683 #, c-format

2684 msgid "invalid ls-refs response: %s"

2685 msgstr ""

2686

2680 -#: connect.c:530

2687 +#: connect.c:532

2688 msgid "expected flush after ref listing"

2689 msgstr ""

2690

2684 -#: connect.c:533

2691 +#: connect.c:535

2692 msgid "expected response end packet after ref listing"

2693 msgstr ""

2694

2688 -#: connect.c:666

2695 +#: connect.c:670

2696 #, c-format

2697 msgid "protocol '%s' is not supported"

2698 msgstr ""

2699

2693 -#: connect.c:717

2700 +#: connect.c:721

2701 msgid "unable to set SO_KEEPALIVE on socket"

2702 msgstr ""

2703

2697 -#: connect.c:757 connect.c:820

2704 +#: connect.c:761 connect.c:824

2705 #, c-format

2706 msgid "Looking up %s ... "

2707 msgstr ""

2708

2702 -#: connect.c:761

2709 +#: connect.c:765

2710 #, c-format

2711 msgid "unable to look up %s (port %s) (%s)"

2712 msgstr ""

2713

2714 #. TRANSLATORS: this is the end of "Looking up %s ... "

2708 -#: connect.c:765 connect.c:836

2715 +#: connect.c:769 connect.c:840

2716 #, c-format

2717 msgid ""

2718 "done.\n"

2719 "Connecting to %s (port %s) ... "

2720 msgstr ""

2721

2715 -#: connect.c:787 connect.c:864

2722 +#: connect.c:791 connect.c:868

2723 #, c-format

2724 msgid ""

2725 "unable to connect to %s:\n"

@@ -2720,77 +2727,77 @@ msgid ""

2727 msgstr ""

2728

2729 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2723 -#: connect.c:793 connect.c:870

2730 +#: connect.c:797 connect.c:874

2731 msgid "done."

2732 msgstr ""

2733

2727 -#: connect.c:824

2734 +#: connect.c:828

2735 #, c-format

2736 msgid "unable to look up %s (%s)"

2737 msgstr ""

2738

2732 -#: connect.c:830

2739 +#: connect.c:834

2740 #, c-format

2741 msgid "unknown port %s"

2742 msgstr ""

2743

2737 -#: connect.c:967 connect.c:1299

2744 +#: connect.c:971 connect.c:1303

2745 #, c-format

2746 msgid "strange hostname '%s' blocked"

2747 msgstr ""

2748

2742 -#: connect.c:969

2749 +#: connect.c:973

2750 #, c-format

2751 msgid "strange port '%s' blocked"

2752 msgstr ""

2753

2747 -#: connect.c:979

2754 +#: connect.c:983

2755 #, c-format

2756 msgid "cannot start proxy %s"

2757 msgstr ""

2758

2752 -#: connect.c:1050

2759 +#: connect.c:1054

2760 msgid "no path specified; see 'git help pull' for valid url syntax"

2761 msgstr ""

2762

2756 -#: connect.c:1190

2763 +#: connect.c:1194

2764 msgid "newline is forbidden in git:// hosts and repo paths"

2765 msgstr ""

2766

2760 -#: connect.c:1247

2767 +#: connect.c:1251

2768 msgid "ssh variant 'simple' does not support -4"

2769 msgstr ""

2770

2764 -#: connect.c:1259

2771 +#: connect.c:1263

2772 msgid "ssh variant 'simple' does not support -6"

2773 msgstr ""

2774

2768 -#: connect.c:1276

2775 +#: connect.c:1280

2776 msgid "ssh variant 'simple' does not support setting port"

2777 msgstr ""

2778

2772 -#: connect.c:1388

2779 +#: connect.c:1392

2780 #, c-format

2781 msgid "strange pathname '%s' blocked"

2782 msgstr ""

2783

2777 -#: connect.c:1436

2784 +#: connect.c:1440

2785 msgid "unable to fork"

2786 msgstr ""

2787

2781 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

2788 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

2789 msgid "Checking connectivity"

2790 msgstr ""

2791

2785 -#: connected.c:120

2792 +#: connected.c:122

2793 msgid "Could not run 'git rev-list'"

2794 msgstr ""

2795

2789 -#: connected.c:144

2796 +#: connected.c:146

2797 msgid "failed write to rev-list"

2798 msgstr ""

2799

2793 -#: connected.c:149

2800 +#: connected.c:151

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

2802 msgstr ""

2803

@@ -2924,17 +2931,17 @@ msgstr ""

2931 msgid "refusing to work with credential missing protocol field"

2932 msgstr ""

2933

2927 -#: credential.c:394

2934 +#: credential.c:395

2935 #, c-format

2936 msgid "url contains a newline in its %s component: %s"

2937 msgstr ""

2938

2932 -#: credential.c:438

2939 +#: credential.c:439

2940 #, c-format

2941 msgid "url has no scheme: %s"

2942 msgstr ""

2943

2937 -#: credential.c:511

2944 +#: credential.c:512

2945 #, c-format

2946 msgid "credential url cannot be parsed: %s"

2947 msgstr ""

@@ -3036,23 +3043,23 @@ msgstr ""

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

3044 msgstr ""

3045

3039 -#: diff-lib.c:557

3046 +#: diff-lib.c:561

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

3048 msgstr ""

3049

3043 -#: diff-lib.c:559

3050 +#: diff-lib.c:563

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

3052 msgstr ""

3053

3047 -#: diff-lib.c:576

3054 +#: diff-lib.c:580

3055 msgid "unable to get HEAD"

3056 msgstr ""

3057

3051 -#: diff-lib.c:583

3058 +#: diff-lib.c:587

3059 msgid "no merge base found"

3060 msgstr ""

3061

3055 -#: diff-lib.c:585

3062 +#: diff-lib.c:589

3063 msgid "multiple merge bases found"

3064 msgstr ""

3065

@@ -3066,596 +3073,596 @@ msgid ""

3073 "tree"

3074 msgstr ""

3075

3069 -#: diff.c:156

3076 +#: diff.c:157

3077 #, c-format

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

3079 msgstr ""

3080

3074 -#: diff.c:161

3081 +#: diff.c:162

3082 #, c-format

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

3084 msgstr ""

3085

3079 -#: diff.c:297

3086 +#: diff.c:298

3087 msgid ""

3088 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3089 "'dimmed-zebra', 'plain'"

3090 msgstr ""

3091

3085 -#: diff.c:325

3092 +#: diff.c:326

3093 #, c-format

3094 msgid ""

3095 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

3096 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

3097 msgstr ""

3098

3092 -#: diff.c:333

3099 +#: diff.c:334

3100 msgid ""

3101 "color-moved-ws: allow-indentation-change cannot be combined with other "

3102 "whitespace modes"

3103 msgstr ""

3104

3098 -#: diff.c:410

3105 +#: diff.c:411

3106 #, c-format

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

3108 msgstr ""

3109

3103 -#: diff.c:470

3110 +#: diff.c:471

3111 #, c-format

3112 msgid ""

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

3114 "%s"

3115 msgstr ""

3116

3110 -#: diff.c:4282

3117 +#: diff.c:4290

3118 #, c-format

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

3120 msgstr ""

3121

3115 -#: diff.c:4634

3122 +#: diff.c:4642

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

3124 msgstr ""

3125

3119 -#: diff.c:4637

3126 +#: diff.c:4645

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

3128 msgstr ""

3129

3123 -#: diff.c:4640

3130 +#: diff.c:4648

3131 msgid ""

3132 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3133 msgstr ""

3134

3128 -#: diff.c:4643

3135 +#: diff.c:4651

3136 msgid ""

3137 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3138 "with -G and -S"

3139 msgstr ""

3140

3134 -#: diff.c:4722

3141 +#: diff.c:4730

3142 msgid "--follow requires exactly one pathspec"

3143 msgstr ""

3144

3138 -#: diff.c:4770

3145 +#: diff.c:4778

3146 #, c-format

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

3148 msgstr ""

3149

3143 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

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

3150 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3151 +#: parse-options.c:217 parse-options.c:221

3152 #, c-format

3153 msgid "%s expects a numerical value"

3154 msgstr ""

3155

3149 -#: diff.c:4807

3156 +#: diff.c:4815

3157 #, c-format

3158 msgid ""

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

3160 "%s"

3161 msgstr ""

3162

3156 -#: diff.c:4892

3163 +#: diff.c:4900

3164 #, c-format

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

3166 msgstr ""

3167

3161 -#: diff.c:4916

3168 +#: diff.c:4924

3169 #, c-format

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

3171 msgstr ""

3172

3166 -#: diff.c:4930

3173 +#: diff.c:4938

3174 #, c-format

3175 msgid "unable to resolve '%s'"

3176 msgstr ""

3177

3171 -#: diff.c:4980 diff.c:4986

3178 +#: diff.c:4988 diff.c:4994

3179 #, c-format

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

3181 msgstr ""

3182

3176 -#: diff.c:4998

3183 +#: diff.c:5006

3184 #, c-format

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

3186 msgstr ""

3187

3181 -#: diff.c:5019

3188 +#: diff.c:5027

3189 #, c-format

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

3191 msgstr ""

3192

3186 -#: diff.c:5038

3193 +#: diff.c:5046

3194 #, c-format

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

3196 msgstr ""

3197

3191 -#: diff.c:5078

3198 +#: diff.c:5086

3199 msgid ""

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

3201 "\"histogram\""

3202 msgstr ""

3203

3197 -#: diff.c:5114 diff.c:5134

3204 +#: diff.c:5122 diff.c:5142

3205 #, c-format

3206 msgid "invalid argument to %s"

3207 msgstr ""

3208

3202 -#: diff.c:5238

3209 +#: diff.c:5246

3210 #, c-format

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

3212 msgstr ""

3213

3207 -#: diff.c:5287

3214 +#: diff.c:5295

3215 #, c-format

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

3217 msgstr ""

3218

3212 -#: diff.c:5343

3219 +#: diff.c:5351

3220 #, c-format

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

3222 msgstr ""

3223

3217 -#: diff.c:5379

3224 +#: diff.c:5387

3225 msgid "Diff output format options"

3226 msgstr ""

3227

3221 -#: diff.c:5381 diff.c:5387

3228 +#: diff.c:5389 diff.c:5395

3229 msgid "generate patch"

3230 msgstr ""

3231

3225 -#: diff.c:5384 builtin/log.c:179

3232 +#: diff.c:5392 builtin/log.c:179

3233 msgid "suppress diff output"

3234 msgstr ""

3235

3229 -#: diff.c:5389 diff.c:5503 diff.c:5510

3236 +#: diff.c:5397 diff.c:5511 diff.c:5518

3237 msgid "<n>"

3238 msgstr ""

3239

3233 -#: diff.c:5390 diff.c:5393

3240 +#: diff.c:5398 diff.c:5401

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

3242 msgstr ""

3243

3237 -#: diff.c:5395

3244 +#: diff.c:5403

3245 msgid "generate the diff in raw format"

3246 msgstr ""

3247

3241 -#: diff.c:5398

3248 +#: diff.c:5406

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

3250 msgstr ""

3251

3245 -#: diff.c:5402

3252 +#: diff.c:5410

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

3254 msgstr ""

3255

3249 -#: diff.c:5406

3256 +#: diff.c:5414

3257 msgid "machine friendly --stat"

3258 msgstr ""

3259

3253 -#: diff.c:5409

3260 +#: diff.c:5417

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

3262 msgstr ""

3263

3257 -#: diff.c:5411 diff.c:5419

3264 +#: diff.c:5419 diff.c:5427

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

3266 msgstr ""

3267

3261 -#: diff.c:5412

3268 +#: diff.c:5420

3269 msgid ""

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

3271 msgstr ""

3272

3266 -#: diff.c:5416

3273 +#: diff.c:5424

3274 msgid "synonym for --dirstat=cumulative"

3275 msgstr ""

3276

3270 -#: diff.c:5420

3277 +#: diff.c:5428

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

3279 msgstr ""

3280

3274 -#: diff.c:5424

3281 +#: diff.c:5432

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

3283 msgstr ""

3284

3278 -#: diff.c:5427

3285 +#: diff.c:5435

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

3287 msgstr ""

3288

3282 -#: diff.c:5430

3289 +#: diff.c:5438

3290 msgid "show only names of changed files"

3291 msgstr ""

3292

3286 -#: diff.c:5433

3293 +#: diff.c:5441

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

3295 msgstr ""

3296

3290 -#: diff.c:5435

3297 +#: diff.c:5443

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

3299 msgstr ""

3300

3294 -#: diff.c:5436

3301 +#: diff.c:5444

3302 msgid "generate diffstat"

3303 msgstr ""

3304

3298 -#: diff.c:5438 diff.c:5441 diff.c:5444

3305 +#: diff.c:5446 diff.c:5449 diff.c:5452

3306 msgid "<width>"

3307 msgstr ""

3308

3302 -#: diff.c:5439

3309 +#: diff.c:5447

3310 msgid "generate diffstat with a given width"

3311 msgstr ""

3312

3306 -#: diff.c:5442

3313 +#: diff.c:5450

3314 msgid "generate diffstat with a given name width"

3315 msgstr ""

3316

3310 -#: diff.c:5445

3317 +#: diff.c:5453

3318 msgid "generate diffstat with a given graph width"

3319 msgstr ""

3320

3314 -#: diff.c:5447

3321 +#: diff.c:5455

3322 msgid "<count>"

3323 msgstr ""

3324

3318 -#: diff.c:5448

3325 +#: diff.c:5456

3326 msgid "generate diffstat with limited lines"

3327 msgstr ""

3328

3322 -#: diff.c:5451

3329 +#: diff.c:5459

3330 msgid "generate compact summary in diffstat"

3331 msgstr ""

3332

3326 -#: diff.c:5454

3333 +#: diff.c:5462

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

3335 msgstr ""

3336

3330 -#: diff.c:5457

3337 +#: diff.c:5465

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

3339 msgstr ""

3340

3334 -#: diff.c:5459

3341 +#: diff.c:5467

3342 msgid "show colored diff"

3343 msgstr ""

3344

3338 -#: diff.c:5460

3345 +#: diff.c:5468

3346 msgid "<kind>"

3347 msgstr ""

3348

3342 -#: diff.c:5461

3349 +#: diff.c:5469

3350 msgid ""

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

3352 "diff"

3353 msgstr ""

3354

3348 -#: diff.c:5464

3355 +#: diff.c:5472

3356 msgid ""

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

3358 "--numstat"

3359 msgstr ""

3360

3354 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3361 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3362 msgid "<prefix>"

3363 msgstr ""

3364

3358 -#: diff.c:5468

3365 +#: diff.c:5476

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

3367 msgstr ""

3368

3362 -#: diff.c:5471

3369 +#: diff.c:5479

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

3371 msgstr ""

3372

3366 -#: diff.c:5474

3373 +#: diff.c:5482

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

3375 msgstr ""

3376

3370 -#: diff.c:5477

3377 +#: diff.c:5485

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

3379 msgstr ""

3380

3374 -#: diff.c:5480

3381 +#: diff.c:5488

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

3383 msgstr ""

3384

3378 -#: diff.c:5484 diff.c:5489 diff.c:5494

3385 +#: diff.c:5492 diff.c:5497 diff.c:5502

3386 msgid "<char>"

3387 msgstr ""

3388

3382 -#: diff.c:5485

3389 +#: diff.c:5493

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

3391 msgstr ""

3392

3386 -#: diff.c:5490

3393 +#: diff.c:5498

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

3395 msgstr ""

3396

3390 -#: diff.c:5495

3397 +#: diff.c:5503

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

3399 msgstr ""

3400

3394 -#: diff.c:5498

3401 +#: diff.c:5506

3402 msgid "Diff rename options"

3403 msgstr ""

3404

3398 -#: diff.c:5499

3405 +#: diff.c:5507

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

3407 msgstr ""

3408

3402 -#: diff.c:5500

3409 +#: diff.c:5508

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

3411 msgstr ""

3412

3406 -#: diff.c:5504

3413 +#: diff.c:5512

3414 msgid "detect renames"

3415 msgstr ""

3416

3410 -#: diff.c:5508

3417 +#: diff.c:5516

3418 msgid "omit the preimage for deletes"

3419 msgstr ""

3420

3414 -#: diff.c:5511

3421 +#: diff.c:5519

3422 msgid "detect copies"

3423 msgstr ""

3424

3418 -#: diff.c:5515

3425 +#: diff.c:5523

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

3427 msgstr ""

3428

3422 -#: diff.c:5517

3429 +#: diff.c:5525

3430 msgid "disable rename detection"

3431 msgstr ""

3432

3426 -#: diff.c:5520

3433 +#: diff.c:5528

3434 msgid "use empty blobs as rename source"

3435 msgstr ""

3436

3430 -#: diff.c:5522

3437 +#: diff.c:5530

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

3439 msgstr ""

3440

3434 -#: diff.c:5525

3441 +#: diff.c:5533

3442 msgid ""

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

3444 "given limit"

3445 msgstr ""

3446

3440 -#: diff.c:5527

3447 +#: diff.c:5535

3448 msgid "Diff algorithm options"

3449 msgstr ""

3450

3444 -#: diff.c:5529

3451 +#: diff.c:5537

3452 msgid "produce the smallest possible diff"

3453 msgstr ""

3454

3448 -#: diff.c:5532

3455 +#: diff.c:5540

3456 msgid "ignore whitespace when comparing lines"

3457 msgstr ""

3458

3452 -#: diff.c:5535

3459 +#: diff.c:5543

3460 msgid "ignore changes in amount of whitespace"

3461 msgstr ""

3462

3456 -#: diff.c:5538

3463 +#: diff.c:5546

3464 msgid "ignore changes in whitespace at EOL"

3465 msgstr ""

3466

3460 -#: diff.c:5541

3467 +#: diff.c:5549

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

3469 msgstr ""

3470

3464 -#: diff.c:5544

3471 +#: diff.c:5552

3472 msgid "ignore changes whose lines are all blank"

3473 msgstr ""

3474

3468 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3475 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3476 msgid "<regex>"

3477 msgstr ""

3478

3472 -#: diff.c:5547

3479 +#: diff.c:5555

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

3481 msgstr ""

3482

3476 -#: diff.c:5550

3483 +#: diff.c:5558

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

3485 msgstr ""

3486

3480 -#: diff.c:5553

3487 +#: diff.c:5561

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

3489 msgstr ""

3490

3484 -#: diff.c:5557

3491 +#: diff.c:5565

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

3493 msgstr ""

3494

3488 -#: diff.c:5559

3495 +#: diff.c:5567

3496 msgid "<algorithm>"

3497 msgstr ""

3498

3492 -#: diff.c:5560

3499 +#: diff.c:5568

3500 msgid "choose a diff algorithm"

3501 msgstr ""

3502

3496 -#: diff.c:5562

3503 +#: diff.c:5570

3504 msgid "<text>"

3505 msgstr ""

3506

3500 -#: diff.c:5563

3507 +#: diff.c:5571

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

3509 msgstr ""

3510

3504 -#: diff.c:5565 diff.c:5574 diff.c:5577

3511 +#: diff.c:5573 diff.c:5582 diff.c:5585

3512 msgid "<mode>"

3513 msgstr ""

3514

3508 -#: diff.c:5566

3515 +#: diff.c:5574

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

3517 msgstr ""

3518

3512 -#: diff.c:5569

3519 +#: diff.c:5577

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

3521 msgstr ""

3522

3516 -#: diff.c:5572

3523 +#: diff.c:5580

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

3525 msgstr ""

3526

3520 -#: diff.c:5575

3527 +#: diff.c:5583

3528 msgid "moved lines of code are colored differently"

3529 msgstr ""

3530

3524 -#: diff.c:5578

3531 +#: diff.c:5586

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

3533 msgstr ""

3534

3528 -#: diff.c:5581

3535 +#: diff.c:5589

3536 msgid "Other diff options"

3537 msgstr ""

3538

3532 -#: diff.c:5583

3539 +#: diff.c:5591

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

3541 msgstr ""

3542

3536 -#: diff.c:5587

3543 +#: diff.c:5595

3544 msgid "treat all files as text"

3545 msgstr ""

3546

3540 -#: diff.c:5589

3547 +#: diff.c:5597

3548 msgid "swap two inputs, reverse the diff"

3549 msgstr ""

3550

3544 -#: diff.c:5591

3551 +#: diff.c:5599

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

3553 msgstr ""

3554

3548 -#: diff.c:5593

3555 +#: diff.c:5601

3556 msgid "disable all output of the program"

3557 msgstr ""

3558

3552 -#: diff.c:5595

3559 +#: diff.c:5603

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

3561 msgstr ""

3562

3556 -#: diff.c:5597

3563 +#: diff.c:5605

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

3565 msgstr ""

3566

3560 -#: diff.c:5599

3567 +#: diff.c:5607

3568 msgid "<when>"

3569 msgstr ""

3570

3564 -#: diff.c:5600

3571 +#: diff.c:5608

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

3573 msgstr ""

3574

3568 -#: diff.c:5603

3575 +#: diff.c:5611

3576 msgid "<format>"

3577 msgstr ""

3578

3572 -#: diff.c:5604

3579 +#: diff.c:5612

3580 msgid "specify how differences in submodules are shown"

3581 msgstr ""

3582

3576 -#: diff.c:5608

3583 +#: diff.c:5616

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

3585 msgstr ""

3586

3580 -#: diff.c:5611

3587 +#: diff.c:5619

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

3589 msgstr ""

3590

3584 -#: diff.c:5613

3591 +#: diff.c:5621

3592 msgid "<string>"

3593 msgstr ""

3594

3588 -#: diff.c:5614

3595 +#: diff.c:5622

3596 msgid ""

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

3598 "string"

3599 msgstr ""

3600

3594 -#: diff.c:5617

3601 +#: diff.c:5625

3602 msgid ""

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

3604 "regex"

3605 msgstr ""

3606

3600 -#: diff.c:5620

3607 +#: diff.c:5628

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

3609 msgstr ""

3610

3604 -#: diff.c:5623

3611 +#: diff.c:5631

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

3613 msgstr ""

3614

3608 -#: diff.c:5626

3615 +#: diff.c:5634

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

3617 msgstr ""

3618

3612 -#: diff.c:5627 diff.c:5630

3619 +#: diff.c:5635 diff.c:5638

3620 msgid "<path>"

3621 msgstr ""

3622

3616 -#: diff.c:5628

3623 +#: diff.c:5636

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

3625 msgstr ""

3626

3620 -#: diff.c:5631

3627 +#: diff.c:5639

3628 msgid "skip the output to the specified path"

3629 msgstr ""

3630

3624 -#: diff.c:5633

3631 +#: diff.c:5641

3632 msgid "<object-id>"

3633 msgstr ""

3634

3628 -#: diff.c:5634

3635 +#: diff.c:5642

3636 msgid ""

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

3638 "object"

3639 msgstr ""

3640

3634 -#: diff.c:5636

3641 +#: diff.c:5644

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

3643 msgstr ""

3644

3638 -#: diff.c:5637

3645 +#: diff.c:5645

3646 msgid "select files by diff type"

3647 msgstr ""

3648

3642 -#: diff.c:5639

3649 +#: diff.c:5647

3650 msgid "<file>"

3651 msgstr ""

3652

3646 -#: diff.c:5640

3653 +#: diff.c:5648

3654 msgid "Output to a specific file"

3655 msgstr ""

3656

3650 -#: diff.c:6298

3657 +#: diff.c:6306

3658 msgid "exhaustive rename detection was skipped due to too many files."

3659 msgstr ""

3660

3654 -#: diff.c:6301

3661 +#: diff.c:6309

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

3663 msgstr ""

3664

3658 -#: diff.c:6304

3665 +#: diff.c:6312

3666 #, c-format

3667 msgid ""

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

@@ -3666,7 +3673,7 @@ msgstr ""

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

3674 msgstr ""

3675

3669 -#: diffcore-rename.c:1514

3676 +#: diffcore-rename.c:1564

3677 msgid "Performing inexact rename detection"

3678 msgstr ""

3679

@@ -3704,331 +3711,400 @@ msgstr ""

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

3712 msgstr ""

3713

3707 -#: dir.c:2351

3714 +#: dir.c:2464

3715 #, c-format

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

3717 msgstr ""

3718

3712 -#: dir.c:2653

3719 +#: dir.c:2766

3720 msgid "failed to get kernel name and information"

3721 msgstr ""

3722

3716 -#: dir.c:2777

3723 +#: dir.c:2890

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

3725 msgstr ""

3726

3720 -#: dir.c:3610

3727 +#: dir.c:3158

3728 +msgid ""

3729 +"No directory name could be guessed.\n"

3730 +"Please specify a directory on the command line"

3731 +msgstr ""

3732 +

3733 +#: dir.c:3837

3734 #, c-format

3735 msgid "index file corrupt in repo %s"

3736 msgstr ""

3737

3725 -#: dir.c:3657 dir.c:3662

3738 +#: dir.c:3884 dir.c:3889

3739 #, c-format

3740 msgid "could not create directories for %s"

3741 msgstr ""

3742

3730 -#: dir.c:3691

3743 +#: dir.c:3918

3744 #, c-format

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

3746 msgstr ""

3747

3735 -#: editor.c:74

3748 +#: editor.c:77

3749 #, c-format

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

3751 msgstr ""

3752

3740 -#: entry.c:176

3753 +#: entry.c:177

3754 msgid "Filtering content"

3755 msgstr ""

3756

3744 -#: entry.c:497

3757 +#: entry.c:498

3758 #, c-format

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

3760 msgstr ""

3761

3749 -#: environment.c:152

3762 +#: environment.c:143

3763 #, c-format

3764 msgid "bad git namespace path \"%s\""

3765 msgstr ""

3766

3754 -#: environment.c:334

3755 -#, c-format

3756 -msgid "could not set GIT_DIR to '%s'"

3757 -msgstr ""

3758 -

3767 #: exec-cmd.c:363

3768 #, c-format

3769 msgid "too many args to run %s"

3770 msgstr ""

3771

3764 -#: fetch-pack.c:182

3772 +#: fetch-pack.c:193

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

3774 msgstr ""

3775

3768 -#: fetch-pack.c:185

3776 +#: fetch-pack.c:196

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

3778 msgstr ""

3779

3772 -#: fetch-pack.c:196

3780 +#: fetch-pack.c:207

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

3782 msgstr ""

3783

3776 -#: fetch-pack.c:216

3784 +#: fetch-pack.c:227

3785 #, c-format

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

3787 msgstr ""

3788

3781 -#: fetch-pack.c:227

3789 +#: fetch-pack.c:238

3790 msgid "unable to write to remote"

3791 msgstr ""

3792

3785 -#: fetch-pack.c:288

3793 +#: fetch-pack.c:299

3794 msgid "--stateless-rpc requires multi_ack_detailed"

3795 msgstr ""

3796

3789 -#: fetch-pack.c:383 fetch-pack.c:1423

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

3798 #, c-format

3799 msgid "invalid shallow line: %s"

3800 msgstr ""

3801

3794 -#: fetch-pack.c:389 fetch-pack.c:1429

3802 +#: fetch-pack.c:400 fetch-pack.c:1440

3803 #, c-format

3804 msgid "invalid unshallow line: %s"

3805 msgstr ""

3806

3799 -#: fetch-pack.c:391 fetch-pack.c:1431

3807 +#: fetch-pack.c:402 fetch-pack.c:1442

3808 #, c-format

3809 msgid "object not found: %s"

3810 msgstr ""

3811

3804 -#: fetch-pack.c:394 fetch-pack.c:1434

3812 +#: fetch-pack.c:405 fetch-pack.c:1445

3813 #, c-format

3814 msgid "error in object: %s"

3815 msgstr ""

3816

3809 -#: fetch-pack.c:396 fetch-pack.c:1436

3817 +#: fetch-pack.c:407 fetch-pack.c:1447

3818 #, c-format

3819 msgid "no shallow found: %s"

3820 msgstr ""

3821

3814 -#: fetch-pack.c:399 fetch-pack.c:1440

3822 +#: fetch-pack.c:410 fetch-pack.c:1451

3823 #, c-format

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

3825 msgstr ""

3826

3819 -#: fetch-pack.c:439

3827 +#: fetch-pack.c:450

3828 #, c-format

3829 msgid "got %s %d %s"

3830 msgstr ""

3831

3824 -#: fetch-pack.c:456

3832 +#: fetch-pack.c:467

3833 #, c-format

3834 msgid "invalid commit %s"

3835 msgstr ""

3836

3829 -#: fetch-pack.c:487

3837 +#: fetch-pack.c:498

3838 msgid "giving up"

3839 msgstr ""

3840

3833 -#: fetch-pack.c:500 progress.c:339

3841 +#: fetch-pack.c:511 progress.c:339

3842 msgid "done"

3843 msgstr ""

3844

3837 -#: fetch-pack.c:512

3845 +#: fetch-pack.c:523

3846 #, c-format

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

3848 msgstr ""

3849

3842 -#: fetch-pack.c:548

3850 +#: fetch-pack.c:559

3851 #, c-format

3852 msgid "Marking %s as complete"

3853 msgstr ""

3854

3847 -#: fetch-pack.c:763

3855 +#: fetch-pack.c:774

3856 #, c-format

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

3858 msgstr ""

3859

3852 -#: fetch-pack.c:849

3860 +#: fetch-pack.c:860

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

3862 msgstr ""

3863

3856 -#: fetch-pack.c:857

3864 +#: fetch-pack.c:868

3865 msgid "protocol error: bad pack header"

3866 msgstr ""

3867

3860 -#: fetch-pack.c:951

3868 +#: fetch-pack.c:962

3869 #, c-format

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

3871 msgstr ""

3872

3865 -#: fetch-pack.c:957

3873 +#: fetch-pack.c:968

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

3875 msgstr ""

3876

3869 -#: fetch-pack.c:974

3877 +#: fetch-pack.c:985

3878 #, c-format

3879 msgid "%s failed"

3880 msgstr ""

3881

3874 -#: fetch-pack.c:976

3882 +#: fetch-pack.c:987

3883 msgid "error in sideband demultiplexer"

3884 msgstr ""

3885

3878 -#: fetch-pack.c:1019

3886 +#: fetch-pack.c:1030

3887 #, c-format

3888 msgid "Server version is %.*s"

3889 msgstr ""

3890

3883 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

3884 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

3885 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

3886 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

3891 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

3892 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

3893 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

3894 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

3895 #, c-format

3896 msgid "Server supports %s"

3897 msgstr ""

3898

3891 -#: fetch-pack.c:1029

3899 +#: fetch-pack.c:1040

3900 msgid "Server does not support shallow clients"

3901 msgstr ""

3902

3895 -#: fetch-pack.c:1089

3903 +#: fetch-pack.c:1100

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

3905 msgstr ""

3906

3899 -#: fetch-pack.c:1094

3907 +#: fetch-pack.c:1105

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

3909 msgstr ""

3910

3903 -#: fetch-pack.c:1098

3911 +#: fetch-pack.c:1109

3912 msgid "Server does not support --deepen"

3913 msgstr ""

3914

3907 -#: fetch-pack.c:1100

3915 +#: fetch-pack.c:1111

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

3917 msgstr ""

3918

3911 -#: fetch-pack.c:1113

3919 +#: fetch-pack.c:1124

3920 msgid "no common commits"

3921 msgstr ""

3922

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

3923 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

3924 msgid "source repository is shallow, reject to clone."

3925 msgstr ""

3926

3919 -#: fetch-pack.c:1128 fetch-pack.c:1660

3927 +#: fetch-pack.c:1139 fetch-pack.c:1671

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

3929 msgstr ""

3930

3923 -#: fetch-pack.c:1242

3931 +#: fetch-pack.c:1253

3932 #, c-format

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

3934 msgstr ""

3935

3928 -#: fetch-pack.c:1246

3936 +#: fetch-pack.c:1257

3937 #, c-format

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

3939 msgstr ""

3940

3933 -#: fetch-pack.c:1279

3941 +#: fetch-pack.c:1290

3942 msgid "Server does not support shallow requests"

3943 msgstr ""

3944

3937 -#: fetch-pack.c:1286

3945 +#: fetch-pack.c:1297

3946 msgid "Server supports filter"

3947 msgstr ""

3948

3941 -#: fetch-pack.c:1329 fetch-pack.c:2043

3949 +#: fetch-pack.c:1340 fetch-pack.c:2053

3950 msgid "unable to write request to remote"

3951 msgstr ""

3952

3945 -#: fetch-pack.c:1347

3953 +#: fetch-pack.c:1358

3954 #, c-format

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

3956 msgstr ""

3957

3950 -#: fetch-pack.c:1353

3958 +#: fetch-pack.c:1364

3959 #, c-format

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

3961 msgstr ""

3962

3955 -#: fetch-pack.c:1387

3963 +#: fetch-pack.c:1398

3964 #, c-format

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

3966 msgstr ""

3967

3960 -#: fetch-pack.c:1392

3968 +#: fetch-pack.c:1403

3969 #, c-format

3970 msgid "error processing acks: %d"

3971 msgstr ""

3972

3965 -#: fetch-pack.c:1402

3973 +#: fetch-pack.c:1413

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

3975 msgstr ""

3976

3969 -#: fetch-pack.c:1404

3977 +#: fetch-pack.c:1415

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

3979 msgstr ""

3980

3973 -#: fetch-pack.c:1445

3981 +#: fetch-pack.c:1456

3982 #, c-format

3983 msgid "error processing shallow info: %d"

3984 msgstr ""

3985

3978 -#: fetch-pack.c:1494

3986 +#: fetch-pack.c:1505

3987 #, c-format

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

3989 msgstr ""

3990

3983 -#: fetch-pack.c:1499

3991 +#: fetch-pack.c:1510

3992 #, c-format

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

3994 msgstr ""

3995

3988 -#: fetch-pack.c:1504

3996 +#: fetch-pack.c:1515

3997 #, c-format

3998 msgid "error processing wanted refs: %d"

3999 msgstr ""

4000

3993 -#: fetch-pack.c:1534

4001 +#: fetch-pack.c:1545

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

4003 msgstr ""

4004

3997 -#: fetch-pack.c:1939

4005 +#: fetch-pack.c:1949

4006 msgid "no matching remote head"

4007 msgstr ""

4008

4001 -#: fetch-pack.c:1962 builtin/clone.c:697

4009 +#: fetch-pack.c:1972 builtin/clone.c:581

4010 msgid "remote did not send all necessary objects"

4011 msgstr ""

4012

4005 -#: fetch-pack.c:2065

4013 +#: fetch-pack.c:2075

4014 msgid "unexpected 'ready' from remote"

4015 msgstr ""

4016

4009 -#: fetch-pack.c:2088

4017 +#: fetch-pack.c:2098

4018 #, c-format

4019 msgid "no such remote ref %s"

4020 msgstr ""

4021

4014 -#: fetch-pack.c:2091

4022 +#: fetch-pack.c:2101

4023 #, c-format

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

4025 msgstr ""

4026

4019 -#: gpg-interface.c:273

4027 +#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900

4028 +#: gpg-interface.c:916

4029 msgid "could not create temporary file"

4030 msgstr ""

4031

4023 -#: gpg-interface.c:276

4032 +#: gpg-interface.c:332 gpg-interface.c:452

4033 #, c-format

4034 msgid "failed writing detached signature to '%s'"

4035 msgstr ""

4036

4028 -#: gpg-interface.c:470

4037 +#: gpg-interface.c:443

4038 +msgid ""

4039 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4040 +"signature verification"

4041 +msgstr ""

4042 +

4043 +#: gpg-interface.c:467

4044 +msgid ""

4045 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4046 +"verification (available in openssh version 8.2p1+)"

4047 +msgstr ""

4048 +

4049 +#: gpg-interface.c:521

4050 +#, c-format

4051 +msgid "ssh signing revocation file configured but not found: %s"

4052 +msgstr ""

4053 +

4054 +#: gpg-interface.c:574

4055 +#, c-format

4056 +msgid "bad/incompatible signature '%s'"

4057 +msgstr ""

4058 +

4059 +#: gpg-interface.c:733 gpg-interface.c:738

4060 +#, c-format

4061 +msgid "failed to get the ssh fingerprint for key '%s'"

4062 +msgstr ""

4063 +

4064 +#: gpg-interface.c:760

4065 +msgid ""

4066 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4067 +msgstr ""

4068 +

4069 +#: gpg-interface.c:778

4070 +#, c-format

4071 +msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"

4072 +msgstr ""

4073 +

4074 +#: gpg-interface.c:784

4075 +#, c-format

4076 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4077 +msgstr ""

4078 +

4079 +#: gpg-interface.c:872

4080 msgid "gpg failed to sign the data"

4081 msgstr ""

4082

4083 +#: gpg-interface.c:893

4084 +msgid "user.signingkey needs to be set for ssh signing"

4085 +msgstr ""

4086 +

4087 +#: gpg-interface.c:904

4088 +#, c-format

4089 +msgid "failed writing ssh signing key to '%s'"

4090 +msgstr ""

4091 +

4092 +#: gpg-interface.c:922

4093 +#, c-format

4094 +msgid "failed writing ssh signing key buffer to '%s'"

4095 +msgstr ""

4096 +

4097 +#: gpg-interface.c:940

4098 +msgid ""

4099 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4100 +"8.2p1+)"

4101 +msgstr ""

4102 +

4103 +#: gpg-interface.c:952

4104 +#, c-format

4105 +msgid "failed reading ssh signing data buffer from '%s'"

4106 +msgstr ""

4107 +

4108 #: graph.c:98

4109 #, c-format

4110 msgid "ignored invalid color '%.*s' in log.graphColors"

@@ -4040,140 +4116,145 @@ msgid ""

4116 "with -P under PCRE v2"

4117 msgstr ""

4118

4043 -#: grep.c:1895

4119 +#: grep.c:1907

4120 #, c-format

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

4122 msgstr ""

4123

4048 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4124 +#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4125 #: builtin/rm.c:136

4126 #, c-format

4127 msgid "failed to stat '%s'"

4128 msgstr ""

4129

4054 -#: grep.c:1923

4130 +#: grep.c:1935

4131 #, c-format

4132 msgid "'%s': short read"

4133 msgstr ""

4134

4059 -#: help.c:23

4135 +#: help.c:24

4136 msgid "start a working area (see also: git help tutorial)"

4137 msgstr ""

4138

4063 -#: help.c:24

4139 +#: help.c:25

4140 msgid "work on the current change (see also: git help everyday)"

4141 msgstr ""

4142

4067 -#: help.c:25

4143 +#: help.c:26

4144 msgid "examine the history and state (see also: git help revisions)"

4145 msgstr ""

4146

4071 -#: help.c:26

4147 +#: help.c:27

4148 msgid "grow, mark and tweak your common history"

4149 msgstr ""

4150

4075 -#: help.c:27

4151 +#: help.c:28

4152 msgid "collaborate (see also: git help workflows)"

4153 msgstr ""

4154

4079 -#: help.c:31

4155 +#: help.c:32

4156 msgid "Main Porcelain Commands"

4157 msgstr ""

4158

4083 -#: help.c:32

4159 +#: help.c:33

4160 msgid "Ancillary Commands / Manipulators"

4161 msgstr ""

4162

4087 -#: help.c:33

4163 +#: help.c:34

4164 msgid "Ancillary Commands / Interrogators"

4165 msgstr ""

4166

4091 -#: help.c:34

4167 +#: help.c:35

4168 msgid "Interacting with Others"

4169 msgstr ""

4170

4095 -#: help.c:35

4171 +#: help.c:36

4172 msgid "Low-level Commands / Manipulators"

4173 msgstr ""

4174

4099 -#: help.c:36

4175 +#: help.c:37

4176 msgid "Low-level Commands / Interrogators"

4177 msgstr ""

4178

4103 -#: help.c:37

4179 +#: help.c:38

4180 msgid "Low-level Commands / Syncing Repositories"

4181 msgstr ""

4182

4107 -#: help.c:38

4183 +#: help.c:39

4184 msgid "Low-level Commands / Internal Helpers"

4185 msgstr ""

4186

4111 -#: help.c:300

4187 +#: help.c:313

4188 #, c-format

4189 msgid "available git commands in '%s'"

4190 msgstr ""

4191

4116 -#: help.c:307

4192 +#: help.c:320

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

4194 msgstr ""

4195

4120 -#: help.c:316

4196 +#: help.c:329

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

4198 msgstr ""

4199

4124 -#: help.c:365 git.c:100

4200 +#: help.c:378 git.c:100

4201 #, c-format

4202 msgid "unsupported command listing type '%s'"

4203 msgstr ""

4204

4129 -#: help.c:405

4205 +#: help.c:418

4206 msgid "The Git concept guides are:"

4207 msgstr ""

4208

4133 -#: help.c:429

4209 +#: help.c:442

4210 msgid "See 'git help <command>' to read about a specific subcommand"

4211 msgstr ""

4212

4137 -#: help.c:434

4213 +#: help.c:447

4214 msgid "External commands"

4215 msgstr ""

4216

4141 -#: help.c:449

4217 +#: help.c:462

4218 msgid "Command aliases"

4219 msgstr ""

4220

4145 -#: help.c:527

4221 +#: help.c:543

4222 #, c-format

4223 msgid ""

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

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

4226 msgstr ""

4227

4152 -#: help.c:543 help.c:631

4228 +#: help.c:565 help.c:662

4229 #, c-format

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

4231 msgstr ""

4232

4157 -#: help.c:591

4233 +#: help.c:613

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

4235 msgstr ""

4236

4161 -#: help.c:613

4237 +#: help.c:635

4238 #, c-format

4239 msgid "WARNING: You called a Git command named '%s', which does not exist."

4240 msgstr ""

4241

4166 -#: help.c:618

4242 +#: help.c:640

4243 #, c-format

4244 msgid "Continuing under the assumption that you meant '%s'."

4245 msgstr ""

4246

4171 -#: help.c:623

4247 +#: help.c:646

4248 +#, c-format

4249 +msgid "Run '%s' instead? (y/N)"

4250 +msgstr ""

4251 +

4252 +#: help.c:654

4253 #, c-format

4254 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4255 msgstr ""

4256

4176 -#: help.c:635

4257 +#: help.c:666

4258 msgid ""

4259 "\n"

4260 "The most similar command is"

@@ -4183,16 +4264,16 @@ msgid_plural ""

4264 msgstr[0] ""

4265 msgstr[1] ""

4266

4186 -#: help.c:675

4267 +#: help.c:706

4268 msgid "git version [<options>]"

4269 msgstr ""

4270

4190 -#: help.c:730

4271 +#: help.c:761

4272 #, c-format

4273 msgid "%s: %s - %s"

4274 msgstr ""

4275

4195 -#: help.c:734

4276 +#: help.c:765

4277 msgid ""

4278 "\n"

4279 "Did you mean this?"

@@ -4202,6 +4283,13 @@ msgid_plural ""

4283 msgstr[0] ""

4284 msgstr[1] ""

4285

4286 +#: hook.c:27

4287 +#, c-format

4288 +msgid ""

4289 +"The '%s' hook was ignored because it's not set as executable.\n"

4290 +"You can disable this warning with `git config advice.ignoredHook false`."

4291 +msgstr ""

4292 +

4293 #: ident.c:353

4294 msgid "Author identity unknown\n"

4295 msgstr ""

@@ -4253,7 +4341,7 @@ msgstr ""

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

4342 msgstr ""

4343

4256 -#: ident.c:454 builtin/commit.c:647

4344 +#: ident.c:454 builtin/commit.c:648

4345 #, c-format

4346 msgid "invalid date format: %s"

4347 msgstr ""

@@ -4340,7 +4428,12 @@ msgstr ""

4428 msgid "invalid value '%s' for lsrefs.unborn"

4429 msgstr ""

4430

4343 -#: ls-refs.c:167

4431 +#: ls-refs.c:174

4432 +#, c-format

4433 +msgid "unexpected line: '%s'"

4434 +msgstr ""

4435 +

4436 +#: ls-refs.c:178

4437 msgid "expected flush after ls-refs arguments"

4438 msgstr ""

4439

@@ -4348,44 +4441,44 @@ msgstr ""

4441 msgid "quoted CRLF detected"

4442 msgstr ""

4443

4351 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4444 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4445 #, c-format

4446 msgid "bad action '%s' for '%s'"

4447 msgstr ""

4448

4356 -#: merge-ort.c:1569 merge-recursive.c:1201

4449 +#: merge-ort.c:1584 merge-recursive.c:1211

4450 #, c-format

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

4452 msgstr ""

4453

4361 -#: merge-ort.c:1578 merge-recursive.c:1208

4454 +#: merge-ort.c:1593 merge-recursive.c:1218

4455 #, c-format

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

4457 msgstr ""

4458

4366 -#: merge-ort.c:1587 merge-recursive.c:1215

4459 +#: merge-ort.c:1602 merge-recursive.c:1225

4460 #, c-format

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

4462 msgstr ""

4463

4371 -#: merge-ort.c:1597 merge-ort.c:1604

4464 +#: merge-ort.c:1612 merge-ort.c:1620

4465 #, c-format

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

4467 msgstr ""

4468

4376 -#: merge-ort.c:1625

4469 +#: merge-ort.c:1642

4470 #, c-format

4471 msgid "Failed to merge submodule %s"

4472 msgstr ""

4473

4381 -#: merge-ort.c:1632

4474 +#: merge-ort.c:1649

4475 #, c-format

4476 msgid ""

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

4478 "%s\n"

4479 msgstr ""

4480

4388 -#: merge-ort.c:1636 merge-recursive.c:1269

4481 +#: merge-ort.c:1653 merge-recursive.c:1281

4482 #, c-format

4483 msgid ""

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

@@ -4396,42 +4489,42 @@ msgid ""

4489 "which will accept this suggestion.\n"

4490 msgstr ""

4491

4399 -#: merge-ort.c:1649

4492 +#: merge-ort.c:1666

4493 #, c-format

4494 msgid ""

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

4496 "%s"

4497 msgstr ""

4498

4406 -#: merge-ort.c:1868 merge-recursive.c:1358

4499 +#: merge-ort.c:1887 merge-recursive.c:1372

4500 msgid "Failed to execute internal merge"

4501 msgstr ""

4502

4410 -#: merge-ort.c:1873 merge-recursive.c:1363

4503 +#: merge-ort.c:1892 merge-recursive.c:1377

4504 #, c-format

4505 msgid "Unable to add %s to database"

4506 msgstr ""

4507

4415 -#: merge-ort.c:1880 merge-recursive.c:1396

4508 +#: merge-ort.c:1899 merge-recursive.c:1410

4509 #, c-format

4510 msgid "Auto-merging %s"

4511 msgstr ""

4512

4420 -#: merge-ort.c:2019 merge-recursive.c:2118

4513 +#: merge-ort.c:2038 merge-recursive.c:2132

4514 #, c-format

4515 msgid ""

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

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

4518 msgstr ""

4519

4427 -#: merge-ort.c:2029 merge-recursive.c:2128

4520 +#: merge-ort.c:2048 merge-recursive.c:2142

4521 #, c-format

4522 msgid ""

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

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

4525 msgstr ""

4526

4434 -#: merge-ort.c:2087

4527 +#: merge-ort.c:2106

4528 #, c-format

4529 msgid ""

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

@@ -4439,47 +4532,47 @@ msgid ""

4532 "majority of the files."

4533 msgstr ""

4534

4442 -#: merge-ort.c:2241 merge-recursive.c:2464

4535 +#: merge-ort.c:2260 merge-recursive.c:2478

4536 #, c-format

4537 msgid ""

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

4539 "renamed."

4540 msgstr ""

4541

4449 -#: merge-ort.c:2385 merge-recursive.c:3247

4542 +#: merge-ort.c:2400 merge-recursive.c:3261

4543 #, c-format

4544 msgid ""

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

4546 "moving it to %s."

4547 msgstr ""

4548

4456 -#: merge-ort.c:2392 merge-recursive.c:3254

4549 +#: merge-ort.c:2407 merge-recursive.c:3268

4550 #, c-format

4551 msgid ""

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

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

4554 msgstr ""

4555

4463 -#: merge-ort.c:2405 merge-recursive.c:3250

4556 +#: merge-ort.c:2420 merge-recursive.c:3264

4557 #, c-format

4558 msgid ""

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

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

4561 msgstr ""

4562

4470 -#: merge-ort.c:2413 merge-recursive.c:3257

4563 +#: merge-ort.c:2428 merge-recursive.c:3271

4564 #, c-format

4565 msgid ""

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

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

4568 msgstr ""

4569

4477 -#: merge-ort.c:2569

4570 +#: merge-ort.c:2584

4571 #, c-format

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

4573 msgstr ""

4574

4482 -#: merge-ort.c:2664

4575 +#: merge-ort.c:2679

4576 #, c-format

4577 msgid ""

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

@@ -4487,67 +4580,67 @@ msgid ""

4580 "markers."

4581 msgstr ""

4582

4490 -#: merge-ort.c:2683 merge-ort.c:2707

4583 +#: merge-ort.c:2698 merge-ort.c:2722

4584 #, c-format

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

4586 msgstr ""

4587

4495 -#: merge-ort.c:3182 merge-recursive.c:3008

4588 +#: merge-ort.c:3212 merge-recursive.c:3022

4589 #, c-format

4590 msgid "cannot read object %s"

4591 msgstr ""

4592

4500 -#: merge-ort.c:3185 merge-recursive.c:3011

4593 +#: merge-ort.c:3215 merge-recursive.c:3025

4594 #, c-format

4595 msgid "object %s is not a blob"

4596 msgstr ""

4597

4505 -#: merge-ort.c:3613

4598 +#: merge-ort.c:3644

4599 #, c-format

4600 msgid ""

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

4602 "%s instead."

4603 msgstr ""

4604

4512 -#: merge-ort.c:3689

4605 +#: merge-ort.c:3721

4606 #, c-format

4607 msgid ""

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

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

4610 msgstr ""

4611

4519 -#: merge-ort.c:3696

4612 +#: merge-ort.c:3728

4613 #, c-format

4614 msgid ""

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

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

4617 msgstr ""

4618

4526 -#: merge-ort.c:3796 merge-recursive.c:3087

4619 +#: merge-ort.c:3819 merge-recursive.c:3101

4620 msgid "content"

4621 msgstr ""

4622

4530 -#: merge-ort.c:3798 merge-recursive.c:3091

4623 +#: merge-ort.c:3821 merge-recursive.c:3105

4624 msgid "add/add"

4625 msgstr ""

4626

4534 -#: merge-ort.c:3800 merge-recursive.c:3136

4627 +#: merge-ort.c:3823 merge-recursive.c:3150

4628 msgid "submodule"

4629 msgstr ""

4630

4538 -#: merge-ort.c:3802 merge-recursive.c:3137

4631 +#: merge-ort.c:3825 merge-recursive.c:3151

4632 #, c-format

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

4634 msgstr ""

4635

4543 -#: merge-ort.c:3833

4636 +#: merge-ort.c:3856

4637 #, c-format

4638 msgid ""

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

4640 "of %s left in tree."

4641 msgstr ""

4642

4550 -#: merge-ort.c:4120

4643 +#: merge-ort.c:4152

4644 #, c-format

4645 msgid ""

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

@@ -4557,192 +4650,192 @@ msgstr ""

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

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

4652 #.

4560 -#: merge-ort.c:4487

4653 +#: merge-ort.c:4521

4654 #, c-format

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

4656 msgstr ""

4657

4565 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

4658 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

4659 #, c-format

4660 msgid ""

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

4662 " %s"

4663 msgstr ""

4664

4572 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

4665 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

4666 msgid "Already up to date."

4667 msgstr ""

4668

4576 -#: merge-recursive.c:352

4669 +#: merge-recursive.c:353

4670 msgid "(bad commit)\n"

4671 msgstr ""

4672

4580 -#: merge-recursive.c:375

4673 +#: merge-recursive.c:381

4674 #, c-format

4675 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4676 msgstr ""

4677

4585 -#: merge-recursive.c:384

4678 +#: merge-recursive.c:390

4679 #, c-format

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

4681 msgstr ""

4682

4590 -#: merge-recursive.c:872

4683 +#: merge-recursive.c:881

4684 #, c-format

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

4686 msgstr ""

4687

4595 -#: merge-recursive.c:883

4688 +#: merge-recursive.c:892

4689 #, c-format

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

4691 msgstr ""

4692

4600 -#: merge-recursive.c:897 merge-recursive.c:916

4693 +#: merge-recursive.c:906 merge-recursive.c:925

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

4695 msgstr ""

4696

4604 -#: merge-recursive.c:906

4697 +#: merge-recursive.c:915

4698 #, c-format

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

4700 msgstr ""

4701

4609 -#: merge-recursive.c:947 builtin/cat-file.c:41

4702 +#: merge-recursive.c:956 builtin/cat-file.c:41

4703 #, c-format

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

4705 msgstr ""

4706

4614 -#: merge-recursive.c:952

4707 +#: merge-recursive.c:961

4708 #, c-format

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

4710 msgstr ""

4711

4619 -#: merge-recursive.c:977

4712 +#: merge-recursive.c:986

4713 #, c-format

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

4715 msgstr ""

4716

4624 -#: merge-recursive.c:988

4717 +#: merge-recursive.c:997

4718 #, c-format

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

4720 msgstr ""

4721

4629 -#: merge-recursive.c:993

4722 +#: merge-recursive.c:1002

4723 #, c-format

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

4725 msgstr ""

4726

4634 -#: merge-recursive.c:1223 merge-recursive.c:1235

4727 +#: merge-recursive.c:1233 merge-recursive.c:1246

4728 #, c-format

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

4730 msgstr ""

4731

4639 -#: merge-recursive.c:1226 merge-recursive.c:1238

4732 +#: merge-recursive.c:1236 merge-recursive.c:1249

4733 #, c-format

4734 msgid "Fast-forwarding submodule %s"

4735 msgstr ""

4736

4644 -#: merge-recursive.c:1261

4737 +#: merge-recursive.c:1273

4738 #, c-format

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

4740 msgstr ""

4741

4649 -#: merge-recursive.c:1265

4742 +#: merge-recursive.c:1277

4743 #, c-format

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

4745 msgstr ""

4746

4654 -#: merge-recursive.c:1266

4747 +#: merge-recursive.c:1278

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

4749 msgstr ""

4750

4658 -#: merge-recursive.c:1278

4751 +#: merge-recursive.c:1290

4752 #, c-format

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

4754 msgstr ""

4755

4663 -#: merge-recursive.c:1420

4756 +#: merge-recursive.c:1434

4757 #, c-format

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

4759 msgstr ""

4760

4668 -#: merge-recursive.c:1492

4761 +#: merge-recursive.c:1506

4762 #, c-format

4763 msgid ""

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

4765 "in tree."

4766 msgstr ""

4767

4675 -#: merge-recursive.c:1497

4768 +#: merge-recursive.c:1511

4769 #, c-format

4770 msgid ""

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

4772 "left in tree."

4773 msgstr ""

4774

4682 -#: merge-recursive.c:1504

4775 +#: merge-recursive.c:1518

4776 #, c-format

4777 msgid ""

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

4779 "in tree at %s."

4780 msgstr ""

4781

4689 -#: merge-recursive.c:1509

4782 +#: merge-recursive.c:1523

4783 #, c-format

4784 msgid ""

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

4786 "left in tree at %s."

4787 msgstr ""

4788

4696 -#: merge-recursive.c:1544

4789 +#: merge-recursive.c:1558

4790 msgid "rename"

4791 msgstr ""

4792

4700 -#: merge-recursive.c:1544

4793 +#: merge-recursive.c:1558

4794 msgid "renamed"

4795 msgstr ""

4796

4704 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

4797 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

4798 #, c-format

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

4800 msgstr ""

4801

4709 -#: merge-recursive.c:1605

4802 +#: merge-recursive.c:1619

4803 #, c-format

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

4805 msgstr ""

4806

4714 -#: merge-recursive.c:1663

4807 +#: merge-recursive.c:1677

4808 #, c-format

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

4810 msgstr ""

4811

4719 -#: merge-recursive.c:1694

4812 +#: merge-recursive.c:1708

4813 #, c-format

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

4815 msgstr ""

4816

4724 -#: merge-recursive.c:1699

4817 +#: merge-recursive.c:1713

4818 #, c-format

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

4820 msgstr ""

4821

4729 -#: merge-recursive.c:1726

4822 +#: merge-recursive.c:1740

4823 #, c-format

4824 msgid ""

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

4826 "\"->\"%s\" in \"%s\"%s"

4827 msgstr ""

4828

4736 -#: merge-recursive.c:1731

4829 +#: merge-recursive.c:1745

4830 msgid " (left unresolved)"

4831 msgstr ""

4832

4740 -#: merge-recursive.c:1823

4833 +#: merge-recursive.c:1837

4834 #, c-format

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

4836 msgstr ""

4837

4745 -#: merge-recursive.c:2086

4838 +#: merge-recursive.c:2100

4839 #, c-format

4840 msgid ""

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

@@ -4750,86 +4843,86 @@ msgid ""

4843 "getting a majority of the files."

4844 msgstr ""

4845

4753 -#: merge-recursive.c:2220

4846 +#: merge-recursive.c:2234

4847 #, c-format

4848 msgid ""

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

4850 ">%s in %s"

4851 msgstr ""

4852

4760 -#: merge-recursive.c:3075

4853 +#: merge-recursive.c:3089

4854 msgid "modify"

4855 msgstr ""

4856

4764 -#: merge-recursive.c:3075

4857 +#: merge-recursive.c:3089

4858 msgid "modified"

4859 msgstr ""

4860

4768 -#: merge-recursive.c:3114

4861 +#: merge-recursive.c:3128

4862 #, c-format

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

4864 msgstr ""

4865

4773 -#: merge-recursive.c:3167

4866 +#: merge-recursive.c:3181

4867 #, c-format

4868 msgid "Adding as %s instead"

4869 msgstr ""

4870

4778 -#: merge-recursive.c:3371

4871 +#: merge-recursive.c:3385

4872 #, c-format

4873 msgid "Removing %s"

4874 msgstr ""

4875

4783 -#: merge-recursive.c:3394

4876 +#: merge-recursive.c:3408

4877 msgid "file/directory"

4878 msgstr ""

4879

4787 -#: merge-recursive.c:3399

4880 +#: merge-recursive.c:3413

4881 msgid "directory/file"

4882 msgstr ""

4883

4791 -#: merge-recursive.c:3406

4884 +#: merge-recursive.c:3420

4885 #, c-format

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

4887 msgstr ""

4888

4796 -#: merge-recursive.c:3415

4889 +#: merge-recursive.c:3429

4890 #, c-format

4891 msgid "Adding %s"

4892 msgstr ""

4893

4801 -#: merge-recursive.c:3424

4894 +#: merge-recursive.c:3438

4895 #, c-format

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

4897 msgstr ""

4898

4806 -#: merge-recursive.c:3477

4899 +#: merge-recursive.c:3491

4900 #, c-format

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

4902 msgstr ""

4903

4811 -#: merge-recursive.c:3571

4904 +#: merge-recursive.c:3585

4905 msgid "Merging:"

4906 msgstr ""

4907

4815 -#: merge-recursive.c:3584

4908 +#: merge-recursive.c:3598

4909 #, c-format

4910 msgid "found %u common ancestor:"

4911 msgid_plural "found %u common ancestors:"

4912 msgstr[0] ""

4913 msgstr[1] ""

4914

4822 -#: merge-recursive.c:3634

4915 +#: merge-recursive.c:3648

4916 msgid "merge returned no commit"

4917 msgstr ""

4918

4826 -#: merge-recursive.c:3799

4919 +#: merge-recursive.c:3816

4920 #, c-format

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

4922 msgstr ""

4923

4831 -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

4832 -#: builtin/stash.c:473

4924 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

4925 +#: builtin/stash.c:489

4926 msgid "Unable to write index."

4927 msgstr ""

4928

@@ -4837,189 +4930,221 @@ msgstr ""

4930 msgid "failed to read the cache"

4931 msgstr ""

4932

4840 -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

4841 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

4842 -#: builtin/stash.c:267

4933 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

4934 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

4935 +#: builtin/stash.c:269

4936 msgid "unable to write new index file"

4937 msgstr ""

4938

4846 -#: midx.c:74

4939 +#: midx.c:78

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

4941 msgstr ""

4942

4850 -#: midx.c:105

4943 +#: midx.c:109

4944 #, c-format

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

4946 msgstr ""

4947

4855 -#: midx.c:121

4948 +#: midx.c:125

4949 #, c-format

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

4951 msgstr ""

4952

4860 -#: midx.c:126

4953 +#: midx.c:130

4954 #, c-format

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

4956 msgstr ""

4957

4865 -#: midx.c:131

4958 +#: midx.c:135

4959 #, c-format

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

4961 msgstr ""

4962

4870 -#: midx.c:148

4963 +#: midx.c:152

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

4965 msgstr ""

4966

4874 -#: midx.c:150

4967 +#: midx.c:154

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

4969 msgstr ""

4970

4878 -#: midx.c:152

4971 +#: midx.c:156

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

4973 msgstr ""

4974

4882 -#: midx.c:154

4975 +#: midx.c:158

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

4977 msgstr ""

4978

4886 -#: midx.c:170

4979 +#: midx.c:174

4980 #, c-format

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

4982 msgstr ""

4983

4891 -#: midx.c:214

4984 +#: midx.c:221

4985 #, c-format

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

4987 msgstr ""

4988

4896 -#: midx.c:264

4989 +#: midx.c:271

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

4991 msgstr ""

4992

4900 -#: midx.c:490

4993 +#: midx.c:502

4994 #, c-format

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

4996 msgstr ""

4997

4905 -#: midx.c:496

4998 +#: midx.c:508

4999 #, c-format

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

5001 msgstr ""

5002

4910 -#: midx.c:564

5003 +#: midx.c:576

5004 #, c-format

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

5006 msgstr ""

5007

4915 -#: midx.c:880 builtin/index-pack.c:1533

5008 +#: midx.c:892

5009 msgid "cannot store reverse index file"

5010 msgstr ""

5011

4919 -#: midx.c:920

5012 +#: midx.c:990

5013 +#, c-format

5014 +msgid "could not parse line: %s"

5015 +msgstr ""

5016 +

5017 +#: midx.c:992

5018 +#, c-format

5019 +msgid "malformed line: %s"

5020 +msgstr ""

5021 +

5022 +#: midx.c:1159

5023 msgid "ignoring existing multi-pack-index; checksum mismatch"

5024 msgstr ""

5025

4923 -#: midx.c:943

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

5026 +#: midx.c:1184

5027 +msgid "could not load pack"

5028 msgstr ""

5029

4927 -#: midx.c:989

5030 +#: midx.c:1190

5031 #, c-format

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

5032 +msgid "could not open index for %s"

5033 +msgstr ""

5034 +

5035 +#: midx.c:1201

5036 +msgid "Adding packfiles to multi-pack-index"

5037 msgstr ""

5038

4932 -#: midx.c:1034

5039 +#: midx.c:1244

5040 #, c-format

5041 msgid "unknown preferred pack: '%s'"

5042 msgstr ""

5043

4937 -#: midx.c:1039

5044 +#: midx.c:1289

5045 +#, c-format

5046 +msgid "cannot select preferred pack %s with no objects"

5047 +msgstr ""

5048 +

5049 +#: midx.c:1321

5050 +#, c-format

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

5052 +msgstr ""

5053 +

5054 +#: midx.c:1367

5055 #, c-format

5056 msgid "preferred pack '%s' is expired"

5057 msgstr ""

5058

4942 -#: midx.c:1055

5059 +#: midx.c:1380

5060 msgid "no pack files to index."

5061 msgstr ""

5062

4946 -#: midx.c:1135 builtin/clean.c:37

5063 +#: midx.c:1417

5064 +msgid "could not write multi-pack bitmap"

5065 +msgstr ""

5066 +

5067 +#: midx.c:1427

5068 +msgid "could not write multi-pack-index"

5069 +msgstr ""

5070 +

5071 +#: midx.c:1486 builtin/clean.c:37

5072 #, c-format

5073 msgid "failed to remove %s"

5074 msgstr ""

5075

4951 -#: midx.c:1166

5076 +#: midx.c:1517

5077 #, c-format

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

5079 msgstr ""

5080

4956 -#: midx.c:1225

5081 +#: midx.c:1577

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

5083 msgstr ""

5084

4960 -#: midx.c:1233

5085 +#: midx.c:1585

5086 msgid "incorrect checksum"

5087 msgstr ""

5088

4964 -#: midx.c:1236

5089 +#: midx.c:1588

5090 msgid "Looking for referenced packfiles"

5091 msgstr ""

5092

4968 -#: midx.c:1251

5093 +#: midx.c:1603

5094 #, c-format

5095 msgid ""

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

5097 msgstr ""

5098

4974 -#: midx.c:1256

5099 +#: midx.c:1608

5100 msgid "the midx contains no oid"

5101 msgstr ""

5102

4978 -#: midx.c:1265

5103 +#: midx.c:1617

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

5105 msgstr ""

5106

4982 -#: midx.c:1274

5107 +#: midx.c:1626

5108 #, c-format

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

5110 msgstr ""

5111

4987 -#: midx.c:1294

5112 +#: midx.c:1646

5113 msgid "Sorting objects by packfile"

5114 msgstr ""

5115

4991 -#: midx.c:1301

5116 +#: midx.c:1653

5117 msgid "Verifying object offsets"

5118 msgstr ""

5119

4995 -#: midx.c:1317

5120 +#: midx.c:1669

5121 #, c-format

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

5123 msgstr ""

5124

5000 -#: midx.c:1323

5125 +#: midx.c:1675

5126 #, c-format

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

5128 msgstr ""

5129

5005 -#: midx.c:1332

5130 +#: midx.c:1684

5131 #, c-format

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

5133 msgstr ""

5134

5010 -#: midx.c:1357

5135 +#: midx.c:1709

5136 msgid "Counting referenced objects"

5137 msgstr ""

5138

5014 -#: midx.c:1367

5139 +#: midx.c:1719

5140 msgid "Finding and deleting unreferenced packfiles"

5141 msgstr ""

5142

5018 -#: midx.c:1558

5143 +#: midx.c:1911

5144 msgid "could not start pack-objects"

5145 msgstr ""

5146

5022 -#: midx.c:1578

5147 +#: midx.c:1931

5148 msgid "could not finish pack-objects"

5149 msgstr ""

5150

@@ -5074,257 +5199,257 @@ msgstr ""

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

5200 msgstr ""

5201

5077 -#: object-file.c:526

5202 +#: object-file.c:459

5203 #, c-format

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

5205 msgstr ""

5206

5082 -#: object-file.c:584

5207 +#: object-file.c:517

5208 #, c-format

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

5210 msgstr ""

5211

5087 -#: object-file.c:658

5212 +#: object-file.c:591

5213 #, c-format

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

5215 msgstr ""

5216

5092 -#: object-file.c:665

5217 +#: object-file.c:598

5218 #, c-format

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

5220 msgstr ""

5221

5097 -#: object-file.c:708

5222 +#: object-file.c:641

5223 msgid "unable to fdopen alternates lockfile"

5224 msgstr ""

5225

5101 -#: object-file.c:726

5226 +#: object-file.c:659

5227 msgid "unable to read alternates file"

5228 msgstr ""

5229

5105 -#: object-file.c:733

5230 +#: object-file.c:666

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

5232 msgstr ""

5233

5109 -#: object-file.c:768

5234 +#: object-file.c:701

5235 #, c-format

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

5237 msgstr ""

5238

5114 -#: object-file.c:789

5239 +#: object-file.c:722

5240 #, c-format

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

5242 msgstr ""

5243

5119 -#: object-file.c:795

5244 +#: object-file.c:728

5245 #, c-format

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

5247 msgstr ""

5248

5124 -#: object-file.c:801

5249 +#: object-file.c:734

5250 #, c-format

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

5252 msgstr ""

5253

5129 -#: object-file.c:809

5254 +#: object-file.c:742

5255 #, c-format

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

5257 msgstr ""

5258

5134 -#: object-file.c:869

5259 +#: object-file.c:773

5260 +#, c-format

5261 +msgid "could not find object directory matching %s"

5262 +msgstr ""

5263 +

5264 +#: object-file.c:823

5265 #, c-format

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

5267 msgstr ""

5268

5139 -#: object-file.c:1019

5269 +#: object-file.c:973

5270 #, c-format

5271 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5272 msgstr ""

5273

5144 -#: object-file.c:1054

5274 +#: object-file.c:1008

5275 #, c-format

5276 msgid "mmap failed%s"

5277 msgstr ""

5278

5149 -#: object-file.c:1218

5279 +#: object-file.c:1174

5280 #, c-format

5281 msgid "object file %s is empty"

5282 msgstr ""

5283

5154 -#: object-file.c:1353 object-file.c:2548

5284 +#: object-file.c:1293 object-file.c:2499

5285 #, c-format

5286 msgid "corrupt loose object '%s'"

5287 msgstr ""

5288

5159 -#: object-file.c:1355 object-file.c:2552

5289 +#: object-file.c:1295 object-file.c:2503

5290 #, c-format

5291 msgid "garbage at end of loose object '%s'"

5292 msgstr ""

5293

5164 -#: object-file.c:1397

5165 -msgid "invalid object type"

5166 -msgstr ""

5167 -

5168 -#: object-file.c:1481

5294 +#: object-file.c:1417

5295 #, c-format

5170 -msgid "unable to unpack %s header with --allow-unknown-type"

5296 +msgid "unable to parse %s header"

5297 msgstr ""

5298

5173 -#: object-file.c:1484

5174 -#, c-format

5175 -msgid "unable to unpack %s header"

5299 +#: object-file.c:1419

5300 +msgid "invalid object type"

5301 msgstr ""

5302

5178 -#: object-file.c:1490

5303 +#: object-file.c:1430

5304 #, c-format

5180 -msgid "unable to parse %s header with --allow-unknown-type"

5305 +msgid "unable to unpack %s header"

5306 msgstr ""

5307

5183 -#: object-file.c:1493

5308 +#: object-file.c:1434

5309 #, c-format

5185 -msgid "unable to parse %s header"

5310 +msgid "header for %s too long, exceeds %d bytes"

5311 msgstr ""

5312

5188 -#: object-file.c:1717

5313 +#: object-file.c:1664

5314 #, c-format

5315 msgid "failed to read object %s"

5316 msgstr ""

5317

5193 -#: object-file.c:1721

5318 +#: object-file.c:1668

5319 #, c-format

5320 msgid "replacement %s not found for %s"

5321 msgstr ""

5322

5198 -#: object-file.c:1725

5323 +#: object-file.c:1672

5324 #, c-format

5325 msgid "loose object %s (stored in %s) is corrupt"

5326 msgstr ""

5327

5203 -#: object-file.c:1729

5328 +#: object-file.c:1676

5329 #, c-format

5330 msgid "packed object %s (stored in %s) is corrupt"

5331 msgstr ""

5332

5208 -#: object-file.c:1834

5333 +#: object-file.c:1781

5334 #, c-format

5335 msgid "unable to write file %s"

5336 msgstr ""

5337

5213 -#: object-file.c:1841

5338 +#: object-file.c:1788

5339 #, c-format

5340 msgid "unable to set permission to '%s'"

5341 msgstr ""

5342

5218 -#: object-file.c:1848

5343 +#: object-file.c:1795

5344 msgid "file write error"

5345 msgstr ""

5346

5222 -#: object-file.c:1868

5347 +#: object-file.c:1815

5348 msgid "error when closing loose object file"

5349 msgstr ""

5350

5226 -#: object-file.c:1933

5351 +#: object-file.c:1882

5352 #, c-format

5353 msgid "insufficient permission for adding an object to repository database %s"

5354 msgstr ""

5355

5231 -#: object-file.c:1935

5356 +#: object-file.c:1884

5357 msgid "unable to create temporary file"

5358 msgstr ""

5359

5235 -#: object-file.c:1959

5360 +#: object-file.c:1908

5361 msgid "unable to write loose object file"

5362 msgstr ""

5363

5239 -#: object-file.c:1965

5364 +#: object-file.c:1914

5365 #, c-format

5366 msgid "unable to deflate new object %s (%d)"

5367 msgstr ""

5368

5244 -#: object-file.c:1969

5369 +#: object-file.c:1918

5370 #, c-format

5371 msgid "deflateEnd on object %s failed (%d)"

5372 msgstr ""

5373

5249 -#: object-file.c:1973

5374 +#: object-file.c:1922

5375 #, c-format

5376 msgid "confused by unstable object source data for %s"

5377 msgstr ""

5378

5254 -#: object-file.c:1983 builtin/pack-objects.c:1237

5379 +#: object-file.c:1933 builtin/pack-objects.c:1243

5380 #, c-format

5381 msgid "failed utime() on %s"

5382 msgstr ""

5383

5259 -#: object-file.c:2060

5384 +#: object-file.c:2011

5385 #, c-format

5386 msgid "cannot read object for %s"

5387 msgstr ""

5388

5264 -#: object-file.c:2111

5389 +#: object-file.c:2062

5390 msgid "corrupt commit"

5391 msgstr ""

5392

5268 -#: object-file.c:2119

5393 +#: object-file.c:2070

5394 msgid "corrupt tag"

5395 msgstr ""

5396

5272 -#: object-file.c:2219

5397 +#: object-file.c:2170

5398 #, c-format

5399 msgid "read error while indexing %s"

5400 msgstr ""

5401

5277 -#: object-file.c:2222

5402 +#: object-file.c:2173

5403 #, c-format

5404 msgid "short read while indexing %s"

5405 msgstr ""

5406

5282 -#: object-file.c:2295 object-file.c:2305

5407 +#: object-file.c:2246 object-file.c:2256

5408 #, c-format

5409 msgid "%s: failed to insert into database"

5410 msgstr ""

5411

5287 -#: object-file.c:2311

5412 +#: object-file.c:2262

5413 #, c-format

5414 msgid "%s: unsupported file type"

5415 msgstr ""

5416

5292 -#: object-file.c:2335

5417 +#: object-file.c:2286 builtin/fetch.c:1445

5418 #, c-format

5419 msgid "%s is not a valid object"

5420 msgstr ""

5421

5297 -#: object-file.c:2337

5422 +#: object-file.c:2288

5423 #, c-format

5424 msgid "%s is not a valid '%s' object"

5425 msgstr ""

5426

5302 -#: object-file.c:2364 builtin/index-pack.c:192

5427 +#: object-file.c:2315

5428 #, c-format

5429 msgid "unable to open %s"

5430 msgstr ""

5431

5307 -#: object-file.c:2559 object-file.c:2612

5432 +#: object-file.c:2510

5433 #, c-format

5434 msgid "hash mismatch for %s (expected %s)"

5435 msgstr ""

5436

5312 -#: object-file.c:2583

5437 +#: object-file.c:2533

5438 #, c-format

5439 msgid "unable to mmap %s"

5440 msgstr ""

5441

5317 -#: object-file.c:2588

5442 +#: object-file.c:2539

5443 #, c-format

5444 msgid "unable to unpack header of %s"

5445 msgstr ""

5446

5322 -#: object-file.c:2594

5447 +#: object-file.c:2544

5448 #, c-format

5449 msgid "unable to parse header of %s"

5450 msgstr ""

5451

5327 -#: object-file.c:2605

5452 +#: object-file.c:2555

5453 #, c-format

5454 msgid "unable to unpack contents of %s"

5455 msgstr ""

@@ -5436,12 +5561,25 @@ msgstr ""

5561 msgid "hash mismatch %s"

5562 msgstr ""

5563

5439 -#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411

5564 +#: pack-bitmap.c:348

5565 +msgid "multi-pack bitmap is missing required reverse index"

5566 +msgstr ""

5567 +

5568 +#: pack-bitmap.c:424

5569 +msgid "load_reverse_index: could not open pack"

5570 +msgstr ""

5571 +

5572 +#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424

5573 #, c-format

5574 msgid "unable to get size of %s"

5575 msgstr ""

5576

5444 -#: pack-bitmap.c:1571 builtin/rev-list.c:92

5577 +#: pack-bitmap.c:1916

5578 +#, c-format

5579 +msgid "could not find %s in pack %s at offset %<PRIuMAX>"

5580 +msgstr ""

5581 +

5582 +#: pack-bitmap.c:1952 builtin/rev-list.c:92

5583 #, c-format

5584 msgid "unable to get disk usage of %s"

5585 msgstr ""

@@ -5471,45 +5609,45 @@ msgstr ""

5609 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5610 msgstr ""

5611

5474 -#: pack-write.c:250

5612 +#: pack-write.c:251

5613 msgid "cannot both write and verify reverse index"

5614 msgstr ""

5615

5478 -#: pack-write.c:271

5616 +#: pack-write.c:270

5617 #, c-format

5618 msgid "could not stat: %s"

5619 msgstr ""

5620

5483 -#: pack-write.c:283

5621 +#: pack-write.c:282

5622 #, c-format

5623 msgid "failed to make %s readable"

5624 msgstr ""

5625

5488 -#: pack-write.c:522

5626 +#: pack-write.c:520

5627 #, c-format

5628 msgid "could not write '%s' promisor file"

5629 msgstr ""

5630

5493 -#: packfile.c:625

5631 +#: packfile.c:626

5632 msgid "offset before end of packfile (broken .idx?)"

5633 msgstr ""

5634

5497 -#: packfile.c:655

5635 +#: packfile.c:656

5636 #, c-format

5637 msgid "packfile %s cannot be mapped%s"

5638 msgstr ""

5639

5502 -#: packfile.c:1934

5640 +#: packfile.c:1923

5641 #, c-format

5642 msgid "offset before start of pack index for %s (corrupt index?)"

5643 msgstr ""

5644

5507 -#: packfile.c:1938

5645 +#: packfile.c:1927

5646 #, c-format

5647 msgid "offset beyond end of pack index for %s (truncated index?)"

5648 msgstr ""

5649

5512 -#: parse-options-cb.c:20 parse-options-cb.c:24

5650 +#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175

5651 #, c-format

5652 msgid "option `%s' expects a numerical value"

5653 msgstr ""

@@ -5529,71 +5667,71 @@ msgstr ""

5667 msgid "malformed object name '%s'"

5668 msgstr ""

5669

5532 -#: parse-options.c:38

5670 +#: parse-options.c:58

5671 #, c-format

5672 msgid "%s requires a value"

5673 msgstr ""

5674

5537 -#: parse-options.c:73

5675 +#: parse-options.c:93

5676 #, c-format

5677 msgid "%s is incompatible with %s"

5678 msgstr ""

5679

l10n: git.pot: v2.34.0 round 1 (134 new, 154 removed)