33b62fba4d · matheusbsbs/matheus-bagliano

@@ -115,7 +115,7 @@

115 # shallow repository | 浅（克隆）仓库

116 # signed tag | 签名标签

117 # smart HTTP protocol | 智能 HTTP 协议

118 -# squash | 压缩

118 +# squash | 挤压

119 # stage | n. 暂存区（即索引）; v. 暂存

120 # stash | n. 贮藏区; v. 贮藏

121 # submodule | 子模组

@@ -141,8 +141,8 @@ msgid ""

141 msgstr ""

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

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

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

145 -"PO-Revision-Date: 2021-03-14 23:21+0800\n"

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

145 +"PO-Revision-Date: 2021-06-05 22:10+0800\n"

146 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

147 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

148 "Language: zh_CN\n"

@@ -156,9 +156,9 @@ msgstr ""

156 msgid "Huh (%s)?"

157 msgstr "嗯（%s）？"

158

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

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

161 -#: builtin/rebase.c:1963

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

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

161 +#: builtin/rebase.c:1953

162 msgid "could not read index"

163 msgstr "不能读取索引"

164

@@ -186,7 +186,7 @@ msgstr "更新"

186 msgid "could not stage '%s'"

187 msgstr "不能暂存 '%s'"

188

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

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

190 msgid "could not write index"

191 msgstr "不能写入索引"

192

@@ -202,7 +202,7 @@ msgstr[1] "更新了 %d 个路径\n"

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

203 msgstr "说明：%s 现已成为未跟踪的。\n"

204

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

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

206 #: builtin/reset.c:145

207 #, c-format

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

@@ -342,12 +342,12 @@ msgstr "缓存"

342 msgid "unstaged"

343 msgstr "未缓存"

344

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

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

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

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

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

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

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

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

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

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

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

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

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

352 msgid "path"

353 msgstr "路径"

@@ -854,7 +854,7 @@ msgstr "对不起，不能编辑这个块"

854 msgid "'git apply' failed"

855 msgstr "'git apply' 失败"

856

857 -#: advice.c:143

857 +#: advice.c:145

858 #, c-format

859 msgid ""

860 "\n"

@@ -863,37 +863,37 @@ msgstr ""

863 "\n"

864 "使用 \"git config advice.%s false\" 来关闭此消息"

865

866 -#: advice.c:159

866 +#: advice.c:161

867 #, c-format

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

869 msgstr "%s提示：%.*s%s\n"

870

871 -#: advice.c:250

871 +#: advice.c:252

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

873 msgstr "无法拣选，因为您有未合并的文件。"

874

875 -#: advice.c:252

875 +#: advice.c:254

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

877 msgstr "无法提交，因为您有未合并的文件。"

878

879 -#: advice.c:254

879 +#: advice.c:256

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

881 msgstr "无法合并，因为您有未合并的文件。"

882

883 -#: advice.c:256

883 +#: advice.c:258

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

885 msgstr "无法拉取，因为您有未合并的文件。"

886

887 -#: advice.c:258

887 +#: advice.c:260

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

889 msgstr "无法回退，因为您有未合并的文件。"

890

891 -#: advice.c:260

891 +#: advice.c:262

892 #, c-format

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

894 msgstr "无法 %s，因为您有未合并的文件。"

895

896 -#: advice.c:268

896 +#: advice.c:270

897 msgid ""

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

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

@@ -901,23 +901,36 @@ msgstr ""

901 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

902 "解决方案并提交。"

903

904 -#: advice.c:276

904 +#: advice.c:278

905 msgid "Exiting because of an unresolved conflict."

906 msgstr "因为存在未解决的冲突而退出。"

907

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

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

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

910 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

911

912 -#: advice.c:283

912 +#: advice.c:285

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

914 msgstr "请在合并前先提交您的修改。"

915

916 -#: advice.c:284

916 +#: advice.c:286

917 msgid "Exiting because of unfinished merge."

918 msgstr "因为存在未完成的合并而退出。"

919

920 -#: advice.c:290

920 +#: advice.c:296

921 +#, c-format

922 +msgid ""

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

924 +"index\n"

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

926 +msgstr "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"

927 +

928 +#: advice.c:303

929 +msgid ""

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

931 +msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"

932 +

933 +#: advice.c:310

934 #, c-format

935 msgid ""

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

@@ -964,82 +977,78 @@ msgstr "命令行以 \\ 结尾"

977 msgid "unclosed quote"

978 msgstr "未关闭的引号"

979

967 -#: apply.c:69

980 +#: apply.c:70

981 #, c-format

982 msgid "unrecognized whitespace option '%s'"

983 msgstr "未能识别的空白字符选项 '%s'"

984

972 -#: apply.c:85

985 +#: apply.c:86

986 #, c-format

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

988 msgstr "未能识别的空白字符忽略选项 '%s'"

989

977 -#: apply.c:135

990 +#: apply.c:136

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

992 msgstr "--reject 和 --3way 不能同时使用。"

993

981 -#: apply.c:137

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

983 -msgstr "--cached 和 --3way 不能同时使用。"

984 -

985 -#: apply.c:140

994 +#: apply.c:139

995 msgid "--3way outside a repository"

996 msgstr "--3way 在一个仓库之外"

997

989 -#: apply.c:151

998 +#: apply.c:150

999 msgid "--index outside a repository"

1000 msgstr "--index 在一个仓库之外"

1001

993 -#: apply.c:154

1002 +#: apply.c:153

1003 msgid "--cached outside a repository"

1004 msgstr "--cached 在一个仓库之外"

1005

997 -#: apply.c:801

1006 +#: apply.c:800

1007 #, c-format

1008 msgid "Cannot prepare timestamp regexp %s"

1009 msgstr "无法准备时间戳正则表达式 %s"

1010

1002 -#: apply.c:810

1011 +#: apply.c:809

1012 #, c-format

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

1014 msgstr "regexec 返回 %d，输入为：%s"

1015

1007 -#: apply.c:884

1016 +#: apply.c:883

1017 #, c-format

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

1019 msgstr "不能在补丁的第 %d 行找到文件名"

1020

1012 -#: apply.c:922

1021 +#: apply.c:921

1022 #, c-format

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

1024 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

1025

1017 -#: apply.c:928

1026 +#: apply.c:927

1027 #, c-format

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

1029 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

1030

1022 -#: apply.c:929

1031 +#: apply.c:928

1032 #, c-format

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

1034 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

1035

1027 -#: apply.c:934

1036 +#: apply.c:933

1037 #, c-format

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

1039 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

1040

1032 -#: apply.c:963

1041 +#: apply.c:962

1042 #, c-format

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

1044 msgstr "第 %d 行包含无效文件模式：%s"

1045

1037 -#: apply.c:1282

1046 +#: apply.c:1281

1047 #, c-format

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

1049 msgstr "不一致的文件头，%d 行和 %d 行"

1050

1042 -#: apply.c:1372

1051 +#: apply.c:1371

1052 #, c-format

1053 msgid ""

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

@@ -1050,92 +1059,92 @@ msgid_plural ""

1059 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

1060 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

1061

1053 -#: apply.c:1385

1062 +#: apply.c:1384

1063 #, c-format

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

1065 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

1066

1058 -#: apply.c:1481

1067 +#: apply.c:1480

1068 #, c-format

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

1070 msgstr "recount：意外的行：%.*s"

1071

1063 -#: apply.c:1550

1072 +#: apply.c:1549

1073 #, c-format

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

1075 msgstr "第 %d 行的补丁片段没有头信息：%.*s"

1076

1068 -#: apply.c:1753

1077 +#: apply.c:1752

1078 msgid "new file depends on old contents"

1079 msgstr "新文件依赖旧内容"

1080

1072 -#: apply.c:1755

1081 +#: apply.c:1754

1082 msgid "deleted file still has contents"

1083 msgstr "删除的文件仍有内容"

1084

1076 -#: apply.c:1789

1085 +#: apply.c:1788

1086 #, c-format

1087 msgid "corrupt patch at line %d"

1088 msgstr "补丁在第 %d 行损坏"

1089

1081 -#: apply.c:1826

1090 +#: apply.c:1825

1091 #, c-format

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

1093 msgstr "新文件 %s 依赖旧内容"

1094

1086 -#: apply.c:1828

1095 +#: apply.c:1827

1096 #, c-format

1097 msgid "deleted file %s still has contents"

1098 msgstr "删除的文件 %s 仍有内容"

1099

1091 -#: apply.c:1831

1100 +#: apply.c:1830

1101 #, c-format

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

1103 msgstr "** 警告：文件 %s 成为空文件但并未删除"

1104

1096 -#: apply.c:1978

1105 +#: apply.c:1977

1106 #, c-format

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

1108 msgstr "二进制补丁在第 %d 行损坏：%.*s"

1109

1101 -#: apply.c:2015

1110 +#: apply.c:2014

1111 #, c-format

1112 msgid "unrecognized binary patch at line %d"

1113 msgstr "未能识别的二进制补丁位于第 %d 行"

1114

1106 -#: apply.c:2177

1115 +#: apply.c:2176

1116 #, c-format

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

1118 msgstr "补丁文件的第 %d 行只有垃圾数据"

1119

1111 -#: apply.c:2263

1120 +#: apply.c:2262

1121 #, c-format

1122 msgid "unable to read symlink %s"

1123 msgstr "无法读取符号链接 %s"

1124

1116 -#: apply.c:2267

1125 +#: apply.c:2266

1126 #, c-format

1127 msgid "unable to open or read %s"

1128 msgstr "不能打开或读取 %s"

1129

1121 -#: apply.c:2936

1130 +#: apply.c:2935

1131 #, c-format

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

1133 msgstr "无效的行首字符：'%c'"

1134

1126 -#: apply.c:3057

1135 +#: apply.c:3056

1136 #, c-format

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

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

1139 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

1140 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

1141

1133 -#: apply.c:3069

1142 +#: apply.c:3068

1143 #, c-format

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

1145 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

1146

1138 -#: apply.c:3075

1147 +#: apply.c:3074

1148 #, c-format

1149 msgid ""

1150 "while searching for:\n"

@@ -1144,432 +1153,438 @@ msgstr ""

1153 "当查询：\n"

1154 "%.*s"

1155

1147 -#: apply.c:3097

1156 +#: apply.c:3096

1157 #, c-format

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

1159 msgstr "缺失 '%s' 的二进制补丁数据"

1160

1152 -#: apply.c:3105

1161 +#: apply.c:3104

1162 #, c-format

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

1164 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

1165

1157 -#: apply.c:3152

1166 +#: apply.c:3151

1167 #, c-format

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

1169 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

1170

1162 -#: apply.c:3163

1171 +#: apply.c:3162

1172 #, c-format

1173 msgid ""

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

1175 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

1176

1168 -#: apply.c:3171

1177 +#: apply.c:3170

1178 #, c-format

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

1180 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

1181

1173 -#: apply.c:3189

1182 +#: apply.c:3188

1183 #, c-format

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

1185 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"

1186

1178 -#: apply.c:3202

1187 +#: apply.c:3201

1188 #, c-format

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

1190 msgstr "二进制补丁未应用到 '%s'"

1191

1183 -#: apply.c:3209

1192 +#: apply.c:3208

1193 #, c-format

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

1195 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

1196

1188 -#: apply.c:3230

1197 +#: apply.c:3229

1198 #, c-format

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

1200 msgstr "打补丁失败：%s:%ld"

1201

1193 -#: apply.c:3353

1202 +#: apply.c:3352

1203 #, c-format

1204 msgid "cannot checkout %s"

1205 msgstr "不能检出 %s"

1206

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

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

1208 #: setup.c:308

1209 #, c-format

1210 msgid "failed to read %s"

1211 msgstr "无法读取 %s"

1212

1204 -#: apply.c:3413

1213 +#: apply.c:3412

1214 #, c-format

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

1216 msgstr "读取位于符号链接中的 '%s'"

1217

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

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

1219 #, c-format

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

1221 msgstr "路径 %s 已经被重命名/删除"

1222

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

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

1224 #, c-format

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

1226 msgstr "%s：不存在于索引中"

1227

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

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

1229 #, c-format

1230 msgid "%s: does not match index"

1231 msgstr "%s：和索引不匹配"

1232

1224 -#: apply.c:3572

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

1226 -msgstr "仓库缺乏必要的数据对象以进行三方合并。"

1233 +#: apply.c:3571

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

1235 +msgstr "仓库缺乏执行三方合并所必需的数据对象。"

1236

1228 -#: apply.c:3575

1237 +#: apply.c:3574

1238 #, c-format

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

1231 -msgstr "回落到三方合并...\n"

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

1240 +msgstr "执行三方合并...\n"

1241

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

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

1243 #, c-format

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

1245 msgstr "无法读取 '%s' 的当前内容"

1246

1238 -#: apply.c:3607

1247 +#: apply.c:3606

1248 #, c-format

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

1241 -msgstr "无法回落到三方合并...\n"

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

1250 +msgstr "无法执行三方合并...\n"

1251

1243 -#: apply.c:3621

1252 +#: apply.c:3620

1253 #, c-format

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

1255 msgstr "应用补丁到 '%s' 存在冲突。\n"

1256

1248 -#: apply.c:3626

1257 +#: apply.c:3625

1258 #, c-format

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

1260 msgstr "成功应用补丁到 '%s'。\n"

1261

1253 -#: apply.c:3652

1262 +#: apply.c:3642

1263 +#, c-format

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

1265 +msgstr "回落到直接应用...\n"

1266 +

1267 +#: apply.c:3654

1268 msgid "removal patch leaves file contents"

1269 msgstr "移除补丁仍留下了文件内容"

1270

1257 -#: apply.c:3725

1271 +#: apply.c:3727

1272 #, c-format

1273 msgid "%s: wrong type"

1274 msgstr "%s：错误类型"

1275

1262 -#: apply.c:3727

1276 +#: apply.c:3729

1277 #, c-format

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

1279 msgstr "%s 的类型是 %o，应为 %o"

1280

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

1268 -#: read-cache.c:1313

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

1282 +#: read-cache.c:1351

1283 #, c-format

1284 msgid "invalid path '%s'"

1285 msgstr "无效路径 '%s'"

1286

1273 -#: apply.c:3950

1287 +#: apply.c:3952

1288 #, c-format

1289 msgid "%s: already exists in index"

1290 msgstr "%s：已经存在于索引中"

1291

1278 -#: apply.c:3954

1292 +#: apply.c:3956

1293 #, c-format

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

1295 msgstr "%s：已经存在于工作区中"

1296

1283 -#: apply.c:3974

1297 +#: apply.c:3976

1298 #, c-format

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

1300 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

1301

1288 -#: apply.c:3979

1302 +#: apply.c:3981

1303 #, c-format

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

1305 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

1306

1293 -#: apply.c:3999

1307 +#: apply.c:4001

1308 #, c-format

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

1310 msgstr "受影响的文件 '%s' 位于符号链接中"

1311

1298 -#: apply.c:4003

1312 +#: apply.c:4005

1313 #, c-format

1314 msgid "%s: patch does not apply"

1315 msgstr "%s：补丁未应用"

1316

1303 -#: apply.c:4018

1317 +#: apply.c:4020

1318 #, c-format

1319 msgid "Checking patch %s..."

1320 msgstr "正在检查补丁 %s..."

1321

1308 -#: apply.c:4110

1322 +#: apply.c:4112

1323 #, c-format

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

1325 msgstr "子模组 %s 的 sha1 信息缺失或无效"

1326

1313 -#: apply.c:4117

1327 +#: apply.c:4119

1328 #, c-format

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

1330 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

1331

1318 -#: apply.c:4120

1332 +#: apply.c:4122

1333 #, c-format

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

1335 msgstr "sha1 信息缺失或无效（%s）。"

1336

1323 -#: apply.c:4129

1337 +#: apply.c:4131

1338 #, c-format

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

1340 msgstr "不能在临时索引中添加 %s"

1341

1328 -#: apply.c:4139

1342 +#: apply.c:4141

1343 #, c-format

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

1345 msgstr "不能把临时索引写入到 %s"

1346

1333 -#: apply.c:4277

1347 +#: apply.c:4279

1348 #, c-format

1349 msgid "unable to remove %s from index"

1350 msgstr "不能从索引中移除 %s"

1351

1338 -#: apply.c:4311

1352 +#: apply.c:4313

1353 #, c-format

1354 msgid "corrupt patch for submodule %s"

1355 msgstr "子模组 %s 损坏的补丁"

1356

1343 -#: apply.c:4317

1357 +#: apply.c:4319

1358 #, c-format

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

1360 msgstr "不能对新建文件 '%s' 调用 stat"

1361

1348 -#: apply.c:4325

1362 +#: apply.c:4327

1363 #, c-format

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

1365 msgstr "不能为新建文件 %s 创建后端存储"

1366

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

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

1368 #, c-format

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

1370 msgstr "无法为 %s 添加缓存条目"

1371

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

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

1373 #, c-format

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

1375 msgstr "写入 '%s' 失败"

1376

1363 -#: apply.c:4378

1377 +#: apply.c:4380

1378 #, c-format

1379 msgid "closing file '%s'"

1380 msgstr "关闭文件 '%s'"

1381

1368 -#: apply.c:4448

1382 +#: apply.c:4450

1383 #, c-format

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

1385 msgstr "不能写文件 '%s' 权限 %o"

1386

1373 -#: apply.c:4546

1387 +#: apply.c:4548

1388 #, c-format

1389 msgid "Applied patch %s cleanly."

1390 msgstr "成功应用补丁 %s。"

1391

1378 -#: apply.c:4554

1392 +#: apply.c:4556

1393 msgid "internal error"

1394 msgstr "内部错误"

1395

1382 -#: apply.c:4557

1396 +#: apply.c:4559

1397 #, c-format

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

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

1400 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1401 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1402

1389 -#: apply.c:4568

1403 +#: apply.c:4570

1404 #, c-format

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

1406 msgstr "截短 .rej 文件名为 %.*s.rej"

1407

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

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

1409 #, c-format

1410 msgid "cannot open %s"

1411 msgstr "不能打开 %s"

1412

1399 -#: apply.c:4590

1413 +#: apply.c:4592

1414 #, c-format

1415 msgid "Hunk #%d applied cleanly."

1416 msgstr "第 #%d 个片段成功应用。"

1417

1404 -#: apply.c:4594

1418 +#: apply.c:4596

1419 #, c-format

1420 msgid "Rejected hunk #%d."

1421 msgstr "拒绝第 #%d 个片段。"

1422

1409 -#: apply.c:4718

1423 +#: apply.c:4725

1424 #, c-format

1425 msgid "Skipped patch '%s'."

1426 msgstr "略过补丁 '%s'。"

1427

1414 -#: apply.c:4726

1428 +#: apply.c:4733

1429 msgid "unrecognized input"

1430 msgstr "未能识别的输入"

1431

1418 -#: apply.c:4746

1432 +#: apply.c:4753

1433 msgid "unable to read index file"

1434 msgstr "无法读取索引文件"

1435

1422 -#: apply.c:4903

1436 +#: apply.c:4910

1437 #, c-format

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

1439 msgstr "不能打开补丁 '%s'：%s"

1440

1427 -#: apply.c:4930

1441 +#: apply.c:4937

1442 #, c-format

1443 msgid "squelched %d whitespace error"

1444 msgid_plural "squelched %d whitespace errors"

1445 msgstr[0] "抑制下仍有 %d 个空白字符误用"

1446 msgstr[1] "抑制下仍有 %d 个空白字符误用"

1447

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

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

1449 #, c-format

1450 msgid "%d line adds whitespace errors."

1451 msgid_plural "%d lines add whitespace errors."

1452 msgstr[0] "%d 行新增了空白字符误用。"

1453 msgstr[1] "%d 行新增了空白字符误用。"

1454

1441 -#: apply.c:4944

1455 +#: apply.c:4951

1456 #, c-format

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

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

1459 msgstr[0] "修复空白错误后，应用了 %d 行。"

1460 msgstr[1] "修复空白错误后，应用了 %d 行。"

1461

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

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

1463 msgid "Unable to write new index file"

1464 msgstr "无法写入新索引文件"

1465

1452 -#: apply.c:4988

1466 +#: apply.c:4995

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

1468 msgstr "不要应用与给出路径向匹配的变更"

1469

1456 -#: apply.c:4991

1470 +#: apply.c:4998

1471 msgid "apply changes matching the given path"

1472 msgstr "应用与给出路径向匹配的变更"

1473

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

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

1475 msgid "num"

1476 msgstr "数字"

1477

1464 -#: apply.c:4994

1478 +#: apply.c:5001

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

1480 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

1481

1468 -#: apply.c:4997

1482 +#: apply.c:5004

1483 msgid "ignore additions made by the patch"

1484 msgstr "忽略补丁中的添加的文件"

1485

1472 -#: apply.c:4999

1486 +#: apply.c:5006

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

1488 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

1489

1476 -#: apply.c:5003

1490 +#: apply.c:5010

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

1492 msgstr "以十进制数显示添加和删除的行数"

1493

1480 -#: apply.c:5005

1494 +#: apply.c:5012

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

1496 msgstr "不应用补丁，而是显示输入的概要"

1497

1484 -#: apply.c:5007

1498 +#: apply.c:5014

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

1500 msgstr "不应用补丁，而是查看补丁是否可应用"

1501

1488 -#: apply.c:5009

1502 +#: apply.c:5016

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

1504 msgstr "确认补丁可以应用到当前索引"

1505

1492 -#: apply.c:5011

1506 +#: apply.c:5018

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

1508 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

1509

1496 -#: apply.c:5013

1510 +#: apply.c:5020

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

1512 msgstr "应用补丁而不修改工作区"

1513

1500 -#: apply.c:5015

1514 +#: apply.c:5022

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

1516 msgstr "接受修改工作区之外文件的补丁"

1517

1504 -#: apply.c:5018

1518 +#: apply.c:5025

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

1520 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

1521

1508 -#: apply.c:5020

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

1510 -msgstr "如果一个补丁不能应用则尝试三方合并"

1522 +#: apply.c:5027

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

1524 +msgstr "尝试三路合并，如果失败则尝试正常补丁模式"

1525

1512 -#: apply.c:5022

1526 +#: apply.c:5029

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

1528 msgstr "创建一个临时索引基于嵌入的索引信息"

1529

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

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

1531 msgid "paths are separated with NUL character"

1532 msgstr "路径以 NUL 字符分隔"

1533

1520 -#: apply.c:5027

1534 +#: apply.c:5034

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

1536 msgstr "确保至少匹配 <n> 行上下文"

1537

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

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

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

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

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

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

1541 +#: builtin/rebase.c:1347

1542 msgid "action"

1543 msgstr "动作"

1544

1530 -#: apply.c:5029

1545 +#: apply.c:5036

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

1547 msgstr "检查新增和修改的行中间的空白字符滥用"

1548

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

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

1550 msgid "ignore changes in whitespace when finding context"

1551 msgstr "查找上下文时忽略空白字符的变更"

1552

1538 -#: apply.c:5038

1553 +#: apply.c:5045

1554 msgid "apply the patch in reverse"

1555 msgstr "反向应用补丁"

1556

1542 -#: apply.c:5040

1557 +#: apply.c:5047

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

1559 msgstr "无需至少一行上下文"

1560

1546 -#: apply.c:5042

1561 +#: apply.c:5049

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

1563 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1564

1550 -#: apply.c:5044

1565 +#: apply.c:5051

1566 msgid "allow overlapping hunks"

1567 msgstr "允许重叠的补丁片段"

1568

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

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

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

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

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

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

1572 msgid "be verbose"

1573 msgstr "冗长输出"

1574

1560 -#: apply.c:5047

1575 +#: apply.c:5054

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

1577 msgstr "允许不正确的文件末尾换行符"

1578

1564 -#: apply.c:5050

1579 +#: apply.c:5057

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

1581 msgstr "不信任补丁片段的头信息中的行号"

1582

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

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

1584 msgid "root"

1585 msgstr "根目录"

1586

1572 -#: apply.c:5053

1587 +#: apply.c:5060

1588 msgid "prepend <root> to all filenames"

1589 msgstr "为所有文件名前添加 <根目录>"

1590

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

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

1651 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1652

1638 -#: archive.c:192

1653 +#: archive.c:188

1654 #, c-format

1655 msgid "cannot read %s"

1656 msgstr "不能读取 %s"

1657

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

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

1645 -#: builtin/merge.c:1139

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

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

1660 +#: builtin/merge.c:1143

1661 #, c-format

1662 msgid "could not read '%s'"

1663 msgstr "不能读取 '%s'"

1664

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

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

1666 #, c-format

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

1668 msgstr "路径规格 '%s' 未匹配任何文件"

1669

1655 -#: archive.c:454

1670 +#: archive.c:451

1671 #, c-format

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

1673 msgstr "无此引用：%.*s"

1674

1660 -#: archive.c:460

1675 +#: archive.c:457

1676 #, c-format

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

1678 msgstr "不是一个有效的对象名：%s"

1679

1665 -#: archive.c:473

1680 +#: archive.c:470

1681 #, c-format

1682 msgid "not a tree object: %s"

1683 msgstr "不是一个树对象：%s"

1684

1670 -#: archive.c:485

1685 +#: archive.c:482

1686 msgid "current working directory is untracked"

1687 msgstr "当前工作目录未被跟踪"

1688

1674 -#: archive.c:526

1689 +#: archive.c:523

1690 #, c-format

1691 msgid "File not found: %s"

1692 msgstr "文件未找到：%s"

1693

1679 -#: archive.c:528

1694 +#: archive.c:525

1695 #, c-format

1696 msgid "Not a regular file: %s"

1697 msgstr "不是一个常规文件：%s"

1698

1684 -#: archive.c:555

1699 +#: archive.c:552

1700 msgid "fmt"

1701 msgstr "格式"

1702

1688 -#: archive.c:555

1703 +#: archive.c:552

1704 msgid "archive format"

1705 msgstr "归档格式"

1706

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

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

1708 msgid "prefix"

1709 msgstr "前缀"

1710

1696 -#: archive.c:557

1711 +#: archive.c:554

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

1713 msgstr "为归档中每个路径名加上前缀"

1714

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

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

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

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

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

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

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

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

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

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

1721 msgid "file"

1722 msgstr "文件"

1723

1709 -#: archive.c:559

1724 +#: archive.c:556

1725 msgid "add untracked file to archive"

1726 msgstr "将未跟踪文件添加到归档"

1727

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

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

1729 msgid "write the archive to this file"

1730 msgstr "归档写入此文件"

1731

1717 -#: archive.c:564

1732 +#: archive.c:561

1733 msgid "read .gitattributes in working directory"

1734 msgstr "读取工作区中的 .gitattributes"

1735

1721 -#: archive.c:565

1736 +#: archive.c:562

1737 msgid "report archived files on stderr"

1738 msgstr "在标准错误上报告归档文件"

1739

1725 -#: archive.c:567

1740 +#: archive.c:564

1741 msgid "set compression level"

1742 msgstr "设置压缩级别"

1743

1729 -#: archive.c:570

1744 +#: archive.c:567

1745 msgid "list supported archive formats"

1746 msgstr "列出支持的归档格式"

1747

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

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

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

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

1750 msgid "repo"

1751 msgstr "仓库"

1752

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

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

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

1755 msgstr "从远程仓库（<仓库>）提取归档文件"

1756

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

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

1758 #: builtin/notes.c:498

1759 msgid "command"

1760 msgstr "命令"

1761

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

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

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

1764 msgstr "远程 git-upload-archive 命令的路径"

1765

1751 -#: archive.c:582

1766 +#: archive.c:579

1767 msgid "Unexpected option --remote"

1768 msgstr "未知参数 --remote"

1769

1755 -#: archive.c:584

1770 +#: archive.c:581

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

1772 msgstr "选项 --exec 只能和 --remote 同时使用"

1773

1759 -#: archive.c:586

1774 +#: archive.c:583

1775 msgid "Unexpected option --output"

1776 msgstr "未知参数 --output"

1777

1763 -#: archive.c:588

1778 +#: archive.c:585

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

1780 msgstr "选项 --add-file 和 --remote 不能同时使用"

1781

1767 -#: archive.c:610

1782 +#: archive.c:607

1783 #, c-format

1784 msgid "Unknown archive format '%s'"

1785 msgstr "未知归档格式 '%s'"

1786

1772 -#: archive.c:619

1787 +#: archive.c:616

1788 #, c-format

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

1790 msgstr "参数不支持此格式 '%s'：-%d"

@@ -1779,12 +1794,12 @@ msgstr "参数不支持此格式 '%s'：-%d"

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

1795 msgstr "%.*s 不是一个有效的属性名"

1796

1782 -#: attr.c:359

1797 +#: attr.c:363

1798 #, c-format

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

1800 msgstr "不允许 %s：%s:%d"

1801

1787 -#: attr.c:399

1802 +#: attr.c:403

1803 msgid ""

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

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

@@ -1866,7 +1881,7 @@ msgstr "二分查找中：合并基线必须是经过测试的\n"

1881 msgid "a %s revision is needed"

1882 msgstr "需要一个 %s 版本"

1883

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

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

1885 #, c-format

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

1887 msgstr "不能创建文件 '%s'"

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

1926 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1927 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1928

1914 -#: blame.c:2777

1929 +#: blame.c:2776

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

1931 msgstr "--contents 和 --reverse 不能混用。"

1932

1918 -#: blame.c:2791

1933 +#: blame.c:2790

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

1935 msgstr "不能将 --contents 和最终的提交对象名共用"

1936

1922 -#: blame.c:2812

1937 +#: blame.c:2811

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

1939 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1940

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

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

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

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

1930 -#: builtin/shortlog.c:255

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

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

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

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

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

1946 msgid "revision walk setup failed"

1947 msgstr "版本遍历设置失败"

1948

1934 -#: blame.c:2839

1949 +#: blame.c:2838

1950 msgid ""

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

1952 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1953

1939 -#: blame.c:2850

1954 +#: blame.c:2849

1955 #, c-format

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

1957 msgstr "在 %2$s 中无此路径 %1$s"

1958

1944 -#: blame.c:2861

1959 +#: blame.c:2860

1960 #, c-format

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

1962 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

@@ -2069,12 +2084,12 @@ msgstr "歧义的对象名：'%s'。"

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

2085 msgstr "无效的分支点：'%s'。"

2086

2072 -#: branch.c:365

2087 +#: branch.c:366

2088 #, c-format

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

2090 msgstr "'%s' 已经检出到 '%s'"

2091

2077 -#: branch.c:388

2092 +#: branch.c:389

2093 #, c-format

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

2095 msgstr "工作区 %s 的 HEAD 指向没有被更新"

@@ -2099,8 +2114,8 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"

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

2115 msgstr "未能识别的包头：%s%s (%d)"

2116

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

2103 -#: builtin/commit.c:814

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

2118 +#: builtin/commit.c:861

2119 #, c-format

2120 msgid "could not open '%s'"

2121 msgstr "不能打开 '%s'"

@@ -2158,7 +2173,7 @@ msgstr "不支持的归档包版本 %d"

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

2174 msgstr "不能写入，归档包版本 %d 不支持算法 %s"

2175

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

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

2177 #, c-format

2178 msgid "unrecognized argument: %s"

2179 msgstr "未能识别的参数：%s"

@@ -2200,252 +2215,252 @@ msgstr "最终块有非零 ID %<PRIx32>"

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

2216 msgstr "无效的颜色值：%.*s"

2217

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

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

2219 msgid "invalid hash version"

2220 msgstr "无效的哈希版本"

2221

2207 -#: commit-graph.c:255

2222 +#: commit-graph.c:262

2223 msgid "commit-graph file is too small"

2224 msgstr "提交图形文件太小"

2225

2211 -#: commit-graph.c:348

2226 +#: commit-graph.c:355

2227 #, c-format

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

2229 msgstr "提交图形签名 %X 和签名 %X 不匹配"

2230

2216 -#: commit-graph.c:355

2231 +#: commit-graph.c:362

2232 #, c-format

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

2234 msgstr "提交图形版本 %X 和版本 %X 不匹配"

2235

2221 -#: commit-graph.c:362

2236 +#: commit-graph.c:369

2237 #, c-format

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

2239 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"

2240

2226 -#: commit-graph.c:379

2241 +#: commit-graph.c:386

2242 #, c-format

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

2244 msgstr "提交图形文件太小，容不下 %u 个块"

2245

2231 -#: commit-graph.c:472

2246 +#: commit-graph.c:482

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

2248 msgstr "提交图形没有基础图形块"

2249

2235 -#: commit-graph.c:482

2250 +#: commit-graph.c:492

2251 msgid "commit-graph chain does not match"

2252 msgstr "提交图形链不匹配"

2253

2239 -#: commit-graph.c:530

2254 +#: commit-graph.c:540

2255 #, c-format

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

2257 msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

2258

2244 -#: commit-graph.c:554

2259 +#: commit-graph.c:564

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

2261 msgstr "无法找到所有提交图形文件"

2262

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

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

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

2265 msgstr "无效的提交位置。提交图形可能已损坏"

2266

2252 -#: commit-graph.c:756

2267 +#: commit-graph.c:766

2268 #, c-format

2269 msgid "could not find commit %s"

2270 msgstr "无法找到提交 %s"

2271

2257 -#: commit-graph.c:789

2272 +#: commit-graph.c:799

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

2274 msgstr "提交图需要溢出世代数据，但是没有"

2275

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

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

2277 #, c-format

2278 msgid "unable to parse commit %s"

2279 msgstr "不能解析提交 %s"

2280

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

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

2282 #, c-format

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

2284 msgstr "无法获得对象 %s 类型"

2285

2271 -#: commit-graph.c:1358

2286 +#: commit-graph.c:1368

2287 msgid "Loading known commits in commit graph"

2288 msgstr "正在加载提交图中的已知提交"

2289

2275 -#: commit-graph.c:1375

2290 +#: commit-graph.c:1385

2291 msgid "Expanding reachable commits in commit graph"

2292 msgstr "正在扩展提交图中的可达提交"

2293

2279 -#: commit-graph.c:1395

2294 +#: commit-graph.c:1405

2295 msgid "Clearing commit marks in commit graph"

2296 msgstr "正在清除提交图中的提交标记"

2297

2283 -#: commit-graph.c:1414

2298 +#: commit-graph.c:1424

2299 msgid "Computing commit graph topological levels"

2300 msgstr "正在计算提交图拓扑级别"

2301

2287 -#: commit-graph.c:1467

2302 +#: commit-graph.c:1477

2303 msgid "Computing commit graph generation numbers"

2304 msgstr "正在计算提交图世代数字"

2305

2291 -#: commit-graph.c:1548

2306 +#: commit-graph.c:1558

2307 msgid "Computing commit changed paths Bloom filters"

2308 msgstr "计算提交变更路径的布隆过滤器"

2309

2295 -#: commit-graph.c:1625

2310 +#: commit-graph.c:1635

2311 msgid "Collecting referenced commits"

2312 msgstr "正在收集引用的提交"

2313

2299 -#: commit-graph.c:1650

2314 +#: commit-graph.c:1660

2315 #, c-format

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

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

2318 msgstr[0] "正在 %d 个包中查找提交图的提交"

2319 msgstr[1] "正在 %d 个包中查找提交图的提交"

2320

2306 -#: commit-graph.c:1663

2321 +#: commit-graph.c:1673

2322 #, c-format

2323 msgid "error adding pack %s"

2324 msgstr "添加包 %s 出错"

2325

2311 -#: commit-graph.c:1667

2326 +#: commit-graph.c:1677

2327 #, c-format

2328 msgid "error opening index for %s"

2329 msgstr "为 %s 打开索引出错"

2330

2316 -#: commit-graph.c:1704

2331 +#: commit-graph.c:1714

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

2333 msgstr "正在打包对象中查找提交图的提交"

2334

2320 -#: commit-graph.c:1722

2335 +#: commit-graph.c:1732

2336 msgid "Finding extra edges in commit graph"

2337 msgstr "正在查找提交图中额外的边"

2338

2324 -#: commit-graph.c:1771

2339 +#: commit-graph.c:1781

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

2341 msgstr "无法写入正确数量的基础图形 ID"

2342

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

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

2344 #, c-format

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

2346 msgstr "不能为 %s 创建先导目录"

2347

2333 -#: commit-graph.c:1815

2348 +#: commit-graph.c:1825

2349 msgid "unable to create temporary graph layer"

2350 msgstr "无法创建临时图层"

2351

2337 -#: commit-graph.c:1820

2352 +#: commit-graph.c:1830

2353 #, c-format

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

2355 msgstr "无法为 '%s' 调整共享权限"

2356

2342 -#: commit-graph.c:1879

2357 +#: commit-graph.c:1887

2358 #, c-format

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

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

2361 msgstr[0] "正在用 %d 步写出提交图"

2362 msgstr[1] "正在用 %d 步写出提交图"

2363

2349 -#: commit-graph.c:1915

2364 +#: commit-graph.c:1923

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

2366 msgstr "无法打开提交图形链文件"

2367

2353 -#: commit-graph.c:1931

2368 +#: commit-graph.c:1939

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

2370 msgstr "无法重命名基础提交图形文件"

2371

2357 -#: commit-graph.c:1951

2372 +#: commit-graph.c:1959

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

2374 msgstr "无法重命名临时提交图形文件"

2375

2361 -#: commit-graph.c:2084

2376 +#: commit-graph.c:2092

2377 msgid "Scanning merged commits"

2378 msgstr "正在扫描合并提交"

2379

2365 -#: commit-graph.c:2128

2380 +#: commit-graph.c:2136

2381 msgid "Merging commit-graph"

2382 msgstr "正在合并提交图形"

2383

2369 -#: commit-graph.c:2235

2384 +#: commit-graph.c:2244

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

2386 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"

2387

2373 -#: commit-graph.c:2342

2388 +#: commit-graph.c:2351

2389 msgid "too many commits to write graph"

2390 msgstr "提交太多不能画图"

2391

2377 -#: commit-graph.c:2440

2392 +#: commit-graph.c:2450

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

2394 msgstr "提交图文件的校验码错误，可能已经损坏"

2395

2381 -#: commit-graph.c:2450

2396 +#: commit-graph.c:2460

2397 #, c-format

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

2399 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"

2400

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

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

2402 #, c-format

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

2404 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

2405

2391 -#: commit-graph.c:2467

2406 +#: commit-graph.c:2477

2407 #, c-format

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

2409 msgstr "无法从提交图形中解析提交 %s"

2410

2396 -#: commit-graph.c:2485

2411 +#: commit-graph.c:2495

2412 msgid "Verifying commits in commit graph"

2413 msgstr "正在校验提交图中的提交"

2414

2400 -#: commit-graph.c:2500

2415 +#: commit-graph.c:2510

2416 #, c-format

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

2418 msgstr "无法从提交图形的对象库中解析提交 %s"

2419

2405 -#: commit-graph.c:2507

2420 +#: commit-graph.c:2517

2421 #, c-format

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

2423 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"

2424

2410 -#: commit-graph.c:2517

2425 +#: commit-graph.c:2527

2426 #, c-format

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

2428 msgstr "提交 %s 的提交图形父提交列表太长了"

2429

2415 -#: commit-graph.c:2526

2430 +#: commit-graph.c:2536

2431 #, c-format

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

2433 msgstr "%s 的提交图形父提交是 %s != %s"

2434

2420 -#: commit-graph.c:2540

2435 +#: commit-graph.c:2550

2436 #, c-format

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

2438 msgstr "提交 %s 的提交图形父提交列表过早终止"

2439

2425 -#: commit-graph.c:2545

2440 +#: commit-graph.c:2555

2441 #, c-format

2442 msgid ""

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

2444 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"

2445

2431 -#: commit-graph.c:2549

2446 +#: commit-graph.c:2559

2447 #, c-format

2448 msgid ""

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

2450 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"

2451

2437 -#: commit-graph.c:2566

2452 +#: commit-graph.c:2576

2453 #, c-format

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

2455 msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"

2456

2442 -#: commit-graph.c:2572

2457 +#: commit-graph.c:2582

2458 #, c-format

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

2460 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

2461

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

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

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

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

2464 #, c-format

2465 msgid "could not parse %s"

2466 msgstr "不能解析 %s"

@@ -2475,27 +2490,27 @@ msgstr ""

2490 "设置 \"git config advice.graftFileDeprecated false\"\n"

2491 "可关闭本消息"

2492

2478 -#: commit.c:1223

2493 +#: commit.c:1237

2494 #, c-format

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

2496 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

2497

2483 -#: commit.c:1227

2498 +#: commit.c:1241

2499 #, c-format

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

2501 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

2502

2488 -#: commit.c:1230

2503 +#: commit.c:1244

2504 #, c-format

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

2506 msgstr "提交 %s 没有 GPG 签名。"

2507

2493 -#: commit.c:1233

2508 +#: commit.c:1247

2509 #, c-format

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

2511 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

2512

2498 -#: commit.c:1487

2513 +#: commit.c:1501

2514 msgid ""

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

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

@@ -2562,7 +2577,7 @@ msgstr "键名没有包含一个小节名称：%s"

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

2578 msgstr "键名没有包含变量名：%s"

2579

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

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

2581 #, c-format

2582 msgid "invalid key: %s"

2583 msgstr "无效键名：%s"

@@ -2679,70 +2694,70 @@ msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

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

2695 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2696

2682 -#: config.c:1194

2697 +#: config.c:1257

2698 #, c-format

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

2700 msgstr "'%2$s' 的错误的布尔取值 '%1$s'"

2701

2687 -#: config.c:1289

2702 +#: config.c:1275

2703 #, c-format

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

2705 msgstr "无法扩展用户目录：'%s'"

2706

2692 -#: config.c:1298

2707 +#: config.c:1284

2708 #, c-format

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

2710 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

2711

2697 -#: config.c:1391

2712 +#: config.c:1377

2713 #, c-format

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

2715 msgstr "缩写长度超出范围：%d"

2716

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

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

2718 #, c-format

2719 msgid "bad zlib compression level %d"

2720 msgstr "错误的 zlib 压缩级别 %d"

2721

2707 -#: config.c:1508

2722 +#: config.c:1494

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

2724 msgstr "core.commentChar 应该是一个字符"

2725

2711 -#: config.c:1541

2726 +#: config.c:1527

2727 #, c-format

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

2729 msgstr "无效的对象创建模式：%s"

2730

2716 -#: config.c:1613

2731 +#: config.c:1599

2732 #, c-format

2733 msgid "malformed value for %s"

2734 msgstr "%s 的取值格式错误"

2735

2721 -#: config.c:1639

2736 +#: config.c:1625

2737 #, c-format

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

2739 msgstr "%s 的取值格式错误：%s"

2740

2726 -#: config.c:1640

2741 +#: config.c:1626

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

2743 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"

2744

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

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

2746 #, c-format

2747 msgid "bad pack compression level %d"

2748 msgstr "错误的打包压缩级别 %d"

2749

2735 -#: config.c:1823

2750 +#: config.c:1809

2751 #, c-format

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

2753 msgstr "无法从数据对象 '%s' 加载配置"

2754

2740 -#: config.c:1826

2755 +#: config.c:1812

2756 #, c-format

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

2758 msgstr "引用 '%s' 没有指向一个数据对象"

2759

2745 -#: config.c:1843

2760 +#: config.c:1829

2761 #, c-format

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

2763 msgstr "不能解析配置对象 '%s'"

@@ -2752,105 +2767,105 @@ msgstr "不能解析配置对象 '%s'"

2767 msgid "failed to parse %s"

2768 msgstr "解析 %s 失败"

2769

2755 -#: config.c:1927

2770 +#: config.c:1929

2771 msgid "unable to parse command-line config"

2772 msgstr "无法解析命令行中的配置"

2773

2759 -#: config.c:2290

2774 +#: config.c:2293

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

2776 msgstr "在读取配置文件时遇到未知错误"

2777

2763 -#: config.c:2464

2778 +#: config.c:2467

2779 #, c-format

2780 msgid "Invalid %s: '%s'"

2781 msgstr "无效 %s：'%s'"

2782

2768 -#: config.c:2509

2783 +#: config.c:2512

2784 #, c-format

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

2786 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

2787

2773 -#: config.c:2555

2788 +#: config.c:2558

2789 #, c-format

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

2791 msgstr "无法解析命令行配置中的 '%s'"

2792

2778 -#: config.c:2557

2793 +#: config.c:2560

2794 #, c-format

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

2796 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

2797

2783 -#: config.c:2641

2798 +#: config.c:2644

2799 #, c-format

2800 msgid "invalid section name '%s'"

2801 msgstr "无效的小节名称 '%s'"

2802

2788 -#: config.c:2673

2803 +#: config.c:2676

2804 #, c-format

2805 msgid "%s has multiple values"

2806 msgstr "%s 有多个取值"

2807

2793 -#: config.c:2702

2808 +#: config.c:2705

2809 #, c-format

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

2811 msgstr "写入新的配置文件 %s 失败"

2812

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

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

2814 #, c-format

2815 msgid "could not lock config file %s"

2816 msgstr "不能锁定配置文件 %s"

2817

2803 -#: config.c:2965

2818 +#: config.c:2968

2819 #, c-format

2820 msgid "opening %s"

2821 msgstr "打开 %s"

2822

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

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

2824 #, c-format

2825 msgid "invalid pattern: %s"

2826 msgstr "无效模式：%s"

2827

2813 -#: config.c:3027

2828 +#: config.c:3030

2829 #, c-format

2830 msgid "invalid config file %s"

2831 msgstr "无效的配置文件 %s"

2832

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

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

2834 #, c-format

2835 msgid "fstat on %s failed"

2836 msgstr "对 %s 调用 fstat 失败"

2837

2823 -#: config.c:3051

2838 +#: config.c:3054

2839 #, c-format

2840 msgid "unable to mmap '%s'"

2841 msgstr "不能 mmap '%s'"

2842

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

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

2844 #, c-format

2845 msgid "chmod on %s failed"

2846 msgstr "对 %s 调用 chmod 失败"

2847

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

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

2849 #, c-format

2850 msgid "could not write config file %s"

2851 msgstr "不能写入配置文件 %s"

2852

2838 -#: config.c:3179

2853 +#: config.c:3182

2854 #, c-format

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

2856 msgstr "不能设置 '%s' 为 '%s'"

2857

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

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

2859 #, c-format

2860 msgid "could not unset '%s'"

2861 msgstr "不能取消设置 '%s'"

2862

2848 -#: config.c:3271

2863 +#: config.c:3274

2864 #, c-format

2865 msgid "invalid section name: %s"

2866 msgstr "无效的小节名称：%s"

2867

2853 -#: config.c:3438

2868 +#: config.c:3441

2869 #, c-format

2870 msgid "missing value for '%s'"

2871 msgstr "%s 的取值缺失"

@@ -3026,7 +3041,7 @@ msgstr "已阻止奇怪的路径名 '%s'"

3041 msgid "unable to fork"

3042 msgstr "无法 fork"

3043

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

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

3045 msgid "Checking connectivity"

3046 msgstr "正在检查连通性"

3047

@@ -3042,17 +3057,17 @@ msgstr "写入 rev-list 失败"

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

3058 msgstr "关闭 rev-list 的标准输入失败"

3059

3045 -#: convert.c:194

3060 +#: convert.c:183

3061 #, c-format

3062 msgid "illegal crlf_action %d"

3063 msgstr "非法的 crlf 动作 %d"

3064

3050 -#: convert.c:207

3065 +#: convert.c:196

3066 #, c-format

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

3068 msgstr "%s 中的 CRLF 将被 LF 替换"

3069

3055 -#: convert.c:209

3070 +#: convert.c:198

3071 #, c-format

3072 msgid ""

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

@@ -3061,12 +3076,12 @@ msgstr ""

3076 "%s 中的 CRLF 将被 LF 替换。<\n"

3077 "在工作区中该文件仍保持原有的换行符。"

3078

3064 -#: convert.c:217

3079 +#: convert.c:206

3080 #, c-format

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

3082 msgstr "文件 %s 中的 LF 将被 CRLF 替换"

3083

3069 -#: convert.c:219

3084 +#: convert.c:208

3085 #, c-format

3086 msgid ""

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

@@ -3075,12 +3090,12 @@ msgstr ""

3090 "%s 中的 LF 将被 CRLF 替换。\n"

3091 "在工作区中该文件仍保持原有的换行符"

3092

3078 -#: convert.c:284

3093 +#: convert.c:273

3094 #, c-format

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

3096 msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

3097

3083 -#: convert.c:291

3098 +#: convert.c:280

3099 #, c-format

3100 msgid ""

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

@@ -3088,12 +3103,12 @@ msgid ""

3103 msgstr ""

3104 "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"

3105

3091 -#: convert.c:304

3106 +#: convert.c:293

3107 #, c-format

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

3109 msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"

3110

3096 -#: convert.c:306

3111 +#: convert.c:295

3112 #, c-format

3113 msgid ""

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

@@ -3102,66 +3117,66 @@ msgstr ""

3117 "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

3118 "节序）作为工作区编码。"

3119

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

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

3121 #, c-format

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

3123 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

3124

3110 -#: convert.c:462

3125 +#: convert.c:451

3126 #, c-format

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

3128 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

3129

3115 -#: convert.c:665

3130 +#: convert.c:654

3131 #, c-format

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

3133 msgstr "不能 fork 以执行外部过滤器 '%s'"

3134

3120 -#: convert.c:685

3135 +#: convert.c:674

3136 #, c-format

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

3138 msgstr "不能将输入传递给外部过滤器 '%s'"

3139

3125 -#: convert.c:692

3140 +#: convert.c:681

3141 #, c-format

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

3143 msgstr "外部过滤器 '%s' 失败码 %d"

3144

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

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

3146 #, c-format

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

3148 msgstr "从外部过滤器 '%s' 读取失败"

3149

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

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

3151 #, c-format

3152 msgid "external filter '%s' failed"

3153 msgstr "外部过滤器 '%s' 失败"

3154

3140 -#: convert.c:837

3155 +#: convert.c:826

3156 msgid "unexpected filter type"

3157 msgstr "意外的过滤类型"

3158

3144 -#: convert.c:848

3159 +#: convert.c:837

3160 msgid "path name too long for external filter"

3161 msgstr "外部过滤器的路径名太长"

3162

3148 -#: convert.c:940

3163 +#: convert.c:934

3164 #, c-format

3165 msgid ""

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

3167 "been filtered"

3168 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

3169

3155 -#: convert.c:1240

3170 +#: convert.c:1234

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

3172 msgstr "true/false 不是有效的工作区编码"

3173

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

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

3175 #, c-format

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

3177 msgstr "%s：clean 过滤器 '%s' 失败"

3178

3164 -#: convert.c:1508

3179 +#: convert.c:1490

3180 #, c-format

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

3182 msgstr "%s：smudge 过滤器 %s 失败"

@@ -3286,28 +3301,28 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多

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

3302 msgstr "已标记 %d 个数据岛，结束。\n"

3303

3289 -#: diff-merges.c:70

3304 +#: diff-merges.c:80

3305 #, c-format

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

3307 msgstr "未知的 --diff-merges 取值：%s"

3308

3294 -#: diff-lib.c:534

3309 +#: diff-lib.c:538

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

3311 msgstr "--merge-base 不适用于范围"

3312

3298 -#: diff-lib.c:536

3313 +#: diff-lib.c:540

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

3315 msgstr "--merge-base 仅适用于提交"

3316

3302 -#: diff-lib.c:553

3317 +#: diff-lib.c:557

3318 msgid "unable to get HEAD"

3319 msgstr "不能解析 HEAD"

3320

3306 -#: diff-lib.c:560

3321 +#: diff-lib.c:564

3322 msgid "no merge base found"

3323 msgstr "未找到合并基线"

3324

3310 -#: diff-lib.c:562

3325 +#: diff-lib.c:566

3326 msgid "multiple merge bases found"

3327 msgstr "找到了多条合并基线"

3328

@@ -3370,35 +3385,35 @@ msgstr ""

3385 "发现配置变量 'diff.dirstat' 中的错误：\n"

3386 "%s"

3387

3373 -#: diff.c:4276

3388 +#: diff.c:4278

3389 #, c-format

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

3391 msgstr "外部 diff 退出，停止在 %s"

3392

3378 -#: diff.c:4628

3393 +#: diff.c:4630

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

3395 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3396

3382 -#: diff.c:4631

3397 +#: diff.c:4633

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

3399 msgstr "-G、-S 和 --find-object 是互斥的"

3400

3386 -#: diff.c:4710

3401 +#: diff.c:4712

3402 msgid "--follow requires exactly one pathspec"

3403 msgstr "--follow 明确要求只跟一个路径规格"

3404

3390 -#: diff.c:4758

3405 +#: diff.c:4760

3406 #, c-format

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

3408 msgstr "无效的 --stat 值：%s"

3409

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

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

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

3412 #, c-format

3413 msgid "%s expects a numerical value"

3414 msgstr "%s 期望一个数字值"

3415

3401 -#: diff.c:4795

3416 +#: diff.c:4797

3417 #, c-format

3418 msgid ""

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

@@ -3407,200 +3422,200 @@ msgstr ""

3422 "无法解析 --dirstat/-X 选项的参数：\n"

3423 "%s"

3424

3410 -#: diff.c:4880

3425 +#: diff.c:4882

3426 #, c-format

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

3428 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"

3429

3415 -#: diff.c:4904

3430 +#: diff.c:4906

3431 #, c-format

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

3433 msgstr "ws-error-highlight=%.*s 之后未知的值"

3434

3420 -#: diff.c:4918

3435 +#: diff.c:4920

3436 #, c-format

3437 msgid "unable to resolve '%s'"

3438 msgstr "不能解析 '%s'"

3439

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

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

3441 #, c-format

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

3443 msgstr "%s 期望 <n>/<m> 格式"

3444

3430 -#: diff.c:4986

3445 +#: diff.c:4988

3446 #, c-format

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

3448 msgstr "%s 期望一个字符，得到 '%s'"

3449

3435 -#: diff.c:5007

3450 +#: diff.c:5009

3451 #, c-format

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

3453 msgstr "坏的 --color-moved 参数：%s"

3454

3440 -#: diff.c:5026

3455 +#: diff.c:5028

3456 #, c-format

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

3458 msgstr "--color-moved-ws 中的无效模式 '%s' "

3459

3445 -#: diff.c:5066

3460 +#: diff.c:5068

3461 msgid ""

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

3463 "\"histogram\""

3464 msgstr ""

3465 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3466

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

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

3468 #, c-format

3469 msgid "invalid argument to %s"

3470 msgstr "%s 的参数无效"

3471

3457 -#: diff.c:5226

3472 +#: diff.c:5228

3473 #, c-format

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

3475 msgstr "选项 -I 的正则表达式无效：'%s'"

3476

3462 -#: diff.c:5275

3477 +#: diff.c:5277

3478 #, c-format

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

3480 msgstr "无法解析 --submodule 选项的参数：'%s'"

3481

3467 -#: diff.c:5331

3482 +#: diff.c:5333

3483 #, c-format

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

3485 msgstr "坏的 --word-diff 参数：%s"

3486

3472 -#: diff.c:5367

3487 +#: diff.c:5369

3488 msgid "Diff output format options"

3489 msgstr "差异输出格式化选项"

3490

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

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

3492 msgid "generate patch"

3493 msgstr "生成补丁"

3494

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

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

3496 msgid "suppress diff output"

3497 msgstr "不显示差异输出"

3498

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

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

3500 msgid "<n>"

3501 msgstr "<n>"

3502

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

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

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

3505 msgstr "生成含 <n> 行上下文的差异"

3506

3492 -#: diff.c:5383

3507 +#: diff.c:5385

3508 msgid "generate the diff in raw format"

3509 msgstr "生成原始格式的差异"

3510

3496 -#: diff.c:5386

3511 +#: diff.c:5388

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

3513 msgstr "和 '-p --raw' 同义"

3514

3500 -#: diff.c:5390

3515 +#: diff.c:5392

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

3517 msgstr "和 '-p --stat' 同义"

3518

3504 -#: diff.c:5394

3519 +#: diff.c:5396

3520 msgid "machine friendly --stat"

3521 msgstr "机器友好的 --stat"

3522

3508 -#: diff.c:5397

3523 +#: diff.c:5399

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

3525 msgstr "只输出 --stat 的最后一行"

3526

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

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

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

3529 msgstr "<参数1,参数2>..."

3530

3516 -#: diff.c:5400

3531 +#: diff.c:5402

3532 msgid ""

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

3534 msgstr "输出每个子目录相对变更的分布"

3535

3521 -#: diff.c:5404

3536 +#: diff.c:5406

3537 msgid "synonym for --dirstat=cumulative"

3538 msgstr "和 --dirstat=cumulative 同义"

3539

3525 -#: diff.c:5408

3540 +#: diff.c:5410

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

3542 msgstr "是 --dirstat=files,param1,param2... 的同义词"

3543

3529 -#: diff.c:5412

3544 +#: diff.c:5414

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

3546 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

3547

3533 -#: diff.c:5415

3548 +#: diff.c:5417

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

3550 msgstr "精简摘要，例如创建、重命名和模式变更"

3551

3537 -#: diff.c:5418

3552 +#: diff.c:5420

3553 msgid "show only names of changed files"

3554 msgstr "只显示变更文件的文件名"

3555

3541 -#: diff.c:5421

3556 +#: diff.c:5423

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

3558 msgstr "只显示变更文件的文件名和状态"

3559

3545 -#: diff.c:5423

3560 +#: diff.c:5425

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

3562 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

3563

3549 -#: diff.c:5424

3564 +#: diff.c:5426

3565 msgid "generate diffstat"

3566 msgstr "生成差异统计（diffstat）"

3567

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

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

3569 msgid "<width>"

3570 msgstr "<宽度>"

3571

3557 -#: diff.c:5427

3572 +#: diff.c:5429

3573 msgid "generate diffstat with a given width"

3574 msgstr "使用给定的长度生成差异统计"

3575

3561 -#: diff.c:5430

3576 +#: diff.c:5432

3577 msgid "generate diffstat with a given name width"

3578 msgstr "使用给定的文件名长度生成差异统计"

3579

3565 -#: diff.c:5433

3580 +#: diff.c:5435

3581 msgid "generate diffstat with a given graph width"

3582 msgstr "使用给定的图形长度生成差异统计"

3583

3569 -#: diff.c:5435

3584 +#: diff.c:5437

3585 msgid "<count>"

3586 msgstr "<次数>"

3587

3573 -#: diff.c:5436

3588 +#: diff.c:5438

3589 msgid "generate diffstat with limited lines"

3590 msgstr "生成有限行数的差异统计"

3591

3577 -#: diff.c:5439

3592 +#: diff.c:5441

3593 msgid "generate compact summary in diffstat"

3594 msgstr "生成差异统计的简洁摘要"

3595

3581 -#: diff.c:5442

3596 +#: diff.c:5444

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

3598 msgstr "输出一个可以应用的二进制差异"

3599

3585 -#: diff.c:5445

3600 +#: diff.c:5447

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

3602 msgstr "在 \"index\" 行显示完整的前后对象名称"

3603

3589 -#: diff.c:5447

3604 +#: diff.c:5449

3605 msgid "show colored diff"

3606 msgstr "显示带颜色的差异"

3607

3593 -#: diff.c:5448

3608 +#: diff.c:5450

3609 msgid "<kind>"

3610 msgstr "<类型>"

3611

3597 -#: diff.c:5449

3612 +#: diff.c:5451

3613 msgid ""

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

3615 "diff"

3616 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3617

3603 -#: diff.c:5452

3618 +#: diff.c:5454

3619 msgid ""

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

3621 "--numstat"

@@ -3608,311 +3623,311 @@ msgstr ""

3623 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3624 "符"

3625

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

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

3627 msgid "<prefix>"

3628 msgstr "<前缀>"

3629

3615 -#: diff.c:5456

3630 +#: diff.c:5458

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

3632 msgstr "显示给定的源前缀取代 \"a/\""

3633

3619 -#: diff.c:5459

3634 +#: diff.c:5461

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

3636 msgstr "显示给定的目标前缀取代 \"b/\""

3637

3623 -#: diff.c:5462

3638 +#: diff.c:5464

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

3640 msgstr "输出的每一行附加前缀"

3641

3627 -#: diff.c:5465

3642 +#: diff.c:5467

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

3644 msgstr "不显示任何源和目标前缀"

3645

3631 -#: diff.c:5468

3646 +#: diff.c:5470

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

3648 msgstr "显示指定行数的差异块间的上下文"

3649

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

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

3651 msgid "<char>"

3652 msgstr "<字符>"

3653

3639 -#: diff.c:5473

3654 +#: diff.c:5475

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

3656 msgstr "指定一个字符取代 '+' 来表示新的一行"

3657

3643 -#: diff.c:5478

3658 +#: diff.c:5480

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

3660 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3661

3647 -#: diff.c:5483

3662 +#: diff.c:5485

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

3664 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3665

3651 -#: diff.c:5486

3666 +#: diff.c:5488

3667 msgid "Diff rename options"

3668 msgstr "差异重命名选项"

3669

3655 -#: diff.c:5487

3670 +#: diff.c:5489

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

3672 msgstr "<n>[/<m>]"

3673

3659 -#: diff.c:5488

3674 +#: diff.c:5490

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

3676 msgstr "将完全重写的变更打破为成对的删除和创建"

3677

3663 -#: diff.c:5492

3678 +#: diff.c:5494

3679 msgid "detect renames"

3680 msgstr "检测重命名"

3681

3667 -#: diff.c:5496

3682 +#: diff.c:5498

3683 msgid "omit the preimage for deletes"

3684 msgstr "省略删除操作的差异输出"

3685

3671 -#: diff.c:5499

3686 +#: diff.c:5501

3687 msgid "detect copies"

3688 msgstr "检测拷贝"

3689

3675 -#: diff.c:5503

3690 +#: diff.c:5505

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

3692 msgstr "使用未修改的文件做为发现拷贝的源"

3693

3679 -#: diff.c:5505

3694 +#: diff.c:5507

3695 msgid "disable rename detection"

3696 msgstr "禁用重命名探测"

3697

3683 -#: diff.c:5508

3698 +#: diff.c:5510

3699 msgid "use empty blobs as rename source"

3700 msgstr "使用空的数据对象做为重命名的源"

3701

3687 -#: diff.c:5510

3702 +#: diff.c:5512

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

3704 msgstr "继续列出文件重命名以外的历史记录"

3705

3691 -#: diff.c:5513

3706 +#: diff.c:5515

3707 msgid ""

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

3709 "given limit"

3710 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3711

3697 -#: diff.c:5515

3712 +#: diff.c:5517

3713 msgid "Diff algorithm options"

3714 msgstr "差异算法选项"

3715

3701 -#: diff.c:5517

3716 +#: diff.c:5519

3717 msgid "produce the smallest possible diff"

3718 msgstr "生成尽可能小的差异"

3719

3705 -#: diff.c:5520

3720 +#: diff.c:5522

3721 msgid "ignore whitespace when comparing lines"

3722 msgstr "行比较时忽略空白字符"

3723

3709 -#: diff.c:5523

3724 +#: diff.c:5525

3725 msgid "ignore changes in amount of whitespace"

3726 msgstr "忽略空白字符的变更"

3727

3713 -#: diff.c:5526

3728 +#: diff.c:5528

3729 msgid "ignore changes in whitespace at EOL"

3730 msgstr "忽略行尾的空白字符变更"

3731

3717 -#: diff.c:5529

3732 +#: diff.c:5531

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

3734 msgstr "忽略行尾的回车符（CR）"

3735

3721 -#: diff.c:5532

3736 +#: diff.c:5534

3737 msgid "ignore changes whose lines are all blank"

3738 msgstr "忽略整行都是空白的变更"

3739

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

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

3741 msgid "<regex>"

3742 msgstr "<正则>"

3743

3729 -#: diff.c:5535

3744 +#: diff.c:5537

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

3746 msgstr "忽略所有行都和正则表达式匹配的变更"

3747

3733 -#: diff.c:5538

3748 +#: diff.c:5540

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

3750 msgstr "启发式转换差异边界以便阅读"

3751

3737 -#: diff.c:5541

3752 +#: diff.c:5543

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

3754 msgstr "使用 \"patience diff\" 算法生成差异"

3755

3741 -#: diff.c:5545

3756 +#: diff.c:5547

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

3758 msgstr "使用 \"histogram diff\" 算法生成差异"

3759

3745 -#: diff.c:5547

3760 +#: diff.c:5549

3761 msgid "<algorithm>"

3762 msgstr "<算法>"

3763

3749 -#: diff.c:5548

3764 +#: diff.c:5550

3765 msgid "choose a diff algorithm"

3766 msgstr "选择一个差异算法"

3767

3753 -#: diff.c:5550

3768 +#: diff.c:5552

3769 msgid "<text>"

3770 msgstr "<文本>"

3771

3757 -#: diff.c:5551

3772 +#: diff.c:5553

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

3774 msgstr "使用 \"anchored diff\" 算法生成差异"

3775

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

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

3777 msgid "<mode>"

3778 msgstr "<模式>"

3779

3765 -#: diff.c:5554

3780 +#: diff.c:5556

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

3782 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3783

3769 -#: diff.c:5557

3784 +#: diff.c:5559

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

3786 msgstr "使用 <正则表达式> 确定何为一个词"

3787

3773 -#: diff.c:5560

3788 +#: diff.c:5562

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

3790 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3791

3777 -#: diff.c:5563

3792 +#: diff.c:5565

3793 msgid "moved lines of code are colored differently"

3794 msgstr "移动的代码行用不同方式着色"

3795

3781 -#: diff.c:5566

3796 +#: diff.c:5568

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

3798 msgstr "在 --color-moved 下如何忽略空白字符"

3799

3785 -#: diff.c:5569

3800 +#: diff.c:5571

3801 msgid "Other diff options"

3802 msgstr "其它差异选项"

3803

3789 -#: diff.c:5571

3804 +#: diff.c:5573

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

3806 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3807

3793 -#: diff.c:5575

3808 +#: diff.c:5577

3809 msgid "treat all files as text"

3810 msgstr "把所有文件当做文本处理"

3811

3797 -#: diff.c:5577

3812 +#: diff.c:5579

3813 msgid "swap two inputs, reverse the diff"

3814 msgstr "交换两个输入，反转差异"

3815

3801 -#: diff.c:5579

3816 +#: diff.c:5581

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

3818 msgstr "有差异时退出码为 1，否则为 0"

3819

3805 -#: diff.c:5581

3820 +#: diff.c:5583

3821 msgid "disable all output of the program"

3822 msgstr "禁用本程序的所有输出"

3823

3809 -#: diff.c:5583

3824 +#: diff.c:5585

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

3826 msgstr "允许执行一个外置的差异助手"

3827

3813 -#: diff.c:5585

3828 +#: diff.c:5587

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

3830 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3831

3817 -#: diff.c:5587

3832 +#: diff.c:5589

3833 msgid "<when>"

3834 msgstr "<何时>"

3835

3821 -#: diff.c:5588

3836 +#: diff.c:5590

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

3838 msgstr "在生成差异时，忽略子模组的更改"

3839

3825 -#: diff.c:5591

3840 +#: diff.c:5593

3841 msgid "<format>"

3842 msgstr "<格式>"

3843

3829 -#: diff.c:5592

3844 +#: diff.c:5594

3845 msgid "specify how differences in submodules are shown"

3846 msgstr "指定子模组的差异如何显示"

3847

3833 -#: diff.c:5596

3848 +#: diff.c:5598

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

3850 msgstr "隐藏索引中 'git add -N' 条目"

3851

3837 -#: diff.c:5599

3852 +#: diff.c:5601

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

3854 msgstr "将索引中 'git add -N' 条目当做真实的"

3855

3841 -#: diff.c:5601

3856 +#: diff.c:5603

3857 msgid "<string>"

3858 msgstr "<字符串>"

3859

3845 -#: diff.c:5602

3860 +#: diff.c:5604

3861 msgid ""

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

3863 "string"

3864 msgstr "查找改变了指定字符串出现次数的差异"

3865

3851 -#: diff.c:5605

3866 +#: diff.c:5607

3867 msgid ""

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

3869 "regex"

3870 msgstr "查找改变指定正则匹配出现次数的差异"

3871

3857 -#: diff.c:5608

3872 +#: diff.c:5610

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

3874 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3875

3861 -#: diff.c:5611

3876 +#: diff.c:5613

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

3878 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3879

3865 -#: diff.c:5614

3880 +#: diff.c:5616

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

3882 msgstr "控制输出中的文件显示顺序"

3883

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

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

3885 msgid "<path>"

3886 msgstr "<路径>"

3887

3873 -#: diff.c:5616

3888 +#: diff.c:5618

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

3890 msgstr "先显示指定路径的变更"

3891

3877 -#: diff.c:5619

3892 +#: diff.c:5621

3893 msgid "skip the output to the specified path"

3894 msgstr "跳过指定路径的输出"

3895

3881 -#: diff.c:5621

3896 +#: diff.c:5623

3897 msgid "<object-id>"

3898 msgstr "<对象 ID>"

3899

3885 -#: diff.c:5622

3900 +#: diff.c:5624

3901 msgid ""

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

3903 "object"

3904 msgstr "查找改变指定对象出现次数的差异"

3905

3891 -#: diff.c:5624

3906 +#: diff.c:5626

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

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

3909

3895 -#: diff.c:5625

3910 +#: diff.c:5627

3911 msgid "select files by diff type"

3912 msgstr "通过差异类型选择文件"

3913

3899 -#: diff.c:5627

3914 +#: diff.c:5629

3915 msgid "<file>"

3916 msgstr "<文件>"

3917

3903 -#: diff.c:5628

3918 +#: diff.c:5630

3919 msgid "Output to a specific file"

3920 msgstr "输出到一个指定的文件"

3921

3907 -#: diff.c:6285

3922 +#: diff.c:6287

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

3924 msgstr "因为文件太多，略过不严格的重命名检查。"

3925

3911 -#: diff.c:6288

3926 +#: diff.c:6290

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

3928 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

3929

3915 -#: diff.c:6291

3930 +#: diff.c:6293

3931 #, c-format

3932 msgid ""

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

@@ -3923,7 +3938,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令

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

3939 msgstr "读取排序文件 '%s' 失败"

3940

3926 -#: diffcore-rename.c:786

3941 +#: diffcore-rename.c:1418

3942 msgid "Performing inexact rename detection"

3943 msgstr "正在进行非精确的重命名探测"

3944

@@ -3956,35 +3971,35 @@ msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"

3971 msgid "disabling cone pattern matching"

3972 msgstr "禁止 cone 模式匹配"

3973

3959 -#: dir.c:1198

3974 +#: dir.c:1206

3975 #, c-format

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

3977 msgstr "不能将 %s 用作排除文件"

3978

3964 -#: dir.c:2305

3979 +#: dir.c:2314

3980 #, c-format

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

3982 msgstr "不能打开目录 '%s'"

3983

3969 -#: dir.c:2605

3984 +#: dir.c:2614

3985 msgid "failed to get kernel name and information"

3986 msgstr "无法获得内核名称和信息"

3987

3973 -#: dir.c:2729

3988 +#: dir.c:2738

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

3990 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

3991

3977 -#: dir.c:3534

3992 +#: dir.c:3543

3993 #, c-format

3994 msgid "index file corrupt in repo %s"

3995 msgstr "仓库 %s 中的索引文件损坏"

3996

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

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

3998 #, c-format

3999 msgid "could not create directories for %s"

4000 msgstr "不能为 %s 创建目录"

4001

3987 -#: dir.c:3613

4002 +#: dir.c:3624

4003 #, c-format

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

4005 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -3994,11 +4009,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

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

4010 msgstr "提示：等待您的编辑器关闭文件...%c"

4011

3997 -#: entry.c:177

4012 +#: entry.c:179

4013 msgid "Filtering content"

4014 msgstr "过滤内容"

4015

4001 -#: entry.c:478

4016 +#: entry.c:500

4017 #, c-format

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

4019 msgstr "不能对文件 '%s' 调用 stat"

@@ -4018,249 +4033,257 @@ msgstr "不能设置 GIT_DIR 为 '%s'"

4033 msgid "too many args to run %s"

4034 msgstr "执行 %s 的参数太多"

4035

4021 -#: fetch-pack.c:177

4036 +#: fetch-pack.c:182

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

4038 msgstr "git fetch-pack：应为 shallow 列表"

4039

4025 -#: fetch-pack.c:180

4040 +#: fetch-pack.c:185

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

4042 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

4043

4029 -#: fetch-pack.c:191

4044 +#: fetch-pack.c:196

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

4046 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

4047

4033 -#: fetch-pack.c:211

4048 +#: fetch-pack.c:216

4049 #, c-format

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

4051 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

4052

4038 -#: fetch-pack.c:222

4053 +#: fetch-pack.c:227

4054 msgid "unable to write to remote"

4055 msgstr "无法写到远程"

4056

4042 -#: fetch-pack.c:283

4057 +#: fetch-pack.c:288

4058 msgid "--stateless-rpc requires multi_ack_detailed"

4059 msgstr "--stateless-rpc 需要 multi_ack_detailed"

4060

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

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

4062 #, c-format

4063 msgid "invalid shallow line: %s"

4064 msgstr "无效的 shallow 信息：%s"

4065

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

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

4067 #, c-format

4068 msgid "invalid unshallow line: %s"

4069 msgstr "无效的 unshallow 信息：%s"

4070

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

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

4072 #, c-format

4073 msgid "object not found: %s"

4074 msgstr "对象未找到：%s"

4075

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

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

4077 #, c-format

4078 msgid "error in object: %s"

4079 msgstr "对象中出错：%s"

4080

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

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

4082 #, c-format

4083 msgid "no shallow found: %s"

4084 msgstr "未发现 shallow：%s"

4085

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

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

4087 #, c-format

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

4089 msgstr "应为 shallow/unshallow，却得到 %s"

4090

4076 -#: fetch-pack.c:434

4091 +#: fetch-pack.c:439

4092 #, c-format

4093 msgid "got %s %d %s"

4094 msgstr "得到 %s %d %s"

4095

4081 -#: fetch-pack.c:451

4096 +#: fetch-pack.c:456

4097 #, c-format

4098 msgid "invalid commit %s"

4099 msgstr "无效提交 %s"

4100

4086 -#: fetch-pack.c:482

4101 +#: fetch-pack.c:487

4102 msgid "giving up"

4103 msgstr "放弃"

4104

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

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

4106 msgid "done"

4107 msgstr "完成"

4108

4094 -#: fetch-pack.c:507

4109 +#: fetch-pack.c:512

4110 #, c-format

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

4112 msgstr "得到 %s (%d) %s"

4113

4099 -#: fetch-pack.c:543

4114 +#: fetch-pack.c:548

4115 #, c-format

4116 msgid "Marking %s as complete"

4117 msgstr "标记 %s 为完成"

4118

4104 -#: fetch-pack.c:758

4119 +#: fetch-pack.c:763

4120 #, c-format

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

4122 msgstr "已经有 %s（%s）"

4123

4109 -#: fetch-pack.c:844

4124 +#: fetch-pack.c:849

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

4126 msgstr "fetch-pack：无法派生 sideband 多路输出"

4127

4113 -#: fetch-pack.c:852

4128 +#: fetch-pack.c:857

4129 msgid "protocol error: bad pack header"

4130 msgstr "协议错误：坏的包头"

4131

4117 -#: fetch-pack.c:946

4132 +#: fetch-pack.c:951

4133 #, c-format

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

4135 msgstr "fetch-pack：无法派生进程 %s"

4136

4122 -#: fetch-pack.c:952

4137 +#: fetch-pack.c:957

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

4139 msgstr "fetch-pack：无效的 index-pack 输出"

4140

4126 -#: fetch-pack.c:969

4141 +#: fetch-pack.c:974

4142 #, c-format

4143 msgid "%s failed"

4144 msgstr "%s 失败"

4145

4131 -#: fetch-pack.c:971

4146 +#: fetch-pack.c:976

4147 msgid "error in sideband demultiplexer"

4148 msgstr "sideband 多路输出出错"

4149

4135 -#: fetch-pack.c:1031

4150 +#: fetch-pack.c:1019

4151 #, c-format

4152 msgid "Server version is %.*s"

4153 msgstr "服务器版本 %.*s"

4154

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

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

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

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

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

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

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

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

4159 #, c-format

4160 msgid "Server supports %s"

4161 msgstr "服务器支持 %s"

4162

4148 -#: fetch-pack.c:1041

4163 +#: fetch-pack.c:1029

4164 msgid "Server does not support shallow clients"

4165 msgstr "服务器不支持 shalllow 客户端"

4166

4152 -#: fetch-pack.c:1101

4167 +#: fetch-pack.c:1089

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

4169 msgstr "服务器不支持 --shallow-since"

4170

4156 -#: fetch-pack.c:1106

4171 +#: fetch-pack.c:1094

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

4173 msgstr "服务器不支持 --shallow-exclude"

4174

4160 -#: fetch-pack.c:1110

4175 +#: fetch-pack.c:1098

4176 msgid "Server does not support --deepen"

4177 msgstr "服务器不支持 --deepen"

4178

4164 -#: fetch-pack.c:1112

4179 +#: fetch-pack.c:1100

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

4181 msgstr "服务器不支持这个仓库的对象格式"

4182

4168 -#: fetch-pack.c:1125

4183 +#: fetch-pack.c:1113

4184 msgid "no common commits"

4185 msgstr "没有共同的提交"

4186

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

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

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

4189 +msgstr "源仓库是浅克隆，拒绝克隆。"

4190 +

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

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

4193 msgstr "git fetch-pack：获取失败。"

4194

4176 -#: fetch-pack.c:1265

4195 +#: fetch-pack.c:1242

4196 #, c-format

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

4198 msgstr "不匹配的算法：客户端 %s，服务端 %s"

4199

4181 -#: fetch-pack.c:1269

4200 +#: fetch-pack.c:1246

4201 #, c-format

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

4203 msgstr "服务器不支持算法 '%s'"

4204

4186 -#: fetch-pack.c:1289

4205 +#: fetch-pack.c:1279

4206 msgid "Server does not support shallow requests"

4207 msgstr "服务器不支持 shalllow 请求"

4208

4190 -#: fetch-pack.c:1296

4209 +#: fetch-pack.c:1286

4210 msgid "Server supports filter"

4211 msgstr "服务器支持 filter"

4212

4194 -#: fetch-pack.c:1335

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

4214 msgid "unable to write request to remote"

4215 msgstr "无法将请求写到远程"

4216

4198 -#: fetch-pack.c:1353

4217 +#: fetch-pack.c:1347

4218 #, c-format

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

4220 msgstr "读取节标题 '%s' 出错"

4221

4203 -#: fetch-pack.c:1359

4222 +#: fetch-pack.c:1353

4223 #, c-format

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

4225 msgstr "预期 '%s'，得到 '%s'"

4226

4208 -#: fetch-pack.c:1420

4227 +#: fetch-pack.c:1387

4228 #, c-format

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

4230 msgstr "意外的确认行：'%s'"

4231

4213 -#: fetch-pack.c:1425

4232 +#: fetch-pack.c:1392

4233 #, c-format

4234 msgid "error processing acks: %d"

4235 msgstr "处理 ack 出错：%d"

4236

4218 -#: fetch-pack.c:1435

4237 +#: fetch-pack.c:1402

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

4239 msgstr "预期在 'ready' 之后发送 packfile"

4240

4222 -#: fetch-pack.c:1437

4241 +#: fetch-pack.c:1404

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

4243 msgstr "在没有 'ready' 不应该发送其它小节"

4244

4226 -#: fetch-pack.c:1479

4245 +#: fetch-pack.c:1445

4246 #, c-format

4247 msgid "error processing shallow info: %d"

4248 msgstr "处理浅克隆信息出错：%d"

4249

4231 -#: fetch-pack.c:1526

4250 +#: fetch-pack.c:1494

4251 #, c-format

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

4253 msgstr "预期 wanted-ref，得到 '%s'"

4254

4236 -#: fetch-pack.c:1531

4255 +#: fetch-pack.c:1499

4256 #, c-format

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

4258 msgstr "意外的 wanted-ref：'%s'"

4259

4241 -#: fetch-pack.c:1536

4260 +#: fetch-pack.c:1504

4261 #, c-format

4262 msgid "error processing wanted refs: %d"

4263 msgstr "处理要获取的引用出错：%d"

4264

4246 -#: fetch-pack.c:1566

4265 +#: fetch-pack.c:1534

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

4267 msgstr "git fetch-pack：预期响应结束包"

4268

4250 -#: fetch-pack.c:1960

4269 +#: fetch-pack.c:1930

4270 msgid "no matching remote head"

4271 msgstr "没有匹配的远程分支"

4272

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

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

4274 msgid "remote did not send all necessary objects"

4275 msgstr "远程没有发送所有必需的对象"

4276

4258 -#: fetch-pack.c:2010

4277 +#: fetch-pack.c:2056

4278 +msgid "unexpected 'ready' from remote"

4279 +msgstr "来自远程的意外的 'ready'"

4280 +

4281 +#: fetch-pack.c:2079

4282 #, c-format

4283 msgid "no such remote ref %s"

4284 msgstr "没有这样的远程引用 %s"

4285

4263 -#: fetch-pack.c:2013

4286 +#: fetch-pack.c:2082

4287 #, c-format

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

4289 msgstr "服务器不允许请求未公开的对象 %s"

@@ -4283,7 +4306,7 @@ msgstr "gpg 数据签名失败"

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

4307 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

4308

4286 -#: grep.c:543

4309 +#: grep.c:531

4310 msgid ""

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

4312 "with -P under PCRE v2"

@@ -4291,18 +4314,18 @@ msgstr ""

4314 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"

4315 "功能"

4316

4294 -#: grep.c:1906

4317 +#: grep.c:1893

4318 #, c-format

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

4320 msgstr "'%s'：无法读取 %s"

4321

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

4300 -#: builtin/rm.c:135

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

4323 +#: builtin/rm.c:136

4324 #, c-format

4325 msgid "failed to stat '%s'"

4326 msgstr "对 '%s' 调用 stat 失败"

4327

4305 -#: grep.c:1934

4328 +#: grep.c:1921

4329 #, c-format

4330 msgid "'%s': short read"

4331 msgstr "'%s'：读取不完整"

@@ -4524,47 +4547,52 @@ msgstr "不允许空的姓名（对于 <%s>）"

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

4548 msgstr "姓名中仅包含禁用字符：%s"

4549

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

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

4551 #, c-format

4552 msgid "invalid date format: %s"

4553 msgstr "无效的日期格式：%s"

4554

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

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

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

4557 msgstr "期望 'tree:<深度>'"

4558

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

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

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

4561 msgstr "sparse:path 过滤器支持已被删除"

4562

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

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

4564 +#, c-format

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

4566 +msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"

4567 +

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

4569 #, c-format

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

4571 msgstr "无效的过滤器表达式 '%s'"

4572

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

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

4574 #, c-format

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

4576 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"

4577

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

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

4579 msgid "expected something after combine:"

4580 msgstr "期望在组合后有一些东西："

4581

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

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

4583 msgid "multiple filter-specs cannot be combined"

4584 msgstr "不能混用多种过滤规格"

4585

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

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

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

4588 msgstr "无法升级仓库格式以支持部分克隆"

4589

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

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

4591 #, c-format

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

4593 msgstr "不能访问 '%s' 中的稀疏数据对象"

4594

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

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

4596 #, c-format

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

4598 msgstr "无法解析 %s 中的稀疏过滤器数据"

@@ -4579,7 +4607,7 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对

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

4608 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"

4609

4582 -#: list-objects.c:375

4610 +#: list-objects.c:395

4611 #, c-format

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

4613 msgstr "无法为提交 %s 加载根树"

@@ -4616,32 +4644,41 @@ msgstr "lsrefs.unborn 的取值 '%s' 无效"

4644 msgid "expected flush after ls-refs arguments"

4645 msgstr "在 ls-refs 参数后应该有一个 flush 包"

4646

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

4647 +#: mailinfo.c:1050

4648 +msgid "quoted CRLF detected"

4649 +msgstr "检测到引号中的换行符"

4650 +

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

4652 +#, c-format

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

4654 +msgstr "'%2$s' 的错误动作 '%1$s'"

4655 +

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

4657 #, c-format

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

4659 msgstr "无法合并子模组 %s （没有检出）"

4660

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

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

4662 #, c-format

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

4664 msgstr "无法合并子模组 %s（提交不存在）"

4665

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

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

4667 #, c-format

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

4669 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

4670

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

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

4672 #, c-format

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

4674 msgstr "注意：快进子模组 %s 到 %s"

4675

4639 -#: merge-ort.c:944

4676 +#: merge-ort.c:1172

4677 #, c-format

4678 msgid "Failed to merge submodule %s"

4679 msgstr "无法合并子模组 %s"

4680

4644 -#: merge-ort.c:951

4681 +#: merge-ort.c:1179

4682 #, c-format

4683 msgid ""

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

@@ -4650,7 +4687,7 @@ msgstr ""

4687 "无法合并子模组 %s，但是存在一个可能的合并方案：\n"

4688 "%s\n"

4689

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

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

4691 #, c-format

4692 msgid ""

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

@@ -4666,7 +4703,7 @@ msgstr ""

4703 "\n"

4704 "以接受此建议。\n"

4705

4669 -#: merge-ort.c:968

4706 +#: merge-ort.c:1196

4707 #, c-format

4708 msgid ""

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

@@ -4675,21 +4712,21 @@ msgstr ""

4712 "无法合并子模组 %s，但是存在多个可能的合并：\n"

4713 "%s"

4714

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

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

4716 msgid "Failed to execute internal merge"

4717 msgstr "无法执行内部合并"

4718

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

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

4720 #, c-format

4721 msgid "Unable to add %s to database"

4722 msgstr "不能添加 %s 至对象库"

4723

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

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

4725 #, c-format

4726 msgid "Auto-merging %s"

4727 msgstr "自动合并 %s"

4728

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

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

4730 #, c-format

4731 msgid ""

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

@@ -4698,7 +4735,7 @@ msgstr ""

4735 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

4736 "在：%s。"

4737

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

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

4739 #, c-format

4740 msgid ""

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

@@ -4707,22 +4744,24 @@ msgstr ""

4744 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

4745 "径放置于此：%s"

4746

4710 -#: merge-ort.c:1471

4747 +#: merge-ort.c:1634

4748 #, c-format

4749 msgid ""

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

4751 "renamed to multiple other directories, with no destination getting a "

4752 "majority of the files."

4716 -msgstr "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目录中，没有一个目标目录中包含多数文件。"

4753 +msgstr ""

4754 +"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"

4755 +"录中，没有一个目标目录中包含多数文件。"

4756

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

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

4758 #, c-format

4759 msgid ""

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

4761 "renamed."

4762 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

4763

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

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

4765 #, c-format

4766 msgid ""

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

@@ -4730,7 +4769,7 @@ msgid ""

4769 msgstr ""

4770 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4771

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

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

4773 #, c-format

4774 msgid ""

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

@@ -4739,7 +4778,7 @@ msgstr ""

4778 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4779 "动到 %5$s。"

4780

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

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

4782 #, c-format

4783 msgid ""

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

@@ -4748,7 +4787,7 @@ msgstr ""

4787 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4788 "到 %s。"

4789

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

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

4791 #, c-format

4792 msgid ""

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

@@ -4757,79 +4796,100 @@ msgstr ""

4796 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4797 "建议将其移动到 %5$s。"

4798

4760 -#: merge-ort.c:1952

4799 +#: merge-ort.c:2103

4800 #, c-format

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

4763 -msgstr "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"

4802 +msgstr ""

4803 +"冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"

4804

4765 -#: merge-ort.c:2047

4805 +#: merge-ort.c:2198

4806 #, c-format

4807 msgid ""

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

4809 "conflicts AND collides with another path; this may result in nested conflict "

4810 "markers."

4771 -msgstr "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这可能导致嵌套的冲突标签。"

4811 +msgstr ""

4812 +"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"

4813 +"可能导致嵌套的冲突标签。"

4814

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

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

4816 #, c-format

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

4818 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"

4819

4778 -#: merge-ort.c:2735

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

4821 +#, c-format

4822 +msgid "cannot read object %s"

4823 +msgstr "不能读取对象 %s"

4824 +

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

4826 +#, c-format

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

4828 +msgstr "对象 %s 不是一个数据对象"

4829 +

4830 +#: merge-ort.c:2981

4831 #, c-format

4832 msgid ""

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

4834 "%s instead."

4835 msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"

4836

4785 -#: merge-ort.c:2808

4837 +#: merge-ort.c:3055

4838 #, c-format

4839 msgid ""

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

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

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

4790 -msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的%s以便每个被记录在不同位置。"

4791 -

4792 -#: merge-ort.c:2812

4793 -msgid "both"

4794 -msgstr "双方"

4842 +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，把它们都重命名以便每个能记录在不同位置。"

4843

4796 -#: merge-ort.c:2812

4797 -msgid "one"

4798 -msgstr "一个"

4844 +#: merge-ort.c:3062

4845 +#, c-format

4846 +msgid ""

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

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

4849 +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的一个以便每个被记录在不同位置。"

4850

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

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

4852 msgid "content"

4853 msgstr "内容"

4854

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

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

4856 msgid "add/add"

4857 msgstr "添加/添加"

4858

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

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

4860 msgid "submodule"

4861 msgstr "子模组"

4862

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

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

4864 #, c-format

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

4866 msgstr "冲突（%s）：合并冲突于 %s"

4867

4817 -#: merge-ort.c:2938

4868 +#: merge-ort.c:3198

4869 #, c-format

4870 msgid ""

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

4872 "of %s left in tree."

4822 -msgstr "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本在树中被保留。"

4873 +msgstr ""

4874 +"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"

4875 +"在树中被保留。"

4876 +

4877 +#: merge-ort.c:3433

4878 +#, c-format

4879 +msgid ""

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

4881 +"copy renamed to %s"

4882 +msgstr "注意：%s 不是最新的，并且正在检出冲突的版本。旧副本重命名为 %s"

4883

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

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

4886 #.

4827 -#: merge-ort.c:3406

4887 +#: merge-ort.c:3730

4888 #, c-format

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

4890 msgstr "无法收集树 %s、%s、%s 的合并信息"

4891

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

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

4893 #, c-format

4894 msgid ""

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

@@ -4838,10 +4898,9 @@ msgstr ""

4898 "您对下列文件的本地修改将被合并操作覆盖：\n"

4899 " %s"

4900

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

4842 -#, c-format

4843 -msgid "Already up to date!"

4844 -msgstr "已经是最新的！"

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

4902 +msgid "Already up to date."

4903 +msgstr "已经是最新的。"

4904

4905 #: merge-recursive.c:356

4906 msgid "(bad commit)\n"

@@ -4857,85 +4916,85 @@ msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

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

4917 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

4918

4860 -#: merge-recursive.c:874

4919 +#: merge-recursive.c:876

4920 #, c-format

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

4922 msgstr "创建路径 '%s'%s 失败"

4923

4865 -#: merge-recursive.c:885

4924 +#: merge-recursive.c:887

4925 #, c-format

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

4927 msgstr "删除 %s 以便为子目录留出空间\n"

4928

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

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

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

4931 msgstr "：可能是一个目录/文件冲突？"

4932

4874 -#: merge-recursive.c:908

4933 +#: merge-recursive.c:910

4934 #, c-format

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

4936 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

4937

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

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

4939 #, c-format

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

4941 msgstr "不能读取对象 %s '%s'"

4942

4884 -#: merge-recursive.c:954

4943 +#: merge-recursive.c:956

4944 #, c-format

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

4946 msgstr "%s '%s' 应为数据对象"

4947

4889 -#: merge-recursive.c:979

4948 +#: merge-recursive.c:981

4949 #, c-format

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

4951 msgstr "打开 '%s' 失败：%s"

4952

4894 -#: merge-recursive.c:990

4953 +#: merge-recursive.c:992

4954 #, c-format

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

4956 msgstr "创建符号链接 '%s' 失败：%s"

4957

4899 -#: merge-recursive.c:995

4958 +#: merge-recursive.c:997

4959 #, c-format

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

4961 msgstr "不知道如何处理 %06o %s '%s'"

4962

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

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

4964 #, c-format

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

4966 msgstr "子模组 %s 快进到如下提交："

4967

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

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

4969 #, c-format

4970 msgid "Fast-forwarding submodule %s"

4971 msgstr "快进子模组 %s"

4972

4914 -#: merge-recursive.c:1251

4973 +#: merge-recursive.c:1265

4974 #, c-format

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

4976 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

4977

4919 -#: merge-recursive.c:1255

4978 +#: merge-recursive.c:1269

4979 #, c-format

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

4981 msgstr "无法合并子模组 %s（非快进）"

4982

4924 -#: merge-recursive.c:1256

4983 +#: merge-recursive.c:1270

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

4985 msgstr "找到子模组的一个可能的合并方案：\n"

4986

4928 -#: merge-recursive.c:1268

4987 +#: merge-recursive.c:1282

4988 #, c-format

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

4990 msgstr "无法合并子模组 %s （发现多个合并）"

4991

4933 -#: merge-recursive.c:1402

4992 +#: merge-recursive.c:1424

4993 #, c-format

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

4995 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

4996

4938 -#: merge-recursive.c:1474

4997 +#: merge-recursive.c:1496

4998 #, c-format

4999 msgid ""

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

@@ -4944,7 +5003,7 @@ msgstr ""

5003 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5004 "本被保留。"

5005

4947 -#: merge-recursive.c:1479

5006 +#: merge-recursive.c:1501

5007 #, c-format

5008 msgid ""

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

@@ -4953,7 +5012,7 @@ msgstr ""

5012 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5013 "%7$s 版本被保留。"

5014

4956 -#: merge-recursive.c:1486

5015 +#: merge-recursive.c:1508

5016 #, c-format

5017 msgid ""

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

@@ -4962,7 +5021,7 @@ msgstr ""

5021 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5022 "本保留在 %8$s 中。"

5023

4965 -#: merge-recursive.c:1491

5024 +#: merge-recursive.c:1513

5025 #, c-format

5026 msgid ""

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

@@ -4971,40 +5030,40 @@ msgstr ""

5030 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5031 "%7$s 版本保留在 %9$s 中。"

5032

4974 -#: merge-recursive.c:1526

5033 +#: merge-recursive.c:1548

5034 msgid "rename"

5035 msgstr "重命名"

5036

4978 -#: merge-recursive.c:1526

5037 +#: merge-recursive.c:1548

5038 msgid "renamed"

5039 msgstr "重命名"

5040

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

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

5042 #, c-format

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

5044 msgstr "拒绝丢失脏文件 '%s'"

5045

4987 -#: merge-recursive.c:1587

5046 +#: merge-recursive.c:1609

5047 #, c-format

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

5049 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

5050

4992 -#: merge-recursive.c:1645

5051 +#: merge-recursive.c:1667

5052 #, c-format

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

5054 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

5055

4997 -#: merge-recursive.c:1676

5056 +#: merge-recursive.c:1698

5057 #, c-format

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

5059 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

5060

5002 -#: merge-recursive.c:1681

5061 +#: merge-recursive.c:1703

5062 #, c-format

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

5064 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

5065

5007 -#: merge-recursive.c:1708

5066 +#: merge-recursive.c:1730

5067 #, c-format

5068 msgid ""

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

@@ -5013,18 +5072,18 @@ msgstr ""

5072 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

5073 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

5074

5016 -#: merge-recursive.c:1713

5075 +#: merge-recursive.c:1735

5076 msgid " (left unresolved)"

5077 msgstr "（留下未解决）"

5078

5020 -#: merge-recursive.c:1805

5079 +#: merge-recursive.c:1827

5080 #, c-format

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

5082 msgstr ""

5083 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

5084 "%5$s"

5085

5027 -#: merge-recursive.c:2068

5086 +#: merge-recursive.c:2090

5087 #, c-format

5088 msgid ""

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

@@ -5034,7 +5093,7 @@ msgstr ""

5093 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

5094 "其它目录，没有目录包含大部分文件。"

5095

5037 -#: merge-recursive.c:2202

5096 +#: merge-recursive.c:2224

5097 #, c-format

5098 msgid ""

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

@@ -5043,89 +5102,79 @@ msgstr ""

5102 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "

5103 "%4$s->%5$s"

5104

5046 -#: merge-recursive.c:2973

5047 -#, c-format

5048 -msgid "cannot read object %s"

5049 -msgstr "不能读取对象 %s"

5050 -

5051 -#: merge-recursive.c:2976

5052 -#, c-format

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

5054 -msgstr "对象 %s 不是一个数据对象"

5055 -

5056 -#: merge-recursive.c:3040

5105 +#: merge-recursive.c:3069

5106 msgid "modify"

5107 msgstr "修改"

5108

5060 -#: merge-recursive.c:3040

5109 +#: merge-recursive.c:3069

5110 msgid "modified"

5111 msgstr "修改"

5112

5064 -#: merge-recursive.c:3079

5113 +#: merge-recursive.c:3108

5114 #, c-format

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

5116 msgstr "略过 %s（已经做过相同合并）"

5117

5069 -#: merge-recursive.c:3132

5118 +#: merge-recursive.c:3161

5119 #, c-format

5120 msgid "Adding as %s instead"

5121 msgstr "而是以 %s 为名添加"

5122

5074 -#: merge-recursive.c:3339

5123 +#: merge-recursive.c:3368

5124 #, c-format

5125 msgid "Removing %s"

5126 msgstr "删除 %s"

5127

5079 -#: merge-recursive.c:3362

5128 +#: merge-recursive.c:3391

5129 msgid "file/directory"

5130 msgstr "文件/目录"

5131

5083 -#: merge-recursive.c:3367

5132 +#: merge-recursive.c:3396

5133 msgid "directory/file"

5134 msgstr "目录/文件"

5135

5087 -#: merge-recursive.c:3374

5136 +#: merge-recursive.c:3403

5137 #, c-format

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

5139 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

5140

5092 -#: merge-recursive.c:3383

5141 +#: merge-recursive.c:3412

5142 #, c-format

5143 msgid "Adding %s"

5144 msgstr "添加 %s"

5145

5097 -#: merge-recursive.c:3392

5146 +#: merge-recursive.c:3421

5147 #, c-format

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

5149 msgstr "冲突（add/add）：合并冲突于 %s"

5150

5102 -#: merge-recursive.c:3445

5151 +#: merge-recursive.c:3474

5152 #, c-format

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

5154 msgstr "无法合并树 %s 和 %s"

5155

5107 -#: merge-recursive.c:3539

5156 +#: merge-recursive.c:3568

5157 msgid "Merging:"

5158 msgstr "合并："

5159

5111 -#: merge-recursive.c:3552

5160 +#: merge-recursive.c:3581

5161 #, c-format

5162 msgid "found %u common ancestor:"

5163 msgid_plural "found %u common ancestors:"

5164 msgstr[0] "发现 %u 个共同祖先："

5165 msgstr[1] "发现 %u 个共同祖先："

5166

5118 -#: merge-recursive.c:3602

5167 +#: merge-recursive.c:3631

5168 msgid "merge returned no commit"

5169 msgstr "合并未返回提交"

5170

5122 -#: merge-recursive.c:3758

5171 +#: merge-recursive.c:3796

5172 #, c-format

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

5174 msgstr "不能解析对象 '%s'"

5175

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

5128 -#: builtin/stash.c:471

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

5177 +#: builtin/stash.c:473

5178 msgid "Unable to write index."

5179 msgstr "不能写入索引。"

5180

@@ -5133,176 +5182,195 @@ msgstr "不能写入索引。"

5182 msgid "failed to read the cache"

5183 msgstr "读取缓存失败"

5184

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

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

5138 -#: builtin/stash.c:265

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

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

5187 +#: builtin/stash.c:267

5188 msgid "unable to write new index file"

5189 msgstr "无法写新的索引文件"

5190

5142 -#: midx.c:62

5191 +#: midx.c:74

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

5193 msgstr "多包索引的对象ID扇出表大小错误"

5194

5146 -#: midx.c:93

5195 +#: midx.c:105

5196 #, c-format

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

5198 msgstr "多包索引文件 %s 太小"

5199

5151 -#: midx.c:109

5200 +#: midx.c:121

5201 #, c-format

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

5203 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

5204

5156 -#: midx.c:114

5205 +#: midx.c:126

5206 #, c-format

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

5208 msgstr "multi-pack-index 版本 %d 不能被识别"

5209

5161 -#: midx.c:119

5210 +#: midx.c:131

5211 #, c-format

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

5213 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"

5214

5166 -#: midx.c:136

5215 +#: midx.c:148

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

5217 msgstr "多包索引缺少必需的包名块"

5218

5170 -#: midx.c:138

5219 +#: midx.c:150

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

5221 msgstr "多包索引缺少必需的对象 ID 扇出块"

5222

5174 -#: midx.c:140

5223 +#: midx.c:152

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

5225 msgstr "多包索引缺少必需的对象 ID 查询块"

5226

5178 -#: midx.c:142

5227 +#: midx.c:154

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

5229 msgstr "多包索引缺少必需的对象偏移块"

5230

5182 -#: midx.c:158

5231 +#: midx.c:170

5232 #, c-format

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

5234 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

5235

5187 -#: midx.c:202

5236 +#: midx.c:214

5237 #, c-format

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

5239 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

5240

5192 -#: midx.c:252

5241 +#: midx.c:264

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

5243 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

5244

5196 -#: midx.c:467

5245 +#: midx.c:490

5246 #, c-format

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

5248 msgstr "添加包文件 '%s' 失败"

5249

5201 -#: midx.c:473

5250 +#: midx.c:496

5251 #, c-format

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

5253 msgstr "打开包索引 '%s' 失败"

5254

5206 -#: midx.c:533

5255 +#: midx.c:564

5256 #, c-format

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

5258 msgstr "在包文件中定位对象 %d 失败"

5259

5211 -#: midx.c:821

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

5261 +msgid "cannot store reverse index file"

5262 +msgstr "无法存储反向索引文件"

5263 +

5264 +#: midx.c:933

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

5266 msgstr "添加包文件到多包索引"

5267

5215 -#: midx.c:855

5268 +#: midx.c:979

5269 #, c-format

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

5271 msgstr "没有看到要丢弃的包文件 %s"

5272

5220 -#: midx.c:904

5273 +#: midx.c:1024

5274 +#, c-format

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

5276 +msgstr "未知的首选包：'%s'"

5277 +

5278 +#: midx.c:1029

5279 +#, c-format

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

5281 +msgstr "首选包 '%s' 已过期"

5282 +

5283 +#: midx.c:1045

5284 msgid "no pack files to index."

5285 msgstr "没有要索引的包文件。"

5286

5224 -#: midx.c:965

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

5288 +#, c-format

5289 +msgid "failed to remove %s"

5290 +msgstr "删除 %s 失败"

5291 +

5292 +#: midx.c:1156

5293 #, c-format

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

5295 msgstr "清理位于 %s 的多包索引失败"

5296

5229 -#: midx.c:1021

5297 +#: midx.c:1214

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

5299 msgstr "多包索引文件存在，但无法解析"

5300

5233 -#: midx.c:1029

5301 +#: midx.c:1222

5302 msgid "Looking for referenced packfiles"

5303 msgstr "正在查找引用的包文件"

5304

5237 -#: midx.c:1044

5305 +#: midx.c:1237

5306 #, c-format

5307 msgid ""

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

5309 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5310

5243 -#: midx.c:1049

5311 +#: midx.c:1242

5312 msgid "the midx contains no oid"

5313 msgstr "midx 不包含 oid"

5314

5247 -#: midx.c:1058

5315 +#: midx.c:1251

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

5317 msgstr "校验多包索引中的 OID 顺序"

5318

5251 -#: midx.c:1067

5319 +#: midx.c:1260

5320 #, c-format

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

5322 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

5323

5256 -#: midx.c:1087

5324 +#: midx.c:1280

5325 msgid "Sorting objects by packfile"

5326 msgstr "通过包文件为对象排序"

5327

5260 -#: midx.c:1094

5328 +#: midx.c:1287

5329 msgid "Verifying object offsets"

5330 msgstr "校验对象偏移"

5331

5264 -#: midx.c:1110

5332 +#: midx.c:1303

5333 #, c-format

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

5335 msgstr "为 oid[%d] = %s 加载包条目失败"

5336

5269 -#: midx.c:1116

5337 +#: midx.c:1309

5338 #, c-format

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

5340 msgstr "为包文件 %s 加载包索引失败"

5341

5274 -#: midx.c:1125

5342 +#: midx.c:1318

5343 #, c-format

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

5345 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

5346

5279 -#: midx.c:1150

5347 +#: midx.c:1343

5348 msgid "Counting referenced objects"

5349 msgstr "正在对引用对象计数"

5350

5283 -#: midx.c:1160

5351 +#: midx.c:1353

5352 msgid "Finding and deleting unreferenced packfiles"

5353 msgstr "正在查找和删除未引用的包文件"

5354

5287 -#: midx.c:1351

5355 +#: midx.c:1544

5356 msgid "could not start pack-objects"

5357 msgstr "不能开始 pack-objects"

5358

5291 -#: midx.c:1371

5359 +#: midx.c:1564

5360 msgid "could not finish pack-objects"

5361 msgstr "不能结束 pack-objects"

5362

5295 -#: name-hash.c:538

5363 +#: name-hash.c:542

5364 #, c-format

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

5366 msgstr "不能创建 lazy_dir 线程：%s"

5367

5300 -#: name-hash.c:560

5368 +#: name-hash.c:564

5369 #, c-format

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

5371 msgstr "不能创建 lazy_name 线程：%s"

5372

5305 -#: name-hash.c:566

5373 +#: name-hash.c:570

5374 #, c-format

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

5376 msgstr "不能加入 lasy_name 线程：%s"

@@ -5346,256 +5414,256 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

5415 msgstr "坏的 %s 值：'%s'"

5416

5349 -#: object-file.c:480

5417 +#: object-file.c:526

5418 #, c-format

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

5420 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"

5421

5354 -#: object-file.c:531

5422 +#: object-file.c:577

5423 #, c-format

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

5425 msgstr "无法规范化备用对象路径：%s"

5426

5359 -#: object-file.c:603

5427 +#: object-file.c:649

5428 #, c-format

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

5430 msgstr "%s：忽略备用对象库，嵌套太深"

5431

5364 -#: object-file.c:610

5432 +#: object-file.c:656

5433 #, c-format

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

5435 msgstr "无法规范化对象目录: %s"

5436

5369 -#: object-file.c:653

5437 +#: object-file.c:699

5438 msgid "unable to fdopen alternates lockfile"

5439 msgstr "无法 fdopen 替换锁文件"

5440

5373 -#: object-file.c:671

5441 +#: object-file.c:717

5442 msgid "unable to read alternates file"

5443 msgstr "无法读取替代文件"

5444

5377 -#: object-file.c:678

5445 +#: object-file.c:724

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

5447 msgstr "无法将新的替代文件移动到位"

5448

5381 -#: object-file.c:713

5449 +#: object-file.c:759

5450 #, c-format

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

5452 msgstr "路径 '%s' 不存在"

5453

5386 -#: object-file.c:734

5454 +#: object-file.c:780

5455 #, c-format

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

5457 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

5458

5391 -#: object-file.c:740

5459 +#: object-file.c:786

5460 #, c-format

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

5462 msgstr "参考仓库 '%s' 不是一个本地仓库。"

5463

5396 -#: object-file.c:746

5464 +#: object-file.c:792

5465 #, c-format

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

5467 msgstr "参考仓库 '%s' 是一个浅克隆"

5468

5401 -#: object-file.c:754

5469 +#: object-file.c:800

5470 #, c-format

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

5472 msgstr "参考仓库 '%s' 已被移植"

5473

5406 -#: object-file.c:814

5474 +#: object-file.c:860

5475 #, c-format

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

5477 msgstr "解析备用引用时无效的行：%s"

5478

5411 -#: object-file.c:964

5479 +#: object-file.c:1010

5480 #, c-format

5481 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5482 msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"

5483

5416 -#: object-file.c:985

5484 +#: object-file.c:1031

5485 msgid "mmap failed"

5486 msgstr "mmap 失败"

5487

5420 -#: object-file.c:1149

5488 +#: object-file.c:1195

5489 #, c-format

5490 msgid "object file %s is empty"

5491 msgstr "对象文件 %s 为空"

5492

5425 -#: object-file.c:1284 object-file.c:2477

5493 +#: object-file.c:1330 object-file.c:2524

5494 #, c-format

5495 msgid "corrupt loose object '%s'"

5496 msgstr "损坏的松散对象 '%s'"

5497

5430 -#: object-file.c:1286 object-file.c:2481

5498 +#: object-file.c:1332 object-file.c:2528

5499 #, c-format

5500 msgid "garbage at end of loose object '%s'"

5501 msgstr "松散对象 '%s' 后面有垃圾数据"

5502

5435 -#: object-file.c:1328

5503 +#: object-file.c:1374

5504 msgid "invalid object type"

5505 msgstr "无效的对象类型"

5506

5439 -#: object-file.c:1412

5507 +#: object-file.c:1458

5508 #, c-format

5509 msgid "unable to unpack %s header with --allow-unknown-type"

5510 msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"

5511

5444 -#: object-file.c:1415

5512 +#: object-file.c:1461

5513 #, c-format

5514 msgid "unable to unpack %s header"

5515 msgstr "无法解开 %s 头部"

5516

5449 -#: object-file.c:1421

5517 +#: object-file.c:1467

5518 #, c-format

5519 msgid "unable to parse %s header with --allow-unknown-type"

5520 msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"

5521

5454 -#: object-file.c:1424

5522 +#: object-file.c:1470

5523 #, c-format

5524 msgid "unable to parse %s header"

5525 msgstr "无法解析 %s 头部"

5526

5459 -#: object-file.c:1651

5527 +#: object-file.c:1697

5528 #, c-format

5529 msgid "failed to read object %s"

5530 msgstr "读取对象 %s 失败"

5531

5464 -#: object-file.c:1655

5532 +#: object-file.c:1701

5533 #, c-format

5534 msgid "replacement %s not found for %s"

5535 msgstr "找不到 %2$s 的替代 %1$s"

5536

5469 -#: object-file.c:1659

5537 +#: object-file.c:1705

5538 #, c-format

5539 msgid "loose object %s (stored in %s) is corrupt"

5540 msgstr "松散对象 %s（保存在 %s）已损坏"

5541

5474 -#: object-file.c:1663

5542 +#: object-file.c:1709

5543 #, c-format

5544 msgid "packed object %s (stored in %s) is corrupt"

5545 msgstr "打包对象 %s（保存在 %s）已损坏"

5546

5479 -#: object-file.c:1768

5547 +#: object-file.c:1814

5548 #, c-format

5549 msgid "unable to write file %s"

5550 msgstr "无法写文件 %s"

5551

5484 -#: object-file.c:1775

5552 +#: object-file.c:1821

5553 #, c-format

5554 msgid "unable to set permission to '%s'"

5555 msgstr "无法为 '%s' 设置权限"

5556

5489 -#: object-file.c:1782

5557 +#: object-file.c:1828

5558 msgid "file write error"

5559 msgstr "文件写错误"

5560

5493 -#: object-file.c:1802

5561 +#: object-file.c:1848

5562 msgid "error when closing loose object file"

5563 msgstr "关闭松散对象文件时出错"

5564

5497 -#: object-file.c:1867

5565 +#: object-file.c:1913

5566 #, c-format

5567 msgid "insufficient permission for adding an object to repository database %s"

5568 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"

5569

5502 -#: object-file.c:1869

5570 +#: object-file.c:1915

5571 msgid "unable to create temporary file"

5572 msgstr "无法创建临时文件"

5573

5506 -#: object-file.c:1893

5574 +#: object-file.c:1939

5575 msgid "unable to write loose object file"

5576 msgstr "不能写松散对象文件"

5577

5510 -#: object-file.c:1899

5578 +#: object-file.c:1945

5579 #, c-format

5580 msgid "unable to deflate new object %s (%d)"

5581 msgstr "不能压缩新对象 %s（%d）"

5582

5515 -#: object-file.c:1903

5583 +#: object-file.c:1949

5584 #, c-format

5585 msgid "deflateEnd on object %s failed (%d)"

5586 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

5587

5520 -#: object-file.c:1907

5588 +#: object-file.c:1953

5589 #, c-format

5590 msgid "confused by unstable object source data for %s"

5591 msgstr "被 %s 的不稳定对象源数据搞糊涂了"

5592

5525 -#: object-file.c:1917 builtin/pack-objects.c:1097

5593 +#: object-file.c:1963 builtin/pack-objects.c:1097

5594 #, c-format

5595 msgid "failed utime() on %s"

5596 msgstr "在 %s 上调用 utime() 失败"

5597

5530 -#: object-file.c:1994

5598 +#: object-file.c:2040

5599 #, c-format

5600 msgid "cannot read object for %s"

5601 msgstr "不能读取对象 %s"

5602

5535 -#: object-file.c:2045

5603 +#: object-file.c:2091

5604 msgid "corrupt commit"

5605 msgstr "损坏的提交"

5606

5539 -#: object-file.c:2053

5607 +#: object-file.c:2099

5608 msgid "corrupt tag"

5609 msgstr "损坏的标签"

5610

5543 -#: object-file.c:2153

5611 +#: object-file.c:2199

5612 #, c-format

5613 msgid "read error while indexing %s"

5614 msgstr "索引 %s 时读取错误"

5615

5548 -#: object-file.c:2156

5616 +#: object-file.c:2202

5617 #, c-format

5618 msgid "short read while indexing %s"

5619 msgstr "索引 %s 时读入不完整"

5620

5553 -#: object-file.c:2229 object-file.c:2239

5621 +#: object-file.c:2275 object-file.c:2285

5622 #, c-format

5623 msgid "%s: failed to insert into database"

5624 msgstr "%s：插入数据库失败"

5625

5558 -#: object-file.c:2245

5626 +#: object-file.c:2291

5627 #, c-format

5628 msgid "%s: unsupported file type"

5629 msgstr "%s：不支持的文件类型"

5630

5563 -#: object-file.c:2269

5631 +#: object-file.c:2315

5632 #, c-format

5633 msgid "%s is not a valid object"

5634 msgstr "%s 不是一个有效的对象"

5635

5568 -#: object-file.c:2271

5636 +#: object-file.c:2317

5637 #, c-format

5638 msgid "%s is not a valid '%s' object"

5639 msgstr "%s 不是一个有效的 '%s' 对象"

5640

5573 -#: object-file.c:2298 builtin/index-pack.c:192

5641 +#: object-file.c:2344 builtin/index-pack.c:192

5642 #, c-format

5643 msgid "unable to open %s"

5644 msgstr "不能打开 %s"

5645

5578 -#: object-file.c:2488 object-file.c:2541

5646 +#: object-file.c:2535 object-file.c:2588

5647 #, c-format

5648 msgid "hash mismatch for %s (expected %s)"

5649 msgstr "%s 的哈希值不匹配（预期 %s）"

5650

5583 -#: object-file.c:2512

5651 +#: object-file.c:2559

5652 #, c-format

5653 msgid "unable to mmap %s"

5654 msgstr "不能 mmap %s"

5655

5588 -#: object-file.c:2517

5656 +#: object-file.c:2564

5657 #, c-format

5658 msgid "unable to unpack header of %s"

5659 msgstr "无法解压缩 %s 的头部"

5660

5593 -#: object-file.c:2523

5661 +#: object-file.c:2570

5662 #, c-format

5663 msgid "unable to parse header of %s"

5664 msgstr "无法解析 %s 的头部"

5665

5598 -#: object-file.c:2534

5666 +#: object-file.c:2581

5667 #, c-format

5668 msgid "unable to unpack contents of %s"

5669 msgstr "无法解压缩 %s 的内容"

@@ -5706,71 +5774,71 @@ msgstr "无效的对象类型 \"%s\""

5774 msgid "object %s is a %s, not a %s"

5775 msgstr "对象 %s 是一个 %s，不是一个 %s"

5776

5709 -#: object.c:233

5777 +#: object.c:232

5778 #, c-format

5779 msgid "object %s has unknown type id %d"

5780 msgstr "对象 %s 有未知的类型 id %d"

5781

5714 -#: object.c:246

5782 +#: object.c:245

5783 #, c-format

5784 msgid "unable to parse object: %s"

5785 msgstr "不能解析对象：%s"

5786

5719 -#: object.c:266 object.c:278

5787 +#: object.c:265 object.c:277

5788 #, c-format

5789 msgid "hash mismatch %s"

5790 msgstr "哈希值与 %s 不匹配"

5791

5724 -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5792 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5793 #, c-format

5794 msgid "unable to get size of %s"

5795 msgstr "无法得到 %s 的大小"

5796

5729 -#: pack-bitmap.c:1489 builtin/rev-list.c:92

5797 +#: pack-bitmap.c:1547 builtin/rev-list.c:92

5798 #, c-format

5799 msgid "unable to get disk usage of %s"

5800 msgstr "无法得到 %s 的磁盘使用量"

5801

5734 -#: pack-revindex.c:220

5802 +#: pack-revindex.c:221

5803 #, c-format

5804 msgid "reverse-index file %s is too small"

5805 msgstr "反向索引文件 %s 太小"

5806

5739 -#: pack-revindex.c:225

5807 +#: pack-revindex.c:226

5808 #, c-format

5809 msgid "reverse-index file %s is corrupt"

5810 msgstr "反向索引文件 %s 损坏"

5811

5744 -#: pack-revindex.c:233

5812 +#: pack-revindex.c:234

5813 #, c-format

5814 msgid "reverse-index file %s has unknown signature"

5815 msgstr "反向索引文件 %s 有错误的签名"

5816

5749 -#: pack-revindex.c:237

5817 +#: pack-revindex.c:238

5818 #, c-format

5819 msgid "reverse-index file %s has unsupported version %<PRIu32>"

5820 msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"

5821

5754 -#: pack-revindex.c:242

5822 +#: pack-revindex.c:243

5823 #, c-format

5824 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5825 msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"

5826

5759 -#: pack-write.c:236

5827 +#: pack-write.c:250

5828 msgid "cannot both write and verify reverse index"

5829 msgstr "无法同时写入和校验反向索引"

5830

5763 -#: pack-write.c:257

5831 +#: pack-write.c:271

5832 #, c-format

5833 msgid "could not stat: %s"

5834 msgstr "不能调用 stat：%s"

5835

5768 -#: pack-write.c:269

5836 +#: pack-write.c:283

5837 #, c-format

5838 msgid "failed to make %s readable"

5839 msgstr "无法设置 %s 为可读"

5840

5773 -#: pack-write.c:508

5841 +#: pack-write.c:522

5842 #, c-format

5843 msgid "could not write '%s' promisor file"

5844 msgstr "无法写入 '%s' 承诺者文件"

@@ -5779,12 +5847,12 @@ msgstr "无法写入 '%s' 承诺者文件"

5847 msgid "offset before end of packfile (broken .idx?)"

5848 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5849

5782 -#: packfile.c:1934

5850 +#: packfile.c:1937

5851 #, c-format

5852 msgid "offset before start of pack index for %s (corrupt index?)"

5853 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5854

5787 -#: packfile.c:1938

5855 +#: packfile.c:1941

5856 #, c-format

5857 msgid "offset beyond end of pack index for %s (truncated index?)"

5858 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -5849,31 +5917,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5917 msgid "did you mean `--%s` (with two dashes)?"

5918 msgstr "你的意思是 `--%s`（有两个短线）？"

5919

5852 -#: parse-options.c:666 parse-options.c:971

5920 +#: parse-options.c:668 parse-options.c:988

5921 #, c-format

5922 msgid "alias of --%s"

5923 msgstr "--%s 的别名"

5924

5857 -#: parse-options.c:862

5925 +#: parse-options.c:879

5926 #, c-format

5927 msgid "unknown option `%s'"

5928 msgstr "未知选项 `%s'"

5929

5862 -#: parse-options.c:864

5930 +#: parse-options.c:881

5931 #, c-format

5932 msgid "unknown switch `%c'"

5933 msgstr "未知开关 `%c'"

5934

5867 -#: parse-options.c:866

5935 +#: parse-options.c:883

5936 #, c-format

5937 msgid "unknown non-ascii option in string: `%s'"

5938 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5939

5872 -#: parse-options.c:890

5940 +#: parse-options.c:907

5941 msgid "..."

5942 msgstr "..."

5943

5876 -#: parse-options.c:909

5944 +#: parse-options.c:926

5945 #, c-format

5946 msgid "usage: %s"

5947 msgstr "用法：%s"

@@ -5881,18 +5949,18 @@ msgstr "用法：%s"

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

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

5951 #.

5884 -#: parse-options.c:915

5952 +#: parse-options.c:932

5953 #, c-format

5954 msgid " or: %s"

5955 msgstr " 或：%s"

5956

5957 # 译者：为保证在输出中对齐，注意调整句中空格！

5890 -#: parse-options.c:918

5958 +#: parse-options.c:935

5959 #, c-format

5960 msgid " %s"

5961 msgstr " %s"

5962

5895 -#: parse-options.c:957

5963 +#: parse-options.c:974

5964 msgid "-NUM"

5965 msgstr "-数字"

5966

@@ -5901,78 +5969,78 @@ msgstr "-数字"

5969 msgid "Could not make %s writable by group"

5970 msgstr "不能设置 %s 为组可写"

5971

5904 -#: pathspec.c:130

5972 +#: pathspec.c:151

5973 msgid "Escape character '\\' not allowed as last character in attr value"

5974 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

5975

5908 -#: pathspec.c:148

5976 +#: pathspec.c:169

5977 msgid "Only one 'attr:' specification is allowed."

5978 msgstr "只允许一个 'attr:' 规格。"

5979

5912 -#: pathspec.c:151

5980 +#: pathspec.c:172

5981 msgid "attr spec must not be empty"

5982 msgstr "属性规格不能为空"

5983

5916 -#: pathspec.c:194

5984 +#: pathspec.c:215

5985 #, c-format

5986 msgid "invalid attribute name %s"

5987 msgstr "无效的属性名 %s"

5988

5921 -#: pathspec.c:259

5989 +#: pathspec.c:280

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

5991 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

5992

5925 -#: pathspec.c:266

5993 +#: pathspec.c:287

5994 msgid ""

5995 "global 'literal' pathspec setting is incompatible with all other global "

5996 "pathspec settings"

5997 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

5998

5931 -#: pathspec.c:306

5999 +#: pathspec.c:327

6000 msgid "invalid parameter for pathspec magic 'prefix'"

6001 msgstr "路径规格包含无效的神奇前缀"

6002

5935 -#: pathspec.c:327

6003 +#: pathspec.c:348

6004 #, c-format

6005 msgid "Invalid pathspec magic '%.*s' in '%s'"

6006 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

6007

5940 -#: pathspec.c:332

6008 +#: pathspec.c:353

6009 #, c-format

6010 msgid "Missing ')' at the end of pathspec magic in '%s'"

6011 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

6012

5945 -#: pathspec.c:370

6013 +#: pathspec.c:391

6014 #, c-format

6015 msgid "Unimplemented pathspec magic '%c' in '%s'"

6016 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

6017

5950 -#: pathspec.c:429

6018 +#: pathspec.c:450

6019 #, c-format

6020 msgid "%s: 'literal' and 'glob' are incompatible"

6021 msgstr "%s：'literal' 和 'glob' 不兼容"

6022

5955 -#: pathspec.c:445

6023 +#: pathspec.c:466

6024 #, c-format

6025 msgid "%s: '%s' is outside repository at '%s'"

6026 msgstr "%s：'%s' 在位于 '%s' 的仓库之外"

6027

5960 -#: pathspec.c:521

6028 +#: pathspec.c:542

6029 #, c-format

6030 msgid "'%s' (mnemonic: '%c')"

6031 msgstr "'%s'（助记符：'%c'）"

6032

5965 -#: pathspec.c:531

6033 +#: pathspec.c:552

6034 #, c-format

6035 msgid "%s: pathspec magic not supported by this command: %s"

6036 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

6037

5970 -#: pathspec.c:598

6038 +#: pathspec.c:619

6039 #, c-format

6040 msgid "pathspec '%s' is beyond a symbolic link"

6041 msgstr "路径规格 '%s' 位于符号链接中"

6042

5975 -#: pathspec.c:643

6043 +#: pathspec.c:664

6044 #, c-format

6045 msgid "line is badly quoted: %s"

6046 msgstr "行被错误地引用：%s"

@@ -5993,7 +6061,7 @@ msgstr "无法写入无状态分隔符数据包"

6061 msgid "flush packet write failed"

6062 msgstr "flush 包写错误"

6063

5996 -#: pkt-line.c:153 pkt-line.c:239

6064 +#: pkt-line.c:153 pkt-line.c:265

6065 msgid "protocol error: impossibly long line"

6066 msgstr "协议错误：不可能的长行"

6067

@@ -6001,33 +6069,34 @@ msgstr "协议错误：不可能的长行"

6069 msgid "packet write with format failed"

6070 msgstr "格式化包写入错误"

6071

6004 -#: pkt-line.c:203

6072 +#: pkt-line.c:204

6073 msgid "packet write failed - data exceeds max packet size"

6074 msgstr "写数据包失败：数据超过了包的最大长度"

6075

6008 -#: pkt-line.c:210 pkt-line.c:217

6009 -msgid "packet write failed"

6010 -msgstr "数据包写入失败"

6076 +#: pkt-line.c:222

6077 +#, c-format

6078 +msgid "packet write failed: %s"

6079 +msgstr "数据包写入失败：%s"

6080

6012 -#: pkt-line.c:302

6081 +#: pkt-line.c:328 pkt-line.c:329

6082 msgid "read error"

6083 msgstr "读取错误"

6084

6016 -#: pkt-line.c:310

6085 +#: pkt-line.c:339 pkt-line.c:340

6086 msgid "the remote end hung up unexpectedly"

6087 msgstr "远端意外挂断了"

6088

6020 -#: pkt-line.c:338

6089 +#: pkt-line.c:369 pkt-line.c:371

6090 #, c-format

6091 msgid "protocol error: bad line length character: %.4s"

6092 msgstr "协议错误：错误的行长度字符串：%.4s"

6093

6025 -#: pkt-line.c:352 pkt-line.c:357

6094 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396

6095 #, c-format

6096 msgid "protocol error: bad line length %d"

6097 msgstr "协议错误：错误的行长度 %d"

6098

6030 -#: pkt-line.c:373 sideband.c:165

6099 +#: pkt-line.c:413 sideband.c:165

6100 #, c-format

6101 msgid "remote error: %s"

6102 msgstr "远程错误：%s"

@@ -6041,7 +6110,7 @@ msgstr "正在刷新索引"

6110 msgid "unable to create threaded lstat: %s"

6111 msgstr "无法创建线程 lstat：%s"

6112

6044 -#: pretty.c:984

6113 +#: pretty.c:988

6114 msgid "unable to parse --pretty format"

6115 msgstr "不能解析 --pretty 格式"

6116

@@ -6062,6 +6131,10 @@ msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"

6131 msgid "promisor remote name cannot begin with '/': %s"

6132 msgstr "promisor 远程名称不能以 '/' 开始：%s"

6133

6134 +#: protocol-caps.c:103

6135 +msgid "object-info: expected flush after arguments"

6136 +msgstr "object-info：在参数之后应有一个 flush"

6137 +

6138 #: prune-packed.c:35

6139 msgid "Removing duplicate objects"

6140 msgstr "正在删除重复对象"

@@ -6074,7 +6147,7 @@ msgstr "不能启动 `log`"

6147 msgid "could not read `log` output"

6148 msgstr "不能读取 `log` 的输出"

6149

6077 -#: range-diff.c:101 sequencer.c:5318

6150 +#: range-diff.c:101 sequencer.c:5551

6151 #, c-format

6152 msgid "could not parse commit '%s'"

6153 msgstr "不能解析提交 '%s'"

@@ -6104,50 +6177,50 @@ msgstr "--left-only 和 --right-only 互斥"

6177 msgid "could not parse log for '%s'"

6178 msgstr "不能解析 '%s' 的日志"

6179

6107 -#: read-cache.c:682

6180 +#: read-cache.c:708

6181 #, c-format

6182 msgid "will not add file alias '%s' ('%s' already exists in index)"

6183 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

6184

6112 -#: read-cache.c:698

6185 +#: read-cache.c:724

6186 msgid "cannot create an empty blob in the object database"

6187 msgstr "不能在对象数据库中创建空的数据对象"

6188

6116 -#: read-cache.c:720

6189 +#: read-cache.c:746

6190 #, c-format

6191 msgid "%s: can only add regular files, symbolic links or git-directories"

6192 msgstr "%s：只能添加常规文件、符号链接或 git 目录"

6193

6121 -#: read-cache.c:725

6194 +#: read-cache.c:751

6195 #, c-format

6196 msgid "'%s' does not have a commit checked out"

6197 msgstr "'%s' 没有检出一个提交"

6198

6126 -#: read-cache.c:777

6199 +#: read-cache.c:803

6200 #, c-format

6201 msgid "unable to index file '%s'"

6202 msgstr "无法索引文件 '%s'"

6203

6131 -#: read-cache.c:796

6204 +#: read-cache.c:822

6205 #, c-format

6206 msgid "unable to add '%s' to index"

6207 msgstr "无法在索引中添加 '%s'"

6208

6136 -#: read-cache.c:807

6209 +#: read-cache.c:833

6210 #, c-format

6211 msgid "unable to stat '%s'"

6212 msgstr "无法对 %s 执行 stat"

6213

6141 -#: read-cache.c:1318

6214 +#: read-cache.c:1356

6215 #, c-format

6216 msgid "'%s' appears as both a file and as a directory"

6217 msgstr "'%s' 看起来既是文件又是目录"

6218

6146 -#: read-cache.c:1532

6219 +#: read-cache.c:1571

6220 msgid "Refresh index"

6221 msgstr "刷新索引"

6222

6150 -#: read-cache.c:1657

6223 +#: read-cache.c:1700

6224 #, c-format

6225 msgid ""

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

@@ -6156,7 +6229,7 @@ msgstr ""

6229 "设置了 index.version，但是取值无效。\n"

6230 "使用版本 %i"

6231

6159 -#: read-cache.c:1667

6232 +#: read-cache.c:1710

6233 #, c-format

6234 msgid ""

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

@@ -6165,140 +6238,144 @@ msgstr ""

6238 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

6239 "使用版本 %i"

6240

6168 -#: read-cache.c:1723

6241 +#: read-cache.c:1766

6242 #, c-format

6243 msgid "bad signature 0x%08x"

6244 msgstr "坏的签名 0x%08x"

6245

6173 -#: read-cache.c:1726

6246 +#: read-cache.c:1769

6247 #, c-format

6248 msgid "bad index version %d"

6249 msgstr "坏的索引版本 %d"

6250

6178 -#: read-cache.c:1735

6251 +#: read-cache.c:1778

6252 msgid "bad index file sha1 signature"

6253 msgstr "坏的索引文件 sha1 签名"

6254

6182 -#: read-cache.c:1765

6255 +#: read-cache.c:1812

6256 #, c-format

6257 msgid "index uses %.4s extension, which we do not understand"

6258 msgstr "索引使用不被支持的 %.4s 扩展"

6259

6260 #

6188 -#: read-cache.c:1767

6261 +#: read-cache.c:1814

6262 #, c-format

6263 msgid "ignoring %.4s extension"

6264 msgstr "忽略 %.4s 扩展"

6265

6193 -#: read-cache.c:1804

6266 +#: read-cache.c:1851

6267 #, c-format

6268 msgid "unknown index entry format 0x%08x"

6269 msgstr "未知的索引条目格式 0x%08x"

6270

6198 -#: read-cache.c:1820

6271 +#: read-cache.c:1867

6272 #, c-format

6273 msgid "malformed name field in the index, near path '%s'"

6274 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

6275

6203 -#: read-cache.c:1877

6276 +#: read-cache.c:1924

6277 msgid "unordered stage entries in index"

6278 msgstr "索引中有未排序的暂存条目"

6279

6207 -#: read-cache.c:1880

6280 +#: read-cache.c:1927

6281 #, c-format

6282 msgid "multiple stage entries for merged file '%s'"

6283 msgstr "合并文件 '%s' 有多个暂存条目"

6284

6212 -#: read-cache.c:1883

6285 +#: read-cache.c:1930

6286 #, c-format

6287 msgid "unordered stage entries for '%s'"

6288 msgstr "'%s' 的未排序暂存条目"

6289

6217 -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095

6218 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

6219 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

6220 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

6221 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

6290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

6291 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

6292 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

6293 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6294 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6295 #: builtin/submodule--helper.c:332

6296 msgid "index file corrupt"

6297 msgstr "索引文件损坏"

6298

6226 -#: read-cache.c:2133

6299 +#: read-cache.c:2180

6300 #, c-format

6301 msgid "unable to create load_cache_entries thread: %s"

6302 msgstr "无法创建 load_cache_entries 线程：%s"

6303

6231 -#: read-cache.c:2146

6304 +#: read-cache.c:2193

6305 #, c-format

6306 msgid "unable to join load_cache_entries thread: %s"

6307 msgstr "无法加入 load_cache_entries 线程：%s"

6308

6236 -#: read-cache.c:2179

6309 +#: read-cache.c:2226

6310 #, c-format

6311 msgid "%s: index file open failed"

6312 msgstr "%s：打开索引文件失败"

6313

6241 -#: read-cache.c:2183

6314 +#: read-cache.c:2230

6315 #, c-format

6316 msgid "%s: cannot stat the open index"

6317 msgstr "%s：不能对打开的索引执行 stat 操作"

6318

6246 -#: read-cache.c:2187

6319 +#: read-cache.c:2234

6320 #, c-format

6321 msgid "%s: index file smaller than expected"

6322 msgstr "%s：索引文件比预期的小"

6323

6251 -#: read-cache.c:2191

6324 +#: read-cache.c:2238

6325 #, c-format

6326 msgid "%s: unable to map index file"

6327 msgstr "%s：无法对索引文件执行 map 操作"

6328

6256 -#: read-cache.c:2233

6329 +#: read-cache.c:2280

6330 #, c-format

6331 msgid "unable to create load_index_extensions thread: %s"

6332 msgstr "无法创建 load_index_extensions 线程：%s"

6333

6261 -#: read-cache.c:2260

6334 +#: read-cache.c:2307

6335 #, c-format

6336 msgid "unable to join load_index_extensions thread: %s"

6337 msgstr "无法加入 load_index_extensions 线程：%s"

6338

6266 -#: read-cache.c:2292

6339 +#: read-cache.c:2345

6340 #, c-format

6341 msgid "could not freshen shared index '%s'"

6342 msgstr "无法刷新共享索引 '%s'"

6343

6271 -#: read-cache.c:2339

6344 +#: read-cache.c:2392

6345 #, c-format

6346 msgid "broken index, expect %s in %s, got %s"

6347 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6348

6276 -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

6349 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6350 #, c-format

6351 msgid "could not close '%s'"

6352 msgstr "不能关闭 '%s'"

6353

6281 -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

6354 +#: read-cache.c:3138

6355 +msgid "failed to convert to a sparse-index"

6356 +msgstr "无法转换为稀疏索引"

6357 +

6358 +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6359 #, c-format

6360 msgid "could not stat '%s'"

6361 msgstr "不能对 '%s' 调用 stat"

6362

6286 -#: read-cache.c:3151

6363 +#: read-cache.c:3222

6364 #, c-format

6365 msgid "unable to open git dir: %s"

6366 msgstr "不能打开 git 目录：%s"

6367

6291 -#: read-cache.c:3163

6368 +#: read-cache.c:3234

6369 #, c-format

6370 msgid "unable to unlink: %s"

6371 msgstr "无法删除：%s"

6372

6296 -#: read-cache.c:3188

6373 +#: read-cache.c:3263

6374 #, c-format

6375 msgid "cannot fix permission bits on '%s'"

6376 msgstr "不能修复 '%s' 的权限位"

6377

6301 -#: read-cache.c:3337

6378 +#: read-cache.c:3412

6379 #, c-format

6380 msgid "%s: cannot drop to stage #0"

6381 msgstr "%s：不能落到暂存区 #0"

@@ -6326,7 +6403,10 @@ msgid ""

6403 "r, reword <commit> = use commit, but edit the commit message\n"

6404 "e, edit <commit> = use commit, but stop for amending\n"

6405 "s, squash <commit> = use commit, but meld into previous commit\n"

6329 -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

6406 +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"

6407 +" commit's log message, unless -C is used, in which case\n"

6408 +" keep only this commit's message; -c is same as -C but\n"

6409 +" opens the editor\n"

6410 "x, exec <command> = run command (the rest of the line) using shell\n"

6411 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"

6412 "d, drop <commit> = remove commit\n"

@@ -6335,17 +6415,20 @@ msgid ""

6415 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6416 ". create a merge commit using the original merge commit's\n"

6417 ". message (or the oneline, if no original merge commit was\n"

6338 -". specified). Use -c <commit> to reword the commit message.\n"

6418 +". specified); use -c <commit> to reword the commit message\n"

6419 "\n"

6420 "These lines can be re-ordered; they are executed from top to bottom.\n"

6421 msgstr ""

6422 "\n"

6423 "命令:\n"

6424 "p, pick <提交> = 使用提交\n"

6345 -"r, reword <提交> = 使用提交，但修改提交说明\n"

6346 -"e, edit <提交> = 使用提交，进入 shell 以便进行提交修补\n"

6347 -"s, squash <提交> = 使用提交，但融合到前一个提交\n"

6348 -"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"

6425 +"r, reword <提交> = 使用提交，但编辑提交说明\n"

6426 +"e, edit <提交> = 使用提交，但停止以便在 shell 中修补提交\n"

6427 +"s, squash <提交> = 使用提交，但挤压到前一个提交\n"

6428 +"f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"

6429 +" 的提交说明，除非使用了 -C 参数，此情况下则只\n"

6430 +" 保留本提交说明。使用 -c 和 -C 类似，但会打开\n"

6431 +" 编辑器修改提交说明\n"

6432 "x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"

6433 "b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"

6434 "d, drop <提交> = 删除提交\n"

@@ -6358,14 +6441,14 @@ msgstr ""

6441 "\n"

6442 "可以对这些行重新排序，将从上至下执行。\n"

6443

6361 -#: rebase-interactive.c:63

6444 +#: rebase-interactive.c:66

6445 #, c-format

6446 msgid "Rebase %s onto %s (%d command)"

6447 msgid_plural "Rebase %s onto %s (%d commands)"

6448 msgstr[0] "变基 %s 到 %s（%d 个提交）"

6449 msgstr[1] "变基 %s 到 %s（%d 个提交）"

6450

6368 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

6451 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218

6452 msgid ""

6453 "\n"

6454 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -6373,7 +6456,7 @@ msgstr ""

6456 "\n"

6457 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

6458

6376 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

6459 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222

6460 msgid ""

6461 "\n"

6462 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -6381,7 +6464,7 @@ msgstr ""

6464 "\n"

6465 "如果您在这里删除一行，对应的提交将会丢失。\n"

6466

6384 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

6467 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861

6468 msgid ""

6469 "\n"

6470 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -6395,7 +6478,7 @@ msgstr ""

6478 " git rebase --continue\n"

6479 "\n"

6480

6398 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

6481 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938

6482 msgid ""

6483 "\n"

6484 "However, if you remove everything, the rebase will be aborted.\n"

@@ -6405,19 +6488,19 @@ msgstr ""

6488 "然而，如果您删除全部内容，变基操作将会终止。\n"

6489 "\n"

6490

6408 -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615

6409 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272

6491 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6492 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6493 #, c-format

6494 msgid "could not write '%s'"

6495 msgstr "不能写入 '%s'"

6496

6414 -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230

6415 -#: builtin/rebase.c:254

6497 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229

6498 +#: builtin/rebase.c:253

6499 #, c-format

6500 msgid "could not write '%s'."

6501 msgstr "不能写入 '%s'。"

6502

6420 -#: rebase-interactive.c:193

6503 +#: rebase-interactive.c:196

6504 #, c-format

6505 msgid ""

6506 "Warning: some commits may have been dropped accidentally.\n"

@@ -6426,7 +6509,7 @@ msgstr ""

6509 "警告：一些提交可能被意外丢弃。\n"

6510 "丢弃的提交（从新到旧）：\n"

6511

6429 -#: rebase-interactive.c:200

6512 +#: rebase-interactive.c:203

6513 #, c-format

6514 msgid ""

6515 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -6442,14 +6525,14 @@ msgstr ""

6525 "可选值有：ignore、warn、error。\n"

6526 "\n"

6527

6445 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402

6446 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241

6447 -#: builtin/rebase.c:266

6528 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597

6529 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240

6530 +#: builtin/rebase.c:265

6531 #, c-format

6532 msgid "could not read '%s'."

6533 msgstr "不能读取 '%s'。"

6534

6452 -#: ref-filter.c:42 wt-status.c:1975

6535 +#: ref-filter.c:42 wt-status.c:1978

6536 msgid "gone"

6537 msgstr "丢失"

6538

@@ -6604,111 +6687,111 @@ msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"

6687 msgid "format: %%(if) atom used without a %%(then) atom"

6688 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

6689

l10n: zh_CN: for git v2.32.0 l10n round 1