473eb54151 · matheusbsbs/matheus-bagliano

@@ -92,6 +92,7 @@

92 # plumbing | 管件（Git 底层核心命令的别称）

93 # porcelain | 瓷件（Git 上层封装命令的别称）

94 # precious-objects repo | 珍品仓库

95 +# promisor | 承诺者

96 # prune | 清除

97 # pull | 拉，拉取

98 # push | 推，推送

@@ -140,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"

143 -"POT-Creation-Date: 2020-12-21 07:10+0800\n"

144 -"PO-Revision-Date: 2020-12-26 21:43+0800\n"

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

145 +"PO-Revision-Date: 2021-03-14 23:21+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"

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

156 msgid "Huh (%s)?"

157 msgstr "嗯（%s）？"

158

158 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

159 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

160 -#: builtin/rebase.c:1955

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

162 msgid "could not read index"

163 msgstr "不能读取索引"

164

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

186 msgid "could not stage '%s'"

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

188

188 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

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

190 msgid "could not write index"

191 msgstr "不能写入索引"

192

@@ -343,7 +344,7 @@ 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

346 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

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

@@ -904,7 +905,7 @@ msgstr ""

905 msgid "Exiting because of an unresolved conflict."

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

907

907 -#: advice.c:281 builtin/merge.c:1369

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

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

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

911

@@ -1194,7 +1195,8 @@ msgstr "打补丁失败：%s:%ld"

1195 msgid "cannot checkout %s"

1196 msgstr "不能检出 %s"

1197

1197 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

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

1199 +#: setup.c:308

1200 #, c-format

1201 msgid "failed to read %s"

1202 msgstr "无法读取 %s"

@@ -1353,7 +1355,7 @@ msgstr "不能为新建文件 %s 创建后端存储"

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

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

1357

1356 -#: apply.c:4374 builtin/bisect--helper.c:524

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

1359 #, c-format

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

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

@@ -1389,7 +1391,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

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

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

1393

1392 -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228

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

1395 #, c-format

1396 msgid "cannot open %s"

1397 msgstr "不能打开 %s"

@@ -1443,7 +1445,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1447

1446 -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

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

1449 msgid "Unable to write new index file"

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

1451

@@ -1511,7 +1513,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并"

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

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

1515

1514 -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525

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

1517 msgid "paths are separated with NUL character"

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

1519

@@ -1521,7 +1523,7 @@ msgstr "确保至少匹配 <n> 行上下文"

1523

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

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

1524 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

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

1527 msgid "action"

1528 msgstr "动作"

1529

@@ -1549,9 +1551,9 @@ msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1551 msgid "allow overlapping hunks"

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

1553

1552 -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22

1553 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1554 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

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

1557 msgid "be verbose"

1558 msgstr "冗长输出"

1559

@@ -1638,14 +1640,14 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1640 msgid "cannot read %s"

1641 msgstr "不能读取 %s"

1642

1641 -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1642 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1643 -#: builtin/merge.c:1138

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

1646 #, c-format

1647 msgid "could not read '%s'"

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

1649

1648 -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

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

1651 #, c-format

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

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

@@ -1687,7 +1689,7 @@ msgstr "格式"

1689 msgid "archive format"

1690 msgstr "归档格式"

1691

1690 -#: archive.c:556 builtin/log.c:1765

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

1693 msgid "prefix"

1694 msgstr "前缀"

1695

@@ -1695,11 +1697,11 @@ msgstr "前缀"

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

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

1699

1698 -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1699 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

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

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

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

1701 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105

1702 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

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

1706 msgid "file"

1707 msgstr "文件"

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

1866 msgid "a %s revision is needed"

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

1868

1867 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

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

1870 #, c-format

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

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

1873

1872 -#: bisect.c:987 builtin/merge.c:152

1874 +#: bisect.c:987 builtin/merge.c:153

1875 #, c-format

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

1877 msgstr "不能读取文件 '%s'"

@@ -1887,7 +1889,7 @@ msgstr "%s 同时为 %s 和 %s\n"

1889 #, c-format

1890 msgid ""

1891 "No testable commit found.\n"

1890 -"Maybe you started with bad path parameters?\n"

1892 +"Maybe you started with bad path arguments?\n"

1893 msgstr ""

1894 "没有发现可测试的提交。\n"

1895 "可能您在运行时使用了错误的路径参数？\n"

@@ -1921,11 +1923,11 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

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

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

1925

1924 -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1925 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1926 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1927 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1928 -#: builtin/shortlog.c:267

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

1931 msgid "revision walk setup failed"

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

1933

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

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

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

2101

2100 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

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

2103 #: builtin/commit.c:814

2104 #, c-format

2105 msgid "could not open '%s'"

@@ -2141,295 +2143,308 @@ msgstr "不能生成 pack-objects 进程"

2143 msgid "pack-objects died"

2144 msgstr "pack-objects 终止"

2145

2144 -#: bundle.c:379

2145 -msgid "rev-list died"

2146 -msgstr "rev-list 终止"

2147 -

2148 -#: bundle.c:428

2146 +#: bundle.c:386

2147 #, c-format

2148 msgid "ref '%s' is excluded by the rev-list options"

2149 msgstr "引用 '%s' 被 rev-list 选项排除"

2150

2153 -#: bundle.c:498

2151 +#: bundle.c:490

2152 #, c-format

2153 msgid "unsupported bundle version %d"

2154 msgstr "不支持的归档包版本 %d"

2155

2158 -#: bundle.c:500

2156 +#: bundle.c:492

2157 #, c-format

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

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

2160

2163 -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

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

2162 #, c-format

2163 msgid "unrecognized argument: %s"

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

2165

2168 -#: bundle.c:530

2166 +#: bundle.c:539

2167 msgid "Refusing to create empty bundle."

2168 msgstr "不能创建空的归档包。"

2169

2172 -#: bundle.c:540

2170 +#: bundle.c:549

2171 #, c-format

2172 msgid "cannot create '%s'"

2173 msgstr "不能创建 '%s'"

2174

2177 -#: bundle.c:565

2175 +#: bundle.c:574

2176 msgid "index-pack died"

2177 msgstr "index-pack 终止"

2178

2179 +#: chunk-format.c:113

2180 +msgid "terminating chunk id appears earlier than expected"

2181 +msgstr "终止块 ID 比预期更早出现"

2182 +

2183 +#: chunk-format.c:122

2184 +#, c-format

2185 +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2186 +msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"

2187 +

2188 +#: chunk-format.c:129

2189 +#, c-format

2190 +msgid "duplicate chunk ID %<PRIx32> found"

2191 +msgstr "发现重复的块ID %<PRIx32>"

2192 +

2193 +#: chunk-format.c:143

2194 +#, c-format

2195 +msgid "final chunk has non-zero id %<PRIx32>"

2196 +msgstr "最终块有非零 ID %<PRIx32>"

2197 +

2198 #: color.c:329

2199 #, c-format

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

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

2202

2186 -#: commit-graph.c:188 midx.c:47

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

2204 msgid "invalid hash version"

2205 msgstr "无效的哈希版本"

2206

2190 -#: commit-graph.c:246

2207 +#: commit-graph.c:255

2208 msgid "commit-graph file is too small"

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

2210

2194 -#: commit-graph.c:311

2211 +#: commit-graph.c:348

2212 #, c-format

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

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

2215

2199 -#: commit-graph.c:318

2216 +#: commit-graph.c:355

2217 #, c-format

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

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

2220

2204 -#: commit-graph.c:325

2221 +#: commit-graph.c:362

2222 #, c-format

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

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

2225

2209 -#: commit-graph.c:342

2226 +#: commit-graph.c:379

2227 #, c-format

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

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

2230

2214 -#: commit-graph.c:361

2215 -#, c-format

2216 -msgid "commit-graph improper chunk offset %08x%08x"

2217 -msgstr "提交图形不正确的块偏移 %08x%08x"

2218 -

2219 -#: commit-graph.c:433

2220 -#, c-format

2221 -msgid "commit-graph chunk id %08x appears multiple times"

2222 -msgstr "提交图形块 id %08x 出现了多次"

2223 -

2224 -#: commit-graph.c:499

2231 +#: commit-graph.c:472

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

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

2234

2228 -#: commit-graph.c:509

2235 +#: commit-graph.c:482

2236 msgid "commit-graph chain does not match"

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

2238

2232 -#: commit-graph.c:557

2239 +#: commit-graph.c:530

2240 #, c-format

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

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

2243

2237 -#: commit-graph.c:581

2244 +#: commit-graph.c:554

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

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

2247

2241 -#: commit-graph.c:721 commit-graph.c:785

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

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

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

2251

2245 -#: commit-graph.c:742

2252 +#: commit-graph.c:756

2253 #, c-format

2254 msgid "could not find commit %s"

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

2256

2250 -#: commit-graph.c:1036 builtin/am.c:1292

2257 +#: commit-graph.c:789

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

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

2260 +

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

2262 #, c-format

2263 msgid "unable to parse commit %s"

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

2265

2255 -#: commit-graph.c:1252 builtin/pack-objects.c:2864

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

2267 #, c-format

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

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

2270

2260 -#: commit-graph.c:1283

2271 +#: commit-graph.c:1358

2272 msgid "Loading known commits in commit graph"

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

2274

2264 -#: commit-graph.c:1300

2275 +#: commit-graph.c:1375

2276 msgid "Expanding reachable commits in commit graph"

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

2278

2268 -#: commit-graph.c:1320

2279 +#: commit-graph.c:1395

2280 msgid "Clearing commit marks in commit graph"

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

2282

2272 -#: commit-graph.c:1339

2283 +#: commit-graph.c:1414

2284 +msgid "Computing commit graph topological levels"

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

2286 +

2287 +#: commit-graph.c:1467

2288 msgid "Computing commit graph generation numbers"

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

2290

2276 -#: commit-graph.c:1406

2291 +#: commit-graph.c:1548

2292 msgid "Computing commit changed paths Bloom filters"

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

2294

2280 -#: commit-graph.c:1483

2295 +#: commit-graph.c:1625

2296 msgid "Collecting referenced commits"

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

2298

2284 -#: commit-graph.c:1508

2299 +#: commit-graph.c:1650

2300 #, c-format

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

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

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

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

2305

2291 -#: commit-graph.c:1521

2306 +#: commit-graph.c:1663

2307 #, c-format

2308 msgid "error adding pack %s"

2309 msgstr "添加包 %s 出错"

2310

2296 -#: commit-graph.c:1525

2311 +#: commit-graph.c:1667

2312 #, c-format

2313 msgid "error opening index for %s"

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

2315

2301 -#: commit-graph.c:1562

2316 +#: commit-graph.c:1704

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

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

2319

2305 -#: commit-graph.c:1580

2320 +#: commit-graph.c:1722

2321 msgid "Finding extra edges in commit graph"

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

2323

2309 -#: commit-graph.c:1628

2324 +#: commit-graph.c:1771

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

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

2327

2313 -#: commit-graph.c:1670 midx.c:819

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

2329 #, c-format

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

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

2332

2318 -#: commit-graph.c:1683

2333 +#: commit-graph.c:1815

2334 msgid "unable to create temporary graph layer"

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

2336

2322 -#: commit-graph.c:1688

2337 +#: commit-graph.c:1820

2338 #, c-format

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

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

2341

2327 -#: commit-graph.c:1758

2342 +#: commit-graph.c:1879

2343 #, c-format

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

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

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

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

2348

2334 -#: commit-graph.c:1803

2349 +#: commit-graph.c:1915

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

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

2352

2338 -#: commit-graph.c:1819

2353 +#: commit-graph.c:1931

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

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

2356

2342 -#: commit-graph.c:1839

2357 +#: commit-graph.c:1951

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

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

2360

2346 -#: commit-graph.c:1965

2361 +#: commit-graph.c:2084

2362 msgid "Scanning merged commits"

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

2364

2350 -#: commit-graph.c:2009

2365 +#: commit-graph.c:2128

2366 msgid "Merging commit-graph"

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

2368

2354 -#: commit-graph.c:2115

2369 +#: commit-graph.c:2235

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

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

2372

2358 -#: commit-graph.c:2214

2373 +#: commit-graph.c:2342

2374 msgid "too many commits to write graph"

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

2376

2362 -#: commit-graph.c:2307

2377 +#: commit-graph.c:2440

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

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

2380

2366 -#: commit-graph.c:2317

2381 +#: commit-graph.c:2450

2382 #, c-format

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

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

2385

2371 -#: commit-graph.c:2327 commit-graph.c:2342

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

2387 #, c-format

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

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

2390

2376 -#: commit-graph.c:2334

2391 +#: commit-graph.c:2467

2392 #, c-format

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

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

2395

2381 -#: commit-graph.c:2352

2396 +#: commit-graph.c:2485

2397 msgid "Verifying commits in commit graph"

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

2399

2385 -#: commit-graph.c:2367

2400 +#: commit-graph.c:2500

2401 #, c-format

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

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

2404

2390 -#: commit-graph.c:2374

2405 +#: commit-graph.c:2507

2406 #, c-format

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

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

2409

2395 -#: commit-graph.c:2384

2410 +#: commit-graph.c:2517

2411 #, c-format

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

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

2414

2400 -#: commit-graph.c:2393

2415 +#: commit-graph.c:2526

2416 #, c-format

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

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

2419

2405 -#: commit-graph.c:2407

2420 +#: commit-graph.c:2540

2421 #, c-format

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

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

2424

2410 -#: commit-graph.c:2412

2425 +#: commit-graph.c:2545

2426 #, c-format

2427 msgid ""

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

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

2430

2416 -#: commit-graph.c:2416

2431 +#: commit-graph.c:2549

2432 #, c-format

2433 msgid ""

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

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

2436

2422 -#: commit-graph.c:2432

2437 +#: commit-graph.c:2566

2438 #, c-format

2424 -msgid "commit-graph generation for commit %s is %u != %u"

2425 -msgstr "提交图形中的提交 %s 的世代号是 %u != %u"

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

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

2441

2427 -#: commit-graph.c:2438

2442 +#: commit-graph.c:2572

2443 #, c-format

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

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

2446

2432 -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

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

2449 #, c-format

2450 msgid "could not parse %s"

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

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

2476 "可关闭本消息"

2477

2463 -#: commit.c:1172

2478 +#: commit.c:1223

2479 #, c-format

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

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

2482

2468 -#: commit.c:1176

2483 +#: commit.c:1227

2484 #, c-format

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

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

2487

2473 -#: commit.c:1179

2488 +#: commit.c:1230

2489 #, c-format

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

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

2492

2478 -#: commit.c:1182

2493 +#: commit.c:1233

2494 #, c-format

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

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

2497

2483 -#: commit.c:1436

2498 +#: commit.c:1487

2499 msgid ""

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

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

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

2509 msgid "memory exhausted"

2510 msgstr "内存耗尽"

2511

2497 -#: config.c:125

2512 +#: config.c:126

2513 #, c-format

2514 msgid ""

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

@@ -2509,289 +2524,333 @@ msgstr ""

2524 "\t%2$s\n"

2525 "这可能是因为循环包含。"

2526

2512 -#: config.c:141

2527 +#: config.c:142

2528 #, c-format

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

2530 msgstr "无法扩展包含路径 '%s'"

2531

2517 -#: config.c:152

2532 +#: config.c:153

2533 msgid "relative config includes must come from files"

2534 msgstr "相对路径的配置文件引用必须来自于文件"

2535

2521 -#: config.c:198

2536 +#: config.c:199

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

2538 msgstr "相对路径的配置文件条件引用必须来自于文件"

2539

2525 -#: config.c:378

2540 +#: config.c:396

2541 +#, c-format

2542 +msgid "invalid config format: %s"

2543 +msgstr "无效的配置格式：%s"

2544 +

2545 +#: config.c:400

2546 +#, c-format

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

2548 +msgstr "配置 '%.*s' 缺少环境变量名称"

2549 +

2550 +#: config.c:405

2551 +#, c-format

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

2553 +msgstr "缺少环境变量 '%s' 于配置 '%.*s' "

2554 +

2555 +#: config.c:442

2556 #, c-format

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

2558 msgstr "键名没有包含一个小节名称：%s"

2559

2530 -#: config.c:384

2560 +#: config.c:448

2561 #, c-format

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

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

2564

2535 -#: config.c:408 sequencer.c:2580

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

2566 #, c-format

2567 msgid "invalid key: %s"

2568 msgstr "无效键名：%s"

2569

2540 -#: config.c:414

2570 +#: config.c:478

2571 #, c-format

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

2573 msgstr "无效键名（有换行符）：%s"

2574

2545 -#: config.c:450 config.c:462

2575 +#: config.c:511

2576 +msgid "empty config key"

2577 +msgstr "空的配置键名"

2578 +

2579 +#: config.c:529 config.c:541

2580 #, c-format

2581 msgid "bogus config parameter: %s"

2582 msgstr "伪配置参数：%s"

2583

2550 -#: config.c:497

2584 +#: config.c:555 config.c:572 config.c:579 config.c:588

2585 #, c-format

2586 msgid "bogus format in %s"

2587 msgstr "%s 中格式错误"

2588

2555 -#: config.c:836

2589 +#: config.c:622

2590 +#, c-format

2591 +msgid "bogus count in %s"

2592 +msgstr "%s 中错误计数"

2593 +

2594 +#: config.c:626

2595 +#, c-format

2596 +msgid "too many entries in %s"

2597 +msgstr "%s 中太多的条目"

2598 +

2599 +#: config.c:636

2600 +#, c-format

2601 +msgid "missing config key %s"

2602 +msgstr "缺失配置键名 %s"

2603 +

2604 +#: config.c:644

2605 +#, c-format

2606 +msgid "missing config value %s"

2607 +msgstr "缺失配置取值 %s"

2608 +

2609 +#: config.c:995

2610 #, c-format

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

2612 msgstr "数据对象 %2$s 中错误的配置行 %1$d"

2613

2560 -#: config.c:840

2614 +#: config.c:999

2615 #, c-format

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

2617 msgstr "文件 %2$s 中错误的配置行 %1$d"

2618

2565 -#: config.c:844

2619 +#: config.c:1003

2620 #, c-format

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

2622 msgstr "标准输入中错误的配置行 %d"

2623

2570 -#: config.c:848

2624 +#: config.c:1007

2625 #, c-format

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

2627 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

2628

2575 -#: config.c:852

2629 +#: config.c:1011

2630 #, c-format

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

2632 msgstr "命令行 %2$s 中错误的配置行 %1$d"

2633

2580 -#: config.c:856

2634 +#: config.c:1015

2635 #, c-format

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

2637 msgstr "在 %2$s 中错误的配置行 %1$d"

2638

2585 -#: config.c:993

2639 +#: config.c:1152

2640 msgid "out of range"

2641 msgstr "超出范围"

2642

2589 -#: config.c:993

2643 +#: config.c:1152

2644 msgid "invalid unit"

2645 msgstr "无效的单位"

2646

2593 -#: config.c:994

2647 +#: config.c:1153

2648 #, c-format

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

2650 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

2651

2598 -#: config.c:1013

2652 +#: config.c:1163

2653 #, c-format

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

2655 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2656

2603 -#: config.c:1016

2657 +#: config.c:1166

2658 #, c-format

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

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

2661

2608 -#: config.c:1019

2662 +#: config.c:1169

2663 #, c-format

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

2665 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

2666

2613 -#: config.c:1022

2667 +#: config.c:1172

2668 #, c-format

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

2670 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2671

2618 -#: config.c:1025

2672 +#: config.c:1175

2673 #, c-format

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

2675 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

2676

2623 -#: config.c:1028

2677 +#: config.c:1178

2678 #, c-format

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

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

2681

2628 -#: config.c:1123

2682 +#: config.c:1194

2683 +#, c-format

2684 +msgid "bad boolean config value '%s' for '%s'"

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

2686 +

2687 +#: config.c:1289

2688 #, c-format

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

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

2691

2633 -#: config.c:1132

2692 +#: config.c:1298

2693 #, c-format

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

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

2696

2638 -#: config.c:1223

2697 +#: config.c:1391

2698 #, c-format

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

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

2701

2643 -#: config.c:1237 config.c:1248

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

2703 #, c-format

2704 msgid "bad zlib compression level %d"

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

2706

2648 -#: config.c:1340

2707 +#: config.c:1508

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

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

2710

2652 -#: config.c:1373

2711 +#: config.c:1541

2712 #, c-format

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

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

2715

2657 -#: config.c:1445

2716 +#: config.c:1613

2717 #, c-format

2718 msgid "malformed value for %s"

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

2720

2662 -#: config.c:1471

2721 +#: config.c:1639

2722 #, c-format

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

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

2725

2667 -#: config.c:1472

2726 +#: config.c:1640

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

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

2729

2671 -#: config.c:1533 builtin/pack-objects.c:3649

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

2731 #, c-format

2732 msgid "bad pack compression level %d"

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

2734

2676 -#: config.c:1655

2735 +#: config.c:1823

2736 #, c-format

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

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

2739

2681 -#: config.c:1658

2740 +#: config.c:1826

2741 #, c-format

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

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

2744

2686 -#: config.c:1675

2745 +#: config.c:1843

2746 #, c-format

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

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

2749

2691 -#: config.c:1705

2750 +#: config.c:1873

2751 #, c-format

2752 msgid "failed to parse %s"

2753 msgstr "解析 %s 失败"

2754

2696 -#: config.c:1759

2755 +#: config.c:1927

2756 msgid "unable to parse command-line config"

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

2758

2700 -#: config.c:2122

2759 +#: config.c:2290

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

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

2762

2704 -#: config.c:2296

2763 +#: config.c:2464

2764 #, c-format

2765 msgid "Invalid %s: '%s'"

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

2767

2709 -#: config.c:2341

2768 +#: config.c:2509

2769 #, c-format

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

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

2772

2714 -#: config.c:2387

2773 +#: config.c:2555

2774 #, c-format

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

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

2777

2719 -#: config.c:2389

2778 +#: config.c:2557

2779 #, c-format

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

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

2782

2724 -#: config.c:2473

2783 +#: config.c:2641

2784 #, c-format

2785 msgid "invalid section name '%s'"

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

2787

2729 -#: config.c:2505

2788 +#: config.c:2673

2789 #, c-format

2790 msgid "%s has multiple values"

2791 msgstr "%s 有多个取值"

2792

2734 -#: config.c:2534

2793 +#: config.c:2702

2794 #, c-format

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

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

2797

2739 -#: config.c:2786 config.c:3112

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

2799 #, c-format

2800 msgid "could not lock config file %s"

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

2802

2744 -#: config.c:2797

2803 +#: config.c:2965

2804 #, c-format

2805 msgid "opening %s"

2806 msgstr "打开 %s"

2807

2749 -#: config.c:2834 builtin/config.c:361

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

2809 #, c-format

2810 msgid "invalid pattern: %s"

2811 msgstr "无效模式：%s"

2812

2754 -#: config.c:2859

2813 +#: config.c:3027

2814 #, c-format

2815 msgid "invalid config file %s"

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

2817

2759 -#: config.c:2872 config.c:3125

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

2819 #, c-format

2820 msgid "fstat on %s failed"

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

2822

2764 -#: config.c:2883

2823 +#: config.c:3051

2824 #, c-format

2825 msgid "unable to mmap '%s'"

2826 msgstr "不能 mmap '%s'"

2827

2769 -#: config.c:2892 config.c:3130

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

2829 #, c-format

2830 msgid "chmod on %s failed"

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

2832

2774 -#: config.c:2977 config.c:3227

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

2834 #, c-format

2835 msgid "could not write config file %s"

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

2837

2779 -#: config.c:3011

2838 +#: config.c:3179

2839 #, c-format

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

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

2842

2784 -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

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

2844 #, c-format

2845 msgid "could not unset '%s'"

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

2847

2789 -#: config.c:3103

2848 +#: config.c:3271

2849 #, c-format

2850 msgid "invalid section name: %s"

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

2852

2794 -#: config.c:3270

2853 +#: config.c:3438

2854 #, c-format

2855 msgid "missing value for '%s'"

2856 msgstr "%s 的取值缺失"

@@ -2852,45 +2911,45 @@ msgstr "无效数据包"

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

2912 msgstr "协议错误：意外的 '%s'"

2913

2855 -#: connect.c:473

2914 +#: connect.c:497

2915 #, c-format

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

2917 msgstr "服务器给出未知的对象格式 '%s'"

2918

2860 -#: connect.c:500

2919 +#: connect.c:526

2920 #, c-format

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

2922 msgstr "无效的 ls-refs 响应：%s"

2923

2865 -#: connect.c:504

2924 +#: connect.c:530

2925 msgid "expected flush after ref listing"

2926 msgstr "在引用列表之后应该有一个 flush 包"

2927

2869 -#: connect.c:507

2928 +#: connect.c:533

2929 msgid "expected response end packet after ref listing"

2930 msgstr "在引用列表之后应该有响应结束包"

2931

2873 -#: connect.c:640

2932 +#: connect.c:666

2933 #, c-format

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

2935 msgstr "不支持 '%s' 协议"

2936

2878 -#: connect.c:691

2937 +#: connect.c:717

2938 msgid "unable to set SO_KEEPALIVE on socket"

2939 msgstr "无法为 socket 设置 SO_KEEPALIVE"

2940

2882 -#: connect.c:731 connect.c:794

2941 +#: connect.c:757 connect.c:820

2942 #, c-format

2943 msgid "Looking up %s ... "

2944 msgstr "查找 %s ..."

2945

2887 -#: connect.c:735

2946 +#: connect.c:761

2947 #, c-format

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

2949 msgstr "无法查找 %s（端口 %s）（%s）"

2950

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

2893 -#: connect.c:739 connect.c:810

2952 +#: connect.c:765 connect.c:836

2953 #, c-format

2954 msgid ""

2955 "done.\n"

@@ -2899,7 +2958,7 @@ msgstr ""

2958 "完成。\n"

2959 "连接到 %s（端口 %s）... "

2960

2902 -#: connect.c:761 connect.c:838

2961 +#: connect.c:787 connect.c:864

2962 #, c-format

2963 msgid ""

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

@@ -2909,61 +2968,65 @@ msgstr ""

2968 "%s"

2969

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

2912 -#: connect.c:767 connect.c:844

2971 +#: connect.c:793 connect.c:870

2972 msgid "done."

2973 msgstr "完成。"

2974

2916 -#: connect.c:798

2975 +#: connect.c:824

2976 #, c-format

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

2978 msgstr "无法查找 %s（%s）"

2979

2921 -#: connect.c:804

2980 +#: connect.c:830

2981 #, c-format

2982 msgid "unknown port %s"

2983 msgstr "未知端口 %s"

2984

2926 -#: connect.c:941 connect.c:1271

2985 +#: connect.c:967 connect.c:1299

2986 #, c-format

2987 msgid "strange hostname '%s' blocked"

2988 msgstr "已阻止奇怪的主机名 '%s'"

2989

2931 -#: connect.c:943

2990 +#: connect.c:969

2991 #, c-format

2992 msgid "strange port '%s' blocked"

2993 msgstr "已阻止奇怪的端口号 '%s'"

2994

2936 -#: connect.c:953

2995 +#: connect.c:979

2996 #, c-format

2997 msgid "cannot start proxy %s"

2998 msgstr "不能启动代理 %s"

2999

2941 -#: connect.c:1024

3000 +#: connect.c:1050

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

3002 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"

3003

2945 -#: connect.c:1219

3004 +#: connect.c:1190

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

3006 +msgstr "在 git:// 主机和仓库路径中禁止使用换行符"

3007 +

3008 +#: connect.c:1247

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

3010 msgstr "ssh 变体 'simple' 不支持 -4"

3011

2949 -#: connect.c:1231

3012 +#: connect.c:1259

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

3014 msgstr "ssh 变体 'simple' 不支持 -6"

3015

2953 -#: connect.c:1248

3016 +#: connect.c:1276

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

3018 msgstr "ssh 变体 'simple' 不支持设置端口"

3019

2957 -#: connect.c:1360

3020 +#: connect.c:1388

3021 #, c-format

3022 msgid "strange pathname '%s' blocked"

3023 msgstr "已阻止奇怪的路径名 '%s'"

3024

2962 -#: connect.c:1408

3025 +#: connect.c:1436

3026 msgid "unable to fork"

3027 msgstr "无法 fork"

3028

2966 -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

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

3030 msgid "Checking connectivity"

3031 msgstr "正在检查连通性"

3032

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

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

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

3288

3289 +#: diff-merges.c:70

3290 +#, c-format

3291 +msgid "unknown value for --diff-merges: %s"

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

3293 +

3294 #: diff-lib.c:534

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

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

@@ -3307,30 +3375,30 @@ msgstr ""

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

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

3377

3310 -#: diff.c:4625

3378 +#: diff.c:4628

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

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

3381

3314 -#: diff.c:4628

3382 +#: diff.c:4631

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

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

3385

3318 -#: diff.c:4707

3386 +#: diff.c:4710

3387 msgid "--follow requires exactly one pathspec"

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

3389

3322 -#: diff.c:4755

3390 +#: diff.c:4758

3391 #, c-format

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

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

3394

3327 -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303

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

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

3397 #, c-format

3398 msgid "%s expects a numerical value"

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

3400

3333 -#: diff.c:4792

3401 +#: diff.c:4795

3402 #, c-format

3403 msgid ""

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

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

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

3408 "%s"

3409

3342 -#: diff.c:4877

3410 +#: diff.c:4880

3411 #, c-format

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

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

3414

3347 -#: diff.c:4901

3415 +#: diff.c:4904

3416 #, c-format

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

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

3419

3352 -#: diff.c:4915

3420 +#: diff.c:4918

3421 #, c-format

3422 msgid "unable to resolve '%s'"

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

3424

3357 -#: diff.c:4965 diff.c:4971

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

3426 #, c-format

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

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

3429

3362 -#: diff.c:4983

3430 +#: diff.c:4986

3431 #, c-format

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

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

3434

3367 -#: diff.c:5004

3435 +#: diff.c:5007

3436 #, c-format

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

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

3439

3372 -#: diff.c:5023

3440 +#: diff.c:5026

3441 #, c-format

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

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

3444

3377 -#: diff.c:5063

3445 +#: diff.c:5066

3446 msgid ""

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

3448 "\"histogram\""

3449 msgstr ""

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

3451

3384 -#: diff.c:5099 diff.c:5119

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

3453 #, c-format

3454 msgid "invalid argument to %s"

3455 msgstr "%s 的参数无效"

3456

3389 -#: diff.c:5223

3457 +#: diff.c:5226

3458 #, c-format

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

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

3461

3394 -#: diff.c:5272

3462 +#: diff.c:5275

3463 #, c-format

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

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

3466

3399 -#: diff.c:5328

3467 +#: diff.c:5331

3468 #, c-format

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

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

3471

3404 -#: diff.c:5351

3472 +#: diff.c:5367

3473 msgid "Diff output format options"

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

3475

3408 -#: diff.c:5353 diff.c:5359

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

3477 msgid "generate patch"

3478 msgstr "生成补丁"

3479

3412 -#: diff.c:5356 builtin/log.c:178

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

3481 msgid "suppress diff output"

3482 msgstr "不显示差异输出"

3483

3416 -#: diff.c:5361 diff.c:5475 diff.c:5482

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

3485 msgid "<n>"

3486 msgstr "<n>"

3487

3420 -#: diff.c:5362 diff.c:5365

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

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

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

3491

3424 -#: diff.c:5367

3492 +#: diff.c:5383

3493 msgid "generate the diff in raw format"

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

3495

3428 -#: diff.c:5370

3496 +#: diff.c:5386

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

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

3499

3432 -#: diff.c:5374

3500 +#: diff.c:5390

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

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

3503

3436 -#: diff.c:5378

3504 +#: diff.c:5394

3505 msgid "machine friendly --stat"

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

3507

3440 -#: diff.c:5381

3508 +#: diff.c:5397

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

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

3511

3444 -#: diff.c:5383 diff.c:5391

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

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

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

3515

3448 -#: diff.c:5384

3516 +#: diff.c:5400

3517 msgid ""

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

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

3520

3453 -#: diff.c:5388

3521 +#: diff.c:5404

3522 msgid "synonym for --dirstat=cumulative"

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

3524

3457 -#: diff.c:5392

3525 +#: diff.c:5408

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

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

3528

3461 -#: diff.c:5396

3529 +#: diff.c:5412

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

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

3532

3465 -#: diff.c:5399

3533 +#: diff.c:5415

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

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

3536

3469 -#: diff.c:5402

3537 +#: diff.c:5418

3538 msgid "show only names of changed files"

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

3540

3473 -#: diff.c:5405

3541 +#: diff.c:5421

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

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

3544

3477 -#: diff.c:5407

3545 +#: diff.c:5423

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

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

3548

3481 -#: diff.c:5408

3549 +#: diff.c:5424

3550 msgid "generate diffstat"

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

3552

3485 -#: diff.c:5410 diff.c:5413 diff.c:5416

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

3554 msgid "<width>"

3555 msgstr "<宽度>"

3556

3489 -#: diff.c:5411

3557 +#: diff.c:5427

3558 msgid "generate diffstat with a given width"

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

3560

3493 -#: diff.c:5414

3561 +#: diff.c:5430

3562 msgid "generate diffstat with a given name width"

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

3564

3497 -#: diff.c:5417

3565 +#: diff.c:5433

3566 msgid "generate diffstat with a given graph width"

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

3568

3501 -#: diff.c:5419

3569 +#: diff.c:5435

3570 msgid "<count>"

3571 msgstr "<次数>"

3572

3505 -#: diff.c:5420

3573 +#: diff.c:5436

3574 msgid "generate diffstat with limited lines"

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

3576

3509 -#: diff.c:5423

3577 +#: diff.c:5439

3578 msgid "generate compact summary in diffstat"

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

3580

3513 -#: diff.c:5426

3581 +#: diff.c:5442

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

3583 msgstr "输出一个可以应用的二进制差异"

3584

3517 -#: diff.c:5429

3585 +#: diff.c:5445

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

3587 msgstr "在 \"index\" 行显示完整的前后对象名称"

3588

3521 -#: diff.c:5431

3589 +#: diff.c:5447

3590 msgid "show colored diff"

3591 msgstr "显示带颜色的差异"

3592

3525 -#: diff.c:5432

3593 +#: diff.c:5448

3594 msgid "<kind>"

3595 msgstr "<类型>"

3596

3529 -#: diff.c:5433

3597 +#: diff.c:5449

3598 msgid ""

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

3600 "diff"

3601 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3602

3535 -#: diff.c:5436

3603 +#: diff.c:5452

3604 msgid ""

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

3606 "--numstat"

@@ -3540,299 +3608,311 @@ msgstr ""

3608 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3609 "符"

3610

3543 -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554

3611 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570

3612 msgid "<prefix>"

3613 msgstr "<前缀>"

3614

3547 -#: diff.c:5440

3615 +#: diff.c:5456

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

3617 msgstr "显示给定的源前缀取代 \"a/\""

3618

3551 -#: diff.c:5443

3619 +#: diff.c:5459

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

3621 msgstr "显示给定的目标前缀取代 \"b/\""

3622

3555 -#: diff.c:5446

3623 +#: diff.c:5462

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

3625 msgstr "输出的每一行附加前缀"

3626

3559 -#: diff.c:5449

3627 +#: diff.c:5465

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

3629 msgstr "不显示任何源和目标前缀"

3630

3563 -#: diff.c:5452

3631 +#: diff.c:5468

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

3633 msgstr "显示指定行数的差异块间的上下文"

3634

3567 -#: diff.c:5456 diff.c:5461 diff.c:5466

3635 +#: diff.c:5472 diff.c:5477 diff.c:5482

3636 msgid "<char>"

3637 msgstr "<字符>"

3638

3571 -#: diff.c:5457

3639 +#: diff.c:5473

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

3641 msgstr "指定一个字符取代 '+' 来表示新的一行"

3642

3575 -#: diff.c:5462

3643 +#: diff.c:5478

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

3645 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3646

3579 -#: diff.c:5467

3647 +#: diff.c:5483

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

3649 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3650

3583 -#: diff.c:5470

3651 +#: diff.c:5486

3652 msgid "Diff rename options"

3653 msgstr "差异重命名选项"

3654

3587 -#: diff.c:5471

3655 +#: diff.c:5487

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

3657 msgstr "<n>[/<m>]"

3658

3591 -#: diff.c:5472

3659 +#: diff.c:5488

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

3661 msgstr "将完全重写的变更打破为成对的删除和创建"

3662

3595 -#: diff.c:5476

3663 +#: diff.c:5492

3664 msgid "detect renames"

3665 msgstr "检测重命名"

3666

3599 -#: diff.c:5480

3667 +#: diff.c:5496

3668 msgid "omit the preimage for deletes"

3669 msgstr "省略删除操作的差异输出"

3670

3603 -#: diff.c:5483

3671 +#: diff.c:5499

3672 msgid "detect copies"

3673 msgstr "检测拷贝"

3674

3607 -#: diff.c:5487

3675 +#: diff.c:5503

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

3677 msgstr "使用未修改的文件做为发现拷贝的源"

3678

3611 -#: diff.c:5489

3679 +#: diff.c:5505

3680 msgid "disable rename detection"

3681 msgstr "禁用重命名探测"

3682

3615 -#: diff.c:5492

3683 +#: diff.c:5508

3684 msgid "use empty blobs as rename source"

3685 msgstr "使用空的数据对象做为重命名的源"

3686

3619 -#: diff.c:5494

3687 +#: diff.c:5510

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

3689 msgstr "继续列出文件重命名以外的历史记录"

3690

3623 -#: diff.c:5497

3691 +#: diff.c:5513

3692 msgid ""

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

3694 "given limit"

3695 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3696

3629 -#: diff.c:5499

3697 +#: diff.c:5515

3698 msgid "Diff algorithm options"

3699 msgstr "差异算法选项"

3700

3633 -#: diff.c:5501

3701 +#: diff.c:5517

3702 msgid "produce the smallest possible diff"

3703 msgstr "生成尽可能小的差异"

3704

3637 -#: diff.c:5504

3705 +#: diff.c:5520

3706 msgid "ignore whitespace when comparing lines"

3707 msgstr "行比较时忽略空白字符"

3708

3641 -#: diff.c:5507

3709 +#: diff.c:5523

3710 msgid "ignore changes in amount of whitespace"

3711 msgstr "忽略空白字符的变更"

3712

3645 -#: diff.c:5510

3713 +#: diff.c:5526

3714 msgid "ignore changes in whitespace at EOL"

3715 msgstr "忽略行尾的空白字符变更"

3716

3649 -#: diff.c:5513

3717 +#: diff.c:5529

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

3719 msgstr "忽略行尾的回车符（CR）"

3720

3653 -#: diff.c:5516

3721 +#: diff.c:5532

3722 msgid "ignore changes whose lines are all blank"

3723 msgstr "忽略整行都是空白的变更"

3724

3657 -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588

3725 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604

3726 msgid "<regex>"

3727 msgstr "<正则>"

3728

3661 -#: diff.c:5519

3729 +#: diff.c:5535

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

3731 msgstr "忽略所有行都和正则表达式匹配的变更"

3732

3665 -#: diff.c:5522

3733 +#: diff.c:5538

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

3735 msgstr "启发式转换差异边界以便阅读"

3736

3669 -#: diff.c:5525

3737 +#: diff.c:5541

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

3739 msgstr "使用 \"patience diff\" 算法生成差异"

3740

3673 -#: diff.c:5529

3741 +#: diff.c:5545

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

3743 msgstr "使用 \"histogram diff\" 算法生成差异"

3744

3677 -#: diff.c:5531

3745 +#: diff.c:5547

3746 msgid "<algorithm>"

3747 msgstr "<算法>"

3748

3681 -#: diff.c:5532

3749 +#: diff.c:5548

3750 msgid "choose a diff algorithm"

3751 msgstr "选择一个差异算法"

3752

3685 -#: diff.c:5534

3753 +#: diff.c:5550

3754 msgid "<text>"

3755 msgstr "<文本>"

3756

3689 -#: diff.c:5535

3757 +#: diff.c:5551

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

3759 msgstr "使用 \"anchored diff\" 算法生成差异"

3760

3693 -#: diff.c:5537 diff.c:5546 diff.c:5549

3761 +#: diff.c:5553 diff.c:5562 diff.c:5565

3762 msgid "<mode>"

3763 msgstr "<模式>"

3764

3697 -#: diff.c:5538

3765 +#: diff.c:5554

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

3767 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3768

3701 -#: diff.c:5541

3769 +#: diff.c:5557

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

3771 msgstr "使用 <正则表达式> 确定何为一个词"

3772

3705 -#: diff.c:5544

3773 +#: diff.c:5560

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

3775 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3776

3709 -#: diff.c:5547

3777 +#: diff.c:5563

3778 msgid "moved lines of code are colored differently"

3779 msgstr "移动的代码行用不同方式着色"

3780

3713 -#: diff.c:5550

3781 +#: diff.c:5566

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

3783 msgstr "在 --color-moved 下如何忽略空白字符"

3784

3717 -#: diff.c:5553

3785 +#: diff.c:5569

3786 msgid "Other diff options"

3787 msgstr "其它差异选项"

3788

3721 -#: diff.c:5555

3789 +#: diff.c:5571

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

3791 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3792

3725 -#: diff.c:5559

3793 +#: diff.c:5575

3794 msgid "treat all files as text"

3795 msgstr "把所有文件当做文本处理"

3796

3729 -#: diff.c:5561

3797 +#: diff.c:5577

3798 msgid "swap two inputs, reverse the diff"

3799 msgstr "交换两个输入，反转差异"

3800

3733 -#: diff.c:5563

3801 +#: diff.c:5579

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

3803 msgstr "有差异时退出码为 1，否则为 0"

3804

3737 -#: diff.c:5565

3805 +#: diff.c:5581

3806 msgid "disable all output of the program"

3807 msgstr "禁用本程序的所有输出"

3808

3741 -#: diff.c:5567

3809 +#: diff.c:5583

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

3811 msgstr "允许执行一个外置的差异助手"

3812

3745 -#: diff.c:5569

3813 +#: diff.c:5585

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

3815 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3816

3749 -#: diff.c:5571

3817 +#: diff.c:5587

3818 msgid "<when>"

3819 msgstr "<何时>"

3820

3753 -#: diff.c:5572

3821 +#: diff.c:5588

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

3823 msgstr "在生成差异时，忽略子模组的更改"

3824

3757 -#: diff.c:5575

3825 +#: diff.c:5591

3826 msgid "<format>"

3827 msgstr "<格式>"

3828

3761 -#: diff.c:5576

3829 +#: diff.c:5592

3830 msgid "specify how differences in submodules are shown"

3831 msgstr "指定子模组的差异如何显示"

3832

3765 -#: diff.c:5580

3833 +#: diff.c:5596

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

3835 msgstr "隐藏索引中 'git add -N' 条目"

3836

3769 -#: diff.c:5583

3837 +#: diff.c:5599

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

3839 msgstr "将索引中 'git add -N' 条目当做真实的"

3840

3773 -#: diff.c:5585

3841 +#: diff.c:5601

3842 msgid "<string>"

3843 msgstr "<字符串>"

3844

3777 -#: diff.c:5586

3845 +#: diff.c:5602

3846 msgid ""

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

3848 "string"

3849 msgstr "查找改变了指定字符串出现次数的差异"

3850

3783 -#: diff.c:5589

3851 +#: diff.c:5605

3852 msgid ""

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

3854 "regex"

3855 msgstr "查找改变指定正则匹配出现次数的差异"

3856

3789 -#: diff.c:5592

3857 +#: diff.c:5608

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

3859 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3860

3793 -#: diff.c:5595

3861 +#: diff.c:5611

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

3863 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3864

3797 -#: diff.c:5598

3865 +#: diff.c:5614

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

3867 msgstr "控制输出中的文件显示顺序"

3868

3801 -#: diff.c:5599

3869 +#: diff.c:5615 diff.c:5618

3870 +msgid "<path>"

3871 +msgstr "<路径>"

3872 +

3873 +#: diff.c:5616

3874 +msgid "show the change in the specified path first"

3875 +msgstr "先显示指定路径的变更"

3876 +

3877 +#: diff.c:5619

3878 +msgid "skip the output to the specified path"

3879 +msgstr "跳过指定路径的输出"

3880 +

3881 +#: diff.c:5621

3882 msgid "<object-id>"

3883 msgstr "<对象 ID>"

3884

3805 -#: diff.c:5600

3885 +#: diff.c:5622

3886 msgid ""

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

3888 "object"

3889 msgstr "查找改变指定对象出现次数的差异"

3890

3811 -#: diff.c:5602

3891 +#: diff.c:5624

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

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

3894

3815 -#: diff.c:5603

3895 +#: diff.c:5625

3896 msgid "select files by diff type"

3897 msgstr "通过差异类型选择文件"

3898

3819 -#: diff.c:5605

3899 +#: diff.c:5627

3900 msgid "<file>"

3901 msgstr "<文件>"

3902

3823 -#: diff.c:5606

3903 +#: diff.c:5628

3904 msgid "Output to a specific file"

3905 msgstr "输出到一个指定的文件"

3906

3827 -#: diff.c:6263

3907 +#: diff.c:6285

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

3909 msgstr "因为文件太多，略过不严格的重命名检查。"

3910

3831 -#: diff.c:6266

3911 +#: diff.c:6288

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

3913 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

3914

3835 -#: diff.c:6269

3915 +#: diff.c:6291

3916 #, c-format

3917 msgid ""

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

@@ -3843,10 +3923,15 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令

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

3924 msgstr "读取排序文件 '%s' 失败"

3925

3846 -#: diffcore-rename.c:592

3926 +#: diffcore-rename.c:786

3927 msgid "Performing inexact rename detection"

3928 msgstr "正在进行非精确的重命名探测"

3929

3930 +#: diffcore-rotate.c:29

3931 +#, c-format

3932 +msgid "No such path '%s' in the diff"

3933 +msgstr "在差异中无此路径 '%s'"

3934 +

3935 #: dir.c:578

3936 #, c-format

3937 msgid "pathspec '%s' did not match any file(s) known to git"

@@ -3889,17 +3974,17 @@ msgstr "无法获得内核名称和信息"

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

3975 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

3976

3892 -#: dir.c:3520

3977 +#: dir.c:3534

3978 #, c-format

3979 msgid "index file corrupt in repo %s"

3980 msgstr "仓库 %s 中的索引文件损坏"

3981

3897 -#: dir.c:3565 dir.c:3570

3982 +#: dir.c:3579 dir.c:3584

3983 #, c-format

3984 msgid "could not create directories for %s"

3985 msgstr "不能为 %s 创建目录"

3986

3902 -#: dir.c:3599

3987 +#: dir.c:3613

3988 #, c-format

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

3990 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -3918,12 +4003,12 @@ msgstr "过滤内容"

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

4004 msgstr "不能对文件 '%s' 调用 stat"

4005

3921 -#: environment.c:150

4006 +#: environment.c:152

4007 #, c-format

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

4009 msgstr "错误的 git 名字空间路径 \"%s\""

4010

3926 -#: environment.c:337

4011 +#: environment.c:335

4012 #, c-format

4013 msgid "could not set GIT_DIR to '%s'"

4014 msgstr "不能设置 GIT_DIR 为 '%s'"

@@ -3958,32 +4043,32 @@ msgstr "无法写到远程"

4043 msgid "--stateless-rpc requires multi_ack_detailed"

4044 msgstr "--stateless-rpc 需要 multi_ack_detailed"

4045

3961 -#: fetch-pack.c:378 fetch-pack.c:1406

4046 +#: fetch-pack.c:378 fetch-pack.c:1457

4047 #, c-format

4048 msgid "invalid shallow line: %s"

4049 msgstr "无效的 shallow 信息：%s"

4050

3966 -#: fetch-pack.c:384 fetch-pack.c:1412

4051 +#: fetch-pack.c:384 fetch-pack.c:1463

4052 #, c-format

4053 msgid "invalid unshallow line: %s"

4054 msgstr "无效的 unshallow 信息：%s"

4055

3971 -#: fetch-pack.c:386 fetch-pack.c:1414

4056 +#: fetch-pack.c:386 fetch-pack.c:1465

4057 #, c-format

4058 msgid "object not found: %s"

4059 msgstr "对象未找到：%s"

4060

3976 -#: fetch-pack.c:389 fetch-pack.c:1417

4061 +#: fetch-pack.c:389 fetch-pack.c:1468

4062 #, c-format

4063 msgid "error in object: %s"

4064 msgstr "对象中出错：%s"

4065

3981 -#: fetch-pack.c:391 fetch-pack.c:1419

4066 +#: fetch-pack.c:391 fetch-pack.c:1470

4067 #, c-format

4068 msgid "no shallow found: %s"

4069 msgstr "未发现 shallow：%s"

4070

3986 -#: fetch-pack.c:394 fetch-pack.c:1423

4071 +#: fetch-pack.c:394 fetch-pack.c:1474

4072 #, c-format

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

4074 msgstr "应为 shallow/unshallow，却得到 %s"

@@ -4021,171 +4106,175 @@ msgstr "标记 %s 为完成"

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

4107 msgstr "已经有 %s（%s）"

4108

4024 -#: fetch-pack.c:827

4109 +#: fetch-pack.c:844

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

4111 msgstr "fetch-pack：无法派生 sideband 多路输出"

4112

4028 -#: fetch-pack.c:835

4113 +#: fetch-pack.c:852

4114 msgid "protocol error: bad pack header"

4115 msgstr "协议错误：坏的包头"

4116

4032 -#: fetch-pack.c:919

4117 +#: fetch-pack.c:946

4118 #, c-format

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

4120 msgstr "fetch-pack：无法派生进程 %s"

4121

4037 -#: fetch-pack.c:937

4122 +#: fetch-pack.c:952

4123 +msgid "fetch-pack: invalid index-pack output"

4124 +msgstr "fetch-pack：无效的 index-pack 输出"

4125 +

4126 +#: fetch-pack.c:969

4127 #, c-format

4128 msgid "%s failed"

4129 msgstr "%s 失败"

4130

4042 -#: fetch-pack.c:939

4131 +#: fetch-pack.c:971

4132 msgid "error in sideband demultiplexer"

4133 msgstr "sideband 多路输出出错"

4134

4046 -#: fetch-pack.c:982

4135 +#: fetch-pack.c:1031

4136 #, c-format

4137 msgid "Server version is %.*s"

4138 msgstr "服务器版本 %.*s"

4139

4051 -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4052 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4053 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4054 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

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

4144 #, c-format

4145 msgid "Server supports %s"

4146 msgstr "服务器支持 %s"

4147

4059 -#: fetch-pack.c:992

4148 +#: fetch-pack.c:1041

4149 msgid "Server does not support shallow clients"

4150 msgstr "服务器不支持 shalllow 客户端"

4151

4063 -#: fetch-pack.c:1052

4152 +#: fetch-pack.c:1101

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

4154 msgstr "服务器不支持 --shallow-since"

4155

4067 -#: fetch-pack.c:1057

4156 +#: fetch-pack.c:1106

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

4158 msgstr "服务器不支持 --shallow-exclude"

4159

4071 -#: fetch-pack.c:1061

4160 +#: fetch-pack.c:1110

4161 msgid "Server does not support --deepen"

4162 msgstr "服务器不支持 --deepen"

4163

4075 -#: fetch-pack.c:1063

4164 +#: fetch-pack.c:1112

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

4166 msgstr "服务器不支持这个仓库的对象格式"

4167

4079 -#: fetch-pack.c:1076

4168 +#: fetch-pack.c:1125

4169 msgid "no common commits"

4170 msgstr "没有共同的提交"

4171

4083 -#: fetch-pack.c:1088 fetch-pack.c:1628

4172 +#: fetch-pack.c:1138 fetch-pack.c:1682

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

4174 msgstr "git fetch-pack：获取失败。"

4175

4087 -#: fetch-pack.c:1214

4176 +#: fetch-pack.c:1265

4177 #, c-format

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

4179 msgstr "不匹配的算法：客户端 %s，服务端 %s"

4180

4092 -#: fetch-pack.c:1218

4181 +#: fetch-pack.c:1269

4182 #, c-format

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

4184 msgstr "服务器不支持算法 '%s'"

4185

4097 -#: fetch-pack.c:1238

4186 +#: fetch-pack.c:1289

4187 msgid "Server does not support shallow requests"

4188 msgstr "服务器不支持 shalllow 请求"

4189

4101 -#: fetch-pack.c:1245

4190 +#: fetch-pack.c:1296

4191 msgid "Server supports filter"

4192 msgstr "服务器支持 filter"

4193

4105 -#: fetch-pack.c:1284

4194 +#: fetch-pack.c:1335

4195 msgid "unable to write request to remote"

4196 msgstr "无法将请求写到远程"

4197

4109 -#: fetch-pack.c:1302

4198 +#: fetch-pack.c:1353

4199 #, c-format

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

4201 msgstr "读取节标题 '%s' 出错"

4202

4114 -#: fetch-pack.c:1308

4203 +#: fetch-pack.c:1359

4204 #, c-format

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

4206 msgstr "预期 '%s'，得到 '%s'"

4207

4119 -#: fetch-pack.c:1369

4208 +#: fetch-pack.c:1420

4209 #, c-format

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

4211 msgstr "意外的确认行：'%s'"

4212

4124 -#: fetch-pack.c:1374

4213 +#: fetch-pack.c:1425

4214 #, c-format

4215 msgid "error processing acks: %d"

4216 msgstr "处理 ack 出错：%d"

4217

4129 -#: fetch-pack.c:1384

4218 +#: fetch-pack.c:1435

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

4220 msgstr "预期在 'ready' 之后发送 packfile"

4221

4133 -#: fetch-pack.c:1386

4222 +#: fetch-pack.c:1437

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

4224 msgstr "在没有 'ready' 不应该发送其它小节"

4225

4137 -#: fetch-pack.c:1428

4226 +#: fetch-pack.c:1479

4227 #, c-format

4228 msgid "error processing shallow info: %d"

4229 msgstr "处理浅克隆信息出错：%d"

4230

4142 -#: fetch-pack.c:1475

4231 +#: fetch-pack.c:1526

4232 #, c-format

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

4234 msgstr "预期 wanted-ref，得到 '%s'"

4235

4147 -#: fetch-pack.c:1480

4236 +#: fetch-pack.c:1531

4237 #, c-format

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

4239 msgstr "意外的 wanted-ref：'%s'"

4240

4152 -#: fetch-pack.c:1485

4241 +#: fetch-pack.c:1536

4242 #, c-format

4243 msgid "error processing wanted refs: %d"

4244 msgstr "处理要获取的引用出错：%d"

4245

4157 -#: fetch-pack.c:1515

4246 +#: fetch-pack.c:1566

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

4248 msgstr "git fetch-pack：预期响应结束包"

4249

4161 -#: fetch-pack.c:1897

4250 +#: fetch-pack.c:1960

4251 msgid "no matching remote head"

4252 msgstr "没有匹配的远程分支"

4253

4165 -#: fetch-pack.c:1920 builtin/clone.c:693

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

4255 msgid "remote did not send all necessary objects"

4256 msgstr "远程没有发送所有必需的对象"

4257

4169 -#: fetch-pack.c:1947

4258 +#: fetch-pack.c:2010

4259 #, c-format

4260 msgid "no such remote ref %s"

4261 msgstr "没有这样的远程引用 %s"

4262

4174 -#: fetch-pack.c:1950

4263 +#: fetch-pack.c:2013

4264 #, c-format

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

4266 msgstr "服务器不允许请求未公开的对象 %s"

4267

4179 -#: gpg-interface.c:272

4268 +#: gpg-interface.c:273

4269 msgid "could not create temporary file"

4270 msgstr "不能创建临时文件"

4271

4183 -#: gpg-interface.c:275

4272 +#: gpg-interface.c:276

4273 #, c-format

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

4275 msgstr "无法将分离式签名写入 '%s'"

4276

4188 -#: gpg-interface.c:457

4277 +#: gpg-interface.c:470

4278 msgid "gpg failed to sign the data"

4279 msgstr "gpg 数据签名失败"

4280

@@ -4194,7 +4283,7 @@ msgstr "gpg 数据签名失败"

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

4284 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

4285

4197 -#: grep.c:640

4286 +#: grep.c:543

4287 msgid ""

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

4289 "with -P under PCRE v2"

@@ -4202,18 +4291,18 @@ msgstr ""

4291 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"

4292 "功能"

4293

4205 -#: grep.c:2100

4294 +#: grep.c:1906

4295 #, c-format

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

4297 msgstr "'%s'：无法读取 %s"

4298

4210 -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4299 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90

4300 #: builtin/rm.c:135

4301 #, c-format

4302 msgid "failed to stat '%s'"

4303 msgstr "对 '%s' 调用 stat 失败"

4304

4216 -#: grep.c:2128

4305 +#: grep.c:1934

4306 #, c-format

4307 msgid "'%s': short read"

4308 msgstr "'%s'：读取不完整"

@@ -4283,7 +4372,7 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

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

4373 msgstr "这些是各种场合常见的 Git 命令："

4374

4286 -#: help.c:365 git.c:99

4375 +#: help.c:365 git.c:100

4376 #, c-format

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

4378 msgstr "不支持的命令列表类型 '%s'"

@@ -4518,11 +4607,229 @@ msgstr ""

4607 msgid "Unable to create '%s.lock': %s"

4608 msgstr "不能创建 '%s.lock'：%s"

4609

4521 -#: ls-refs.c:109

4610 +#: ls-refs.c:37

4611 +#, c-format

4612 +msgid "invalid value '%s' for lsrefs.unborn"

4613 +msgstr "lsrefs.unborn 的取值 '%s' 无效"

4614 +

4615 +#: ls-refs.c:167

4616 msgid "expected flush after ls-refs arguments"

4617 msgstr "在 ls-refs 参数后应该有一个 flush 包"

4618

4525 -#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4619 +#: merge-ort.c:888 merge-recursive.c:1191

4620 +#, c-format

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

4622 +msgstr "无法合并子模组 %s （没有检出）"

4623 +

4624 +#: merge-ort.c:897 merge-recursive.c:1198

4625 +#, c-format

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

4627 +msgstr "无法合并子模组 %s（提交不存在）"

4628 +

4629 +#: merge-ort.c:906 merge-recursive.c:1205

4630 +#, c-format

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

4632 +msgstr "无法合并子模组 %s （提交未跟随合并基线）"

4633 +

4634 +#: merge-ort.c:916 merge-ort.c:923

4635 +#, c-format

4636 +msgid "Note: Fast-forwarding submodule %s to %s"

4637 +msgstr "注意：快进子模组 %s 到 %s"

4638 +

4639 +#: merge-ort.c:944

4640 +#, c-format

4641 +msgid "Failed to merge submodule %s"

4642 +msgstr "无法合并子模组 %s"

4643 +

4644 +#: merge-ort.c:951

4645 +#, c-format

4646 +msgid ""

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

4648 +"%s\n"

4649 +msgstr ""

4650 +"无法合并子模组 %s，但是存在一个可能的合并方案：\n"

4651 +"%s\n"

4652 +

4653 +#: merge-ort.c:955 merge-recursive.c:1259

4654 +#, c-format

4655 +msgid ""

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

4657 +"by using:\n"

4658 +"\n"

4659 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

4660 +"\n"

4661 +"which will accept this suggestion.\n"

4662 +msgstr ""

4663 +"如果这个正确，将其添加到索引，例如使用命令：\n"

4664 +"\n"

4665 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

4666 +"\n"

4667 +"以接受此建议。\n"

4668 +

4669 +#: merge-ort.c:968

4670 +#, c-format

4671 +msgid ""

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

4673 +"%s"

4674 +msgstr ""

4675 +"无法合并子模组 %s，但是存在多个可能的合并：\n"

4676 +"%s"

4677 +

4678 +#: merge-ort.c:1127 merge-recursive.c:1341

4679 +msgid "Failed to execute internal merge"

4680 +msgstr "无法执行内部合并"

4681 +

4682 +#: merge-ort.c:1132 merge-recursive.c:1346

4683 +#, c-format

4684 +msgid "Unable to add %s to database"

4685 +msgstr "不能添加 %s 至对象库"

4686 +

4687 +#: merge-ort.c:1139 merge-recursive.c:1378

4688 +#, c-format

4689 +msgid "Auto-merging %s"

4690 +msgstr "自动合并 %s"

4691 +

4692 +#: merge-ort.c:1278 merge-recursive.c:2100

4693 +#, c-format

4694 +msgid ""

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

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

4697 +msgstr ""

4698 +"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

4699 +"在：%s。"

4700 +

4701 +#: merge-ort.c:1288 merge-recursive.c:2110

4702 +#, c-format

4703 +msgid ""

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

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

4706 +msgstr ""

4707 +"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

4708 +"径放置于此：%s"

4709 +

4710 +#: merge-ort.c:1471

4711 +#, c-format

4712 +msgid ""

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

4714 +"renamed to multiple other directories, with no destination getting a "

4715 +"majority of the files."

4716 +msgstr "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目录中，没有一个目标目录中包含多数文件。"

4717 +

4718 +#: merge-ort.c:1637 merge-recursive.c:2447

4719 +#, c-format

4720 +msgid ""

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

4722 +"renamed."

4723 +msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

4724 +

4725 +#: merge-ort.c:1781 merge-recursive.c:3215

4726 +#, c-format

4727 +msgid ""

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

4729 +"moving it to %s."

4730 +msgstr ""

4731 +"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4732 +

4733 +#: merge-ort.c:1788 merge-recursive.c:3222

4734 +#, c-format

4735 +msgid ""

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

4737 +"%s; moving it to %s."

4738 +msgstr ""

4739 +"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4740 +"动到 %5$s。"

4741 +

4742 +#: merge-ort.c:1801 merge-recursive.c:3218

4743 +#, c-format

4744 +msgid ""

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

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

4747 +msgstr ""

4748 +"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4749 +"到 %s。"

4750 +

4751 +#: merge-ort.c:1809 merge-recursive.c:3225

4752 +#, c-format

4753 +msgid ""

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

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

4756 +msgstr ""

4757 +"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4758 +"建议将其移动到 %5$s。"

4759 +

4760 +#: merge-ort.c:1952

4761 +#, c-format

4762 +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。"

4764 +

4765 +#: merge-ort.c:2047

4766 +#, c-format

4767 +msgid ""

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

4769 +"conflicts AND collides with another path; this may result in nested conflict "

4770 +"markers."

4771 +msgstr "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这可能导致嵌套的冲突标签。"

4772 +

4773 +#: merge-ort.c:2066 merge-ort.c:2090

4774 +#, c-format

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

4776 +msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"

4777 +

4778 +#: merge-ort.c:2735

4779 +#, c-format

4780 +msgid ""

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

4782 +"%s instead."

4783 +msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"

4784 +

4785 +#: merge-ort.c:2808

4786 +#, c-format

4787 +msgid ""

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

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

4790 +msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的%s以便每个被记录在不同位置。"

4791 +

4792 +#: merge-ort.c:2812

4793 +msgid "both"

4794 +msgstr "双方"

4795 +

4796 +#: merge-ort.c:2812

4797 +msgid "one"

4798 +msgstr "一个"

4799 +

4800 +#: merge-ort.c:2907 merge-recursive.c:3052

4801 +msgid "content"

4802 +msgstr "内容"

4803 +

4804 +#: merge-ort.c:2909 merge-recursive.c:3056

4805 +msgid "add/add"

4806 +msgstr "添加/添加"

4807 +

4808 +#: merge-ort.c:2911 merge-recursive.c:3101

4809 +msgid "submodule"

4810 +msgstr "子模组"

4811 +

4812 +#: merge-ort.c:2913 merge-recursive.c:3102

4813 +#, c-format

4814 +msgid "CONFLICT (%s): Merge conflict in %s"

4815 +msgstr "冲突（%s）：合并冲突于 %s"

4816 +

4817 +#: merge-ort.c:2938

4818 +#, c-format

4819 +msgid ""

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

4821 +"of %s left in tree."

4822 +msgstr "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本在树中被保留。"

4823 +

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

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

4826 +#.

4827 +#: merge-ort.c:3406

4828 +#, c-format

4829 +msgid "collecting merge info failed for trees %s, %s, %s"

4830 +msgstr "无法收集树 %s、%s、%s 的合并信息"

4831 +

4832 +#: merge-ort-wrappers.c:13 merge-recursive.c:3661

4833 #, c-format

4834 msgid ""

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

@@ -4594,22 +4901,7 @@ msgstr "创建符号链接 '%s' 失败：%s"

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

4902 msgstr "不知道如何处理 %06o %s '%s'"

4903

4597 -#: merge-recursive.c:1191

4598 -#, c-format

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

4600 -msgstr "无法合并子模组 %s （没有检出）"

4601 -

4602 -#: merge-recursive.c:1198

4603 -#, c-format

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

4605 -msgstr "无法合并子模组 %s（提交不存在）"

4606 -

4607 -#: merge-recursive.c:1205

4608 -#, c-format

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

4610 -msgstr "无法合并子模组 %s （提交未跟随合并基线）"

4611 -

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

4904 +#: merge-recursive.c:1213 merge-recursive.c:1225

4905 #, c-format

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

4907 msgstr "子模组 %s 快进到如下提交："

@@ -4633,41 +4925,11 @@ msgstr "无法合并子模组 %s（非快进）"

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

4926 msgstr "找到子模组的一个可能的合并方案：\n"

4927

4636 -#: merge-recursive.c:1259

4637 -#, c-format

4638 -msgid ""

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

4640 -"by using:\n"

4641 -"\n"

4642 -" git update-index --cacheinfo 160000 %s \"%s\"\n"

4643 -"\n"

4644 -"which will accept this suggestion.\n"

4645 -msgstr ""

4646 -"如果这个正确，将其添加到索引，例如使用命令：\n"

4647 -"\n"

4648 -" git update-index --cacheinfo 160000 %s \"%s\"\n"

4649 -"\n"

4650 -"以接受此建议。\n"

4651 -

4928 #: merge-recursive.c:1268

4929 #, c-format

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

4931 msgstr "无法合并子模组 %s （发现多个合并）"

4932

4657 -#: merge-recursive.c:1341

4658 -msgid "Failed to execute internal merge"

4659 -msgstr "无法执行内部合并"

4660 -

4661 -#: merge-recursive.c:1346

4662 -#, c-format

4663 -msgid "Unable to add %s to database"

4664 -msgstr "不能添加 %s 至对象库"

4665 -

4666 -#: merge-recursive.c:1378

4667 -#, c-format

4668 -msgid "Auto-merging %s"

4669 -msgstr "自动合并 %s"

4670 -

4933 #: merge-recursive.c:1402

4934 #, c-format

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

@@ -4772,24 +5034,6 @@ msgstr ""

5034 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

5035 "其它目录，没有目录包含大部分文件。"

5036

4775 -#: merge-recursive.c:2100

4776 -#, c-format

4777 -msgid ""

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

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

4780 -msgstr ""

4781 -"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

4782 -"在：%s。"

4783 -

4784 -#: merge-recursive.c:2110

4785 -#, c-format

4786 -msgid ""

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

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

4789 -msgstr ""

4790 -"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

4791 -"径放置于此：%s"

4792 -

5037 #: merge-recursive.c:2202

5038 #, c-format

5039 msgid ""

@@ -4799,13 +5043,6 @@ msgstr ""

5043 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "

5044 "%4$s->%5$s"

5045

4802 -#: merge-recursive.c:2447

4803 -#, c-format

4804 -msgid ""

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

4806 -"renamed."

4807 -msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

4808 -

5046 #: merge-recursive.c:2973

5047 #, c-format

5048 msgid "cannot read object %s"

@@ -4824,68 +5061,16 @@ msgstr "修改"

5061 msgid "modified"

5062 msgstr "修改"

5063

4827 -#: merge-recursive.c:3052

4828 -msgid "content"

4829 -msgstr "内容"

4830 -

4831 -#: merge-recursive.c:3056

4832 -msgid "add/add"

4833 -msgstr "添加/添加"

4834 -

5064 #: merge-recursive.c:3079

5065 #, c-format

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

5067 msgstr "略过 %s（已经做过相同合并）"

5068

4840 -#: merge-recursive.c:3101

4841 -msgid "submodule"

4842 -msgstr "子模组"

4843 -

4844 -#: merge-recursive.c:3102

4845 -#, c-format

4846 -msgid "CONFLICT (%s): Merge conflict in %s"

4847 -msgstr "冲突（%s）：合并冲突于 %s"

4848 -

5069 #: merge-recursive.c:3132

5070 #, c-format

5071 msgid "Adding as %s instead"

5072 msgstr "而是以 %s 为名添加"

5073

4854 -#: merge-recursive.c:3215

4855 -#, c-format

4856 -msgid ""

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

4858 -"moving it to %s."

4859 -msgstr ""

4860 -"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

4861 -

4862 -#: merge-recursive.c:3218

4863 -#, c-format

4864 -msgid ""

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

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

4867 -msgstr ""

4868 -"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"

4869 -"到 %s。"

4870 -

4871 -#: merge-recursive.c:3222

4872 -#, c-format

4873 -msgid ""

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

4875 -"%s; moving it to %s."

4876 -msgstr ""

4877 -"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

4878 -"动到 %5$s。"

4879 -

4880 -#: merge-recursive.c:3225

4881 -#, c-format

4882 -msgid ""

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

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

4885 -msgstr ""

4886 -"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

4887 -"建议将其移动到 %5$s。"

4888 -

5074 #: merge-recursive.c:3339

5075 #, c-format

5076 msgid "Removing %s"

@@ -4919,27 +5104,28 @@ msgstr "冲突（add/add）：合并冲突于 %s"

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

5105 msgstr "无法合并树 %s 和 %s"

5106

4922 -#: merge-recursive.c:3550

5107 +#: merge-recursive.c:3539

5108 msgid "Merging:"

5109 msgstr "合并："

5110

4926 -#: merge-recursive.c:3563

5111 +#: merge-recursive.c:3552

5112 #, c-format

5113 msgid "found %u common ancestor:"

5114 msgid_plural "found %u common ancestors:"

5115 msgstr[0] "发现 %u 个共同祖先："

5116 msgstr[1] "发现 %u 个共同祖先："

5117

4933 -#: merge-recursive.c:3613

5118 +#: merge-recursive.c:3602

5119 msgid "merge returned no commit"

5120 msgstr "合并未返回提交"

5121

4937 -#: merge-recursive.c:3769

5122 +#: merge-recursive.c:3758

5123 #, c-format

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

5125 msgstr "不能解析对象 '%s'"

5126

4942 -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

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

5128 +#: builtin/stash.c:471

5129 msgid "Unable to write index."

5130 msgstr "不能写入索引。"

5131

@@ -4947,184 +5133,176 @@ msgstr "不能写入索引。"

5133 msgid "failed to read the cache"

5134 msgstr "读取缓存失败"

5135

4950 -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

4951 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

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

5139 msgid "unable to write new index file"

5140 msgstr "无法写新的索引文件"

5141

4956 -#: midx.c:80

5142 +#: midx.c:62

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

5144 +msgstr "多包索引的对象ID扇出表大小错误"

5145 +

5146 +#: midx.c:93

5147 #, c-format

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

5149 msgstr "多包索引文件 %s 太小"

5150

4961 -#: midx.c:96

5151 +#: midx.c:109

5152 #, c-format

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

5154 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

5155

4966 -#: midx.c:101

5156 +#: midx.c:114

5157 #, c-format

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

5159 msgstr "multi-pack-index 版本 %d 不能被识别"

5160

4971 -#: midx.c:106

5161 +#: midx.c:119

5162 #, c-format

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

5164 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"

5165

4976 -#: midx.c:123

4977 -msgid "invalid chunk offset (too large)"

4978 -msgstr "无效的块偏移（太大）"

4979 -

4980 -#: midx.c:147

4981 -msgid "terminating multi-pack-index chunk id appears earlier than expected"

4982 -msgstr "终止多包索引块 id 出现时间早于预期"

4983 -

4984 -#: midx.c:160

5166 +#: midx.c:136

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

5168 msgstr "多包索引缺少必需的包名块"

5169

4988 -#: midx.c:162

5170 +#: midx.c:138

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

5172 msgstr "多包索引缺少必需的对象 ID 扇出块"

5173

4992 -#: midx.c:164

5174 +#: midx.c:140

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

5176 msgstr "多包索引缺少必需的对象 ID 查询块"

5177

4996 -#: midx.c:166

5178 +#: midx.c:142

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

5180 msgstr "多包索引缺少必需的对象偏移块"

5181

5000 -#: midx.c:180

5182 +#: midx.c:158

5183 #, c-format

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

5185 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

5186

5005 -#: midx.c:223

5187 +#: midx.c:202

5188 #, c-format

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

5190 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

5191

5010 -#: midx.c:273

5192 +#: midx.c:252

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

5194 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

5195

5014 -#: midx.c:480

5196 +#: midx.c:467

5197 #, c-format

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

5199 msgstr "添加包文件 '%s' 失败"

5200

5019 -#: midx.c:486

5201 +#: midx.c:473

5202 #, c-format

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

5204 msgstr "打开包索引 '%s' 失败"

5205

5024 -#: midx.c:546

5206 +#: midx.c:533

5207 #, c-format

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

5209 msgstr "在包文件中定位对象 %d 失败"

5210

5029 -#: midx.c:846

5211 +#: midx.c:821

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

5213 msgstr "添加包文件到多包索引"

5214

5033 -#: midx.c:879

5215 +#: midx.c:855

5216 #, c-format

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

5218 msgstr "没有看到要丢弃的包文件 %s"

5219

5038 -#: midx.c:931

5220 +#: midx.c:904

5221 msgid "no pack files to index."

5222 msgstr "没有要索引的包文件。"

5223

5042 -#: midx.c:982

5043 -msgid "Writing chunks to multi-pack-index"

5044 -msgstr "写入块到多包索引"

5045 -

5046 -#: midx.c:1060

5224 +#: midx.c:965

5225 #, c-format

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

5227 msgstr "清理位于 %s 的多包索引失败"

5228

5051 -#: midx.c:1116

5229 +#: midx.c:1021

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

5231 msgstr "多包索引文件存在，但无法解析"

5232

5055 -#: midx.c:1124

5233 +#: midx.c:1029

5234 msgid "Looking for referenced packfiles"

5235 msgstr "正在查找引用的包文件"

5236

5059 -#: midx.c:1139

5237 +#: midx.c:1044

5238 #, c-format

5239 msgid ""

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

5241 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5242

5065 -#: midx.c:1144

5243 +#: midx.c:1049

5244 msgid "the midx contains no oid"

5245 msgstr "midx 不包含 oid"

5246

5069 -#: midx.c:1153

5247 +#: midx.c:1058

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

5249 msgstr "校验多包索引中的 OID 顺序"

5250

5073 -#: midx.c:1162

5251 +#: midx.c:1067

5252 #, c-format

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

5254 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

5255

5078 -#: midx.c:1182

5256 +#: midx.c:1087

5257 msgid "Sorting objects by packfile"

5258 msgstr "通过包文件为对象排序"

5259

5082 -#: midx.c:1189

5260 +#: midx.c:1094

5261 msgid "Verifying object offsets"

5262 msgstr "校验对象偏移"

5263

5086 -#: midx.c:1205

5264 +#: midx.c:1110

5265 #, c-format

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

5267 msgstr "为 oid[%d] = %s 加载包条目失败"

5268

5091 -#: midx.c:1211

5269 +#: midx.c:1116

5270 #, c-format

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

5272 msgstr "为包文件 %s 加载包索引失败"

5273

5096 -#: midx.c:1220

5274 +#: midx.c:1125

5275 #, c-format

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

5277 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

5278

5101 -#: midx.c:1245

5279 +#: midx.c:1150

5280 msgid "Counting referenced objects"

5281 msgstr "正在对引用对象计数"

5282

5105 -#: midx.c:1255

5283 +#: midx.c:1160

5284 msgid "Finding and deleting unreferenced packfiles"

5285 msgstr "正在查找和删除未引用的包文件"

5286

5109 -#: midx.c:1446

5287 +#: midx.c:1351

5288 msgid "could not start pack-objects"

5289 msgstr "不能开始 pack-objects"

5290

5113 -#: midx.c:1466

5291 +#: midx.c:1371

5292 msgid "could not finish pack-objects"

5293 msgstr "不能结束 pack-objects"

5294

5117 -#: name-hash.c:537

5295 +#: name-hash.c:538

5296 #, c-format

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

5298 msgstr "不能创建 lazy_dir 线程：%s"

5299

5122 -#: name-hash.c:559

5300 +#: name-hash.c:560

5301 #, c-format

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

5303 msgstr "不能创建 lazy_name 线程：%s"

5304

5127 -#: name-hash.c:565

5305 +#: name-hash.c:566

5306 #, c-format

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

5308 msgstr "不能加入 lasy_name 线程：%s"

@@ -5168,2933 +5346,2996 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

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

5347 msgstr "坏的 %s 值：'%s'"

5348

5171 -#: object.c:53

5349 +#: object-file.c:480

5350 #, c-format

5173 -msgid "invalid object type \"%s\""

5174 -msgstr "无效的对象类型 \"%s\""

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

5352 +msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"

5353

5176 -#: object.c:173

5354 +#: object-file.c:531

5355 #, c-format

5178 -msgid "object %s is a %s, not a %s"

5179 -msgstr "对象 %s 是一个 %s，不是一个 %s"

5356 +msgid "unable to normalize alternate object path: %s"

5357 +msgstr "无法规范化备用对象路径：%s"

5358

5181 -#: object.c:233

5359 +#: object-file.c:603

5360 #, c-format

5183 -msgid "object %s has unknown type id %d"

5184 -msgstr "对象 %s 有未知的类型 id %d"

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

5362 +msgstr "%s：忽略备用对象库，嵌套太深"

5363

5186 -#: object.c:246

5364 +#: object-file.c:610

5365 #, c-format

5188 -msgid "unable to parse object: %s"

5189 -msgstr "不能解析对象：%s"

5366 +msgid "unable to normalize object directory: %s"

5367 +msgstr "无法规范化对象目录: %s"

5368

5191 -#: object.c:266 object.c:278

5192 -#, c-format

5193 -msgid "hash mismatch %s"

5194 -msgstr "哈希值与 %s 不匹配"

5369 +#: object-file.c:653

5370 +msgid "unable to fdopen alternates lockfile"

5371 +msgstr "无法 fdopen 替换锁文件"

5372

5196 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5197 -#, c-format

5198 -msgid "unable to get size of %s"

5199 -msgstr "无法得到 %s 的大小"

5373 +#: object-file.c:671

5374 +msgid "unable to read alternates file"

5375 +msgstr "无法读取替代文件"

5376

5201 -#: packfile.c:615

5202 -msgid "offset before end of packfile (broken .idx?)"

5203 -msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5377 +#: object-file.c:678

5378 +msgid "unable to move new alternates file into place"

5379 +msgstr "无法将新的替代文件移动到位"

5380

5205 -#: packfile.c:1907

5381 +#: object-file.c:713

5382 #, c-format

5207 -msgid "offset before start of pack index for %s (corrupt index?)"

5208 -msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5383 +msgid "path '%s' does not exist"

5384 +msgstr "路径 '%s' 不存在"

5385

5210 -#: packfile.c:1911

5386 +#: object-file.c:734

5387 #, c-format

5212 -msgid "offset beyond end of pack index for %s (truncated index?)"

5213 -msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

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

5389 +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

5390

5215 -#: parse-options-cb.c:20 parse-options-cb.c:24

5391 +#: object-file.c:740

5392 #, c-format

5217 -msgid "option `%s' expects a numerical value"

5218 -msgstr "选项 `%s' 期望一个数字值"

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

5394 +msgstr "参考仓库 '%s' 不是一个本地仓库。"

5395

5220 -#: parse-options-cb.c:41

5396 +#: object-file.c:746

5397 #, c-format

5222 -msgid "malformed expiration date '%s'"

5223 -msgstr "格式错误的到期时间：'%s'"

5398 +msgid "reference repository '%s' is shallow"

5399 +msgstr "参考仓库 '%s' 是一个浅克隆"

5400

5225 -#: parse-options-cb.c:54

5401 +#: object-file.c:754

5402 #, c-format

5227 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5228 -msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5403 +msgid "reference repository '%s' is grafted"

5404 +msgstr "参考仓库 '%s' 已被移植"

5405

5230 -#: parse-options-cb.c:132 parse-options-cb.c:149

5406 +#: object-file.c:814

5407 #, c-format

5232 -msgid "malformed object name '%s'"

5233 -msgstr "格式错误的对象名 '%s'"

5408 +msgid "invalid line while parsing alternate refs: %s"

5409 +msgstr "解析备用引用时无效的行：%s"

5410

5235 -#: parse-options.c:38

5411 +#: object-file.c:964

5412 #, c-format

5237 -msgid "%s requires a value"

5238 -msgstr "%s 需要一个值"

5413 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5414 +msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"

5415

5240 -#: parse-options.c:73

5241 -#, c-format

5242 -msgid "%s is incompatible with %s"

5243 -msgstr "%s 与 %s 不兼容"

5416 +#: object-file.c:985

5417 +msgid "mmap failed"

5418 +msgstr "mmap 失败"

5419

5245 -#: parse-options.c:78

5420 +#: object-file.c:1149

5421 #, c-format

5247 -msgid "%s : incompatible with something else"

5248 -msgstr "%s：和其它的不兼容"

5422 +msgid "object file %s is empty"

5423 +msgstr "对象文件 %s 为空"

5424

5250 -#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5425 +#: object-file.c:1284 object-file.c:2477

5426 #, c-format

5252 -msgid "%s takes no value"

5253 -msgstr "%s 不取值"

5427 +msgid "corrupt loose object '%s'"

5428 +msgstr "损坏的松散对象 '%s'"

5429

5255 -#: parse-options.c:94

5430 +#: object-file.c:1286 object-file.c:2481

5431 #, c-format

5257 -msgid "%s isn't available"

5258 -msgstr "%s 不可用"

5432 +msgid "garbage at end of loose object '%s'"

5433 +msgstr "松散对象 '%s' 后面有垃圾数据"

5434

5260 -#: parse-options.c:217

5261 -#, c-format

5262 -msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5263 -msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

5435 +#: object-file.c:1328

5436 +msgid "invalid object type"

5437 +msgstr "无效的对象类型"

5438

5265 -#: parse-options.c:386

5439 +#: object-file.c:1412

5440 #, c-format

5267 -msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5268 -msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5441 +msgid "unable to unpack %s header with --allow-unknown-type"

5442 +msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"

5443

5270 -#: parse-options.c:420 parse-options.c:428

5444 +#: object-file.c:1415

5445 #, c-format

5272 -msgid "did you mean `--%s` (with two dashes)?"

5273 -msgstr "你的意思是 `--%s`（有两个短线）？"

5446 +msgid "unable to unpack %s header"

5447 +msgstr "无法解开 %s 头部"

5448

5275 -#: parse-options.c:666 parse-options.c:971

5449 +#: object-file.c:1421

5450 #, c-format

5277 -msgid "alias of --%s"

5278 -msgstr "--%s 的别名"

5451 +msgid "unable to parse %s header with --allow-unknown-type"

5452 +msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"

5453

5280 -#: parse-options.c:862

5454 +#: object-file.c:1424

5455 #, c-format

5282 -msgid "unknown option `%s'"

5283 -msgstr "未知选项 `%s'"

5456 +msgid "unable to parse %s header"

5457 +msgstr "无法解析 %s 头部"

5458

5285 -#: parse-options.c:864

5459 +#: object-file.c:1651

5460 #, c-format

5287 -msgid "unknown switch `%c'"

5288 -msgstr "未知开关 `%c'"

5461 +msgid "failed to read object %s"

5462 +msgstr "读取对象 %s 失败"

5463

5290 -#: parse-options.c:866

5464 +#: object-file.c:1655

5465 #, c-format

5292 -msgid "unknown non-ascii option in string: `%s'"

5293 -msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5466 +msgid "replacement %s not found for %s"

5467 +msgstr "找不到 %2$s 的替代 %1$s"

5468

5295 -#: parse-options.c:890

5296 -msgid "..."

5297 -msgstr "..."

5469 +#: object-file.c:1659

5470 +#, c-format

5471 +msgid "loose object %s (stored in %s) is corrupt"

5472 +msgstr "松散对象 %s（保存在 %s）已损坏"

5473

5299 -#: parse-options.c:909

5474 +#: object-file.c:1663

5475 #, c-format

5301 -msgid "usage: %s"

5302 -msgstr "用法：%s"

5476 +msgid "packed object %s (stored in %s) is corrupt"

5477 +msgstr "打包对象 %s（保存在 %s）已损坏"

5478

5304 -#. TRANSLATORS: the colon here should align with the

5305 -#. one in "usage: %s" translation.

5306 -#.

5307 -#: parse-options.c:915

5479 +#: object-file.c:1768

5480 #, c-format

5309 -msgid " or: %s"

5310 -msgstr " 或：%s"

5481 +msgid "unable to write file %s"

5482 +msgstr "无法写文件 %s"

5483

5312 -# 译者：为保证在输出中对齐，注意调整句中空格！

5313 -#: parse-options.c:918

5484 +#: object-file.c:1775

5485 #, c-format

5315 -msgid " %s"

5316 -msgstr " %s"

5486 +msgid "unable to set permission to '%s'"

5487 +msgstr "无法为 '%s' 设置权限"

5488

5318 -#: parse-options.c:957

5319 -msgid "-NUM"

5320 -msgstr "-数字"

5489 +#: object-file.c:1782

5490 +msgid "file write error"

5491 +msgstr "文件写错误"

5492

5322 -#: path.c:915

5493 +#: object-file.c:1802

5494 +msgid "error when closing loose object file"

5495 +msgstr "关闭松散对象文件时出错"

5496 +

5497 +#: object-file.c:1867

5498 #, c-format

5324 -msgid "Could not make %s writable by group"

5325 -msgstr "不能设置 %s 为组可写"

5499 +msgid "insufficient permission for adding an object to repository database %s"

5500 +msgstr "权限不足，无法在仓库对象库 %s 中添加对象"

5501

5327 -#: pathspec.c:130

5328 -msgid "Escape character '\\' not allowed as last character in attr value"

5329 -msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

5502 +#: object-file.c:1869

5503 +msgid "unable to create temporary file"

5504 +msgstr "无法创建临时文件"

5505

5331 -#: pathspec.c:148

5332 -msgid "Only one 'attr:' specification is allowed."

5333 -msgstr "只允许一个 'attr:' 规格。"

5506 +#: object-file.c:1893

5507 +msgid "unable to write loose object file"

5508 +msgstr "不能写松散对象文件"

5509

5335 -#: pathspec.c:151

5336 -msgid "attr spec must not be empty"

5337 -msgstr "属性规格不能为空"

5510 +#: object-file.c:1899

5511 +#, c-format

5512 +msgid "unable to deflate new object %s (%d)"

5513 +msgstr "不能压缩新对象 %s（%d）"

5514

5339 -#: pathspec.c:194

5515 +#: object-file.c:1903

5516 #, c-format

5341 -msgid "invalid attribute name %s"

5342 -msgstr "无效的属性名 %s"

5517 +msgid "deflateEnd on object %s failed (%d)"

5518 +msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

5519

5344 -#: pathspec.c:259

5345 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5346 -msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

5520 +#: object-file.c:1907

5521 +#, c-format

5522 +msgid "confused by unstable object source data for %s"

5523 +msgstr "被 %s 的不稳定对象源数据搞糊涂了"

5524

5348 -#: pathspec.c:266

5349 -msgid ""

5350 -"global 'literal' pathspec setting is incompatible with all other global "

5351 -"pathspec settings"

5352 -msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

5525 +#: object-file.c:1917 builtin/pack-objects.c:1097

5526 +#, c-format

5527 +msgid "failed utime() on %s"

5528 +msgstr "在 %s 上调用 utime() 失败"

5529

5354 -#: pathspec.c:306

5355 -msgid "invalid parameter for pathspec magic 'prefix'"

5356 -msgstr "路径规格包含无效的神奇前缀"

5530 +#: object-file.c:1994

5531 +#, c-format

5532 +msgid "cannot read object for %s"

5533 +msgstr "不能读取对象 %s"

5534

5358 -#: pathspec.c:327

5535 +#: object-file.c:2045

5536 +msgid "corrupt commit"

5537 +msgstr "损坏的提交"

5538 +

5539 +#: object-file.c:2053

5540 +msgid "corrupt tag"

5541 +msgstr "损坏的标签"

5542 +

5543 +#: object-file.c:2153

5544 #, c-format

5360 -msgid "Invalid pathspec magic '%.*s' in '%s'"

5361 -msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

5545 +msgid "read error while indexing %s"

5546 +msgstr "索引 %s 时读取错误"

5547

5363 -#: pathspec.c:332

5548 +#: object-file.c:2156

5549 #, c-format

5365 -msgid "Missing ')' at the end of pathspec magic in '%s'"

5366 -msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

5550 +msgid "short read while indexing %s"

5551 +msgstr "索引 %s 时读入不完整"

5552

5368 -#: pathspec.c:370

5553 +#: object-file.c:2229 object-file.c:2239

5554 #, c-format

5370 -msgid "Unimplemented pathspec magic '%c' in '%s'"

5371 -msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

5555 +msgid "%s: failed to insert into database"

5556 +msgstr "%s：插入数据库失败"

5557

5373 -#: pathspec.c:429

5558 +#: object-file.c:2245

5559 #, c-format

5375 -msgid "%s: 'literal' and 'glob' are incompatible"

5376 -msgstr "%s：'literal' 和 'glob' 不兼容"

5560 +msgid "%s: unsupported file type"

5561 +msgstr "%s：不支持的文件类型"

5562

5378 -#: pathspec.c:445

5563 +#: object-file.c:2269

5564 #, c-format

5380 -msgid "%s: '%s' is outside repository at '%s'"

5381 -msgstr "%s：'%s' 在位于 '%s' 的仓库之外"

5565 +msgid "%s is not a valid object"

5566 +msgstr "%s 不是一个有效的对象"

5567

5383 -#: pathspec.c:521

5568 +#: object-file.c:2271

5569 #, c-format

5385 -msgid "'%s' (mnemonic: '%c')"

5386 -msgstr "'%s'（助记符：'%c'）"

5570 +msgid "%s is not a valid '%s' object"

5571 +msgstr "%s 不是一个有效的 '%s' 对象"

5572

5388 -#: pathspec.c:531

5573 +#: object-file.c:2298 builtin/index-pack.c:192

5574 #, c-format

5390 -msgid "%s: pathspec magic not supported by this command: %s"

5391 -msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

5575 +msgid "unable to open %s"

5576 +msgstr "不能打开 %s"

5577

5393 -#: pathspec.c:598

5578 +#: object-file.c:2488 object-file.c:2541

5579 #, c-format

5395 -msgid "pathspec '%s' is beyond a symbolic link"

5396 -msgstr "路径规格 '%s' 位于符号链接中"

5580 +msgid "hash mismatch for %s (expected %s)"

5581 +msgstr "%s 的哈希值不匹配（预期 %s）"

5582

5398 -#: pathspec.c:643

5583 +#: object-file.c:2512

5584 #, c-format

5400 -msgid "line is badly quoted: %s"

5401 -msgstr "行被错误地引用：%s"

5585 +msgid "unable to mmap %s"

5586 +msgstr "不能 mmap %s"

5587

5403 -#: pkt-line.c:92

5404 -msgid "unable to write flush packet"

5405 -msgstr "无法写 flush 包"

5588 +#: object-file.c:2517

5589 +#, c-format

5590 +msgid "unable to unpack header of %s"

5591 +msgstr "无法解压缩 %s 的头部"

5592

5407 -#: pkt-line.c:99

5408 -msgid "unable to write delim packet"

5409 -msgstr "无法写 delim 包"

5593 +#: object-file.c:2523

5594 +#, c-format

5595 +msgid "unable to parse header of %s"

5596 +msgstr "无法解析 %s 的头部"

5597

5411 -#: pkt-line.c:106

5412 -msgid "unable to write stateless separator packet"

5413 -msgstr "无法写入无状态分隔符数据包"

5598 +#: object-file.c:2534

5599 +#, c-format

5600 +msgid "unable to unpack contents of %s"

5601 +msgstr "无法解压缩 %s 的内容"

5602

5415 -#: pkt-line.c:113

5416 -msgid "flush packet write failed"

5417 -msgstr "flush 包写错误"

5603 +#: object-name.c:486

5604 +#, c-format

5605 +msgid "short object ID %s is ambiguous"

5606 +msgstr "短对象ID %s 存在歧义"

5607

5419 -#: pkt-line.c:153 pkt-line.c:239

5420 -msgid "protocol error: impossibly long line"

5421 -msgstr "协议错误：不可能的长行"

5608 +#: object-name.c:497

5609 +msgid "The candidates are:"

5610 +msgstr "候选者有："

5611

5423 -#: pkt-line.c:169 pkt-line.c:171

5424 -msgid "packet write with format failed"

5425 -msgstr "格式化包写入错误"

5612 +#: object-name.c:796

5613 +msgid ""

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

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

5616 +"may be created by mistake. For example,\n"

5617 +"\n"

5618 +" git switch -c $br $(git rev-parse ...)\n"

5619 +"\n"

5620 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

5621 +"examine these refs and maybe delete them. Turn this message off by\n"

5622 +"running \"git config advice.objectNameWarning false\""

5623 +msgstr ""

5624 +"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"

5625 +"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"

5626 +"\n"

5627 +" git switch -c $br $(git rev-parse ...)\n"

5628 +"\n"

5629 +"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"

5630 +"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"

5631 +"false\" 命令关闭本消息通知。"

5632

5427 -#: pkt-line.c:203

5428 -msgid "packet write failed - data exceeds max packet size"

5429 -msgstr "写数据包失败：数据超过了包的最大长度"

5633 +#: object-name.c:916

5634 +#, c-format

5635 +msgid "log for '%.*s' only goes back to %s"

5636 +msgstr "'%.*s' 的日志仅能回到 %s"

5637

5431 -#: pkt-line.c:210 pkt-line.c:217

5432 -msgid "packet write failed"

5433 -msgstr "数据包写入失败"

5638 +#: object-name.c:924

5639 +#, c-format

5640 +msgid "log for '%.*s' only has %d entries"

5641 +msgstr "'%.*s' 的日志仅有 %d 个条目"

5642

5435 -#: pkt-line.c:302

5436 -msgid "read error"

5437 -msgstr "读取错误"

5643 +#: object-name.c:1702

5644 +#, c-format

5645 +msgid "path '%s' exists on disk, but not in '%.*s'"

5646 +msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"

5647

5439 -#: pkt-line.c:310

5440 -msgid "the remote end hung up unexpectedly"

5441 -msgstr "远端意外挂断了"

5648 +#: object-name.c:1708

5649 +#, c-format

5650 +msgid ""

5651 +"path '%s' exists, but not '%s'\n"

5652 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

5653 +msgstr ""

5654 +"路径 '%s' 存在，而 '%s' 不存在\n"

5655 +"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"

5656

5443 -#: pkt-line.c:338

5657 +#: object-name.c:1717

5658 #, c-format

5445 -msgid "protocol error: bad line length character: %.4s"

5446 -msgstr "协议错误：错误的行长度字符串：%.4s"

5659 +msgid "path '%s' does not exist in '%.*s'"

5660 +msgstr "路径 '%s' 不在 '%.*s' 中"

5661

5448 -#: pkt-line.c:352 pkt-line.c:357

5662 +#: object-name.c:1745

5663 #, c-format

5450 -msgid "protocol error: bad line length %d"

5451 -msgstr "协议错误：错误的行长度 %d"

5664 +msgid ""

5665 +"path '%s' is in the index, but not at stage %d\n"

5666 +"hint: Did you mean ':%d:%s'?"

5667 +msgstr ""

5668 +"路径 '%s' 在索引中，但不在暂存区 %d 中\n"

5669 +"提示：您的意思是 ':%d:%s'？"

5670

5453 -#: pkt-line.c:373 sideband.c:165

5671 +#: object-name.c:1761

5672 #, c-format

5455 -msgid "remote error: %s"

5456 -msgstr "远程错误：%s"

5673 +msgid ""

5674 +"path '%s' is in the index, but not '%s'\n"

5675 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

5676 +msgstr ""

5677 +"路径 '%s' 在索引中，但 '%s' 不在\n"

5678 +"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"

5679

5458 -#: preload-index.c:119

5459 -msgid "Refreshing index"

5460 -msgstr "正在刷新索引"

5680 +#: object-name.c:1769

5681 +#, c-format

5682 +msgid "path '%s' exists on disk, but not in the index"

5683 +msgstr "路径 '%s' 在磁盘上，但不在索引里"

5684

5462 -#: preload-index.c:138

5685 +#: object-name.c:1771

5686 #, c-format

5464 -msgid "unable to create threaded lstat: %s"

5465 -msgstr "无法创建线程 lstat：%s"

5687 +msgid "path '%s' does not exist (neither on disk nor in the index)"

5688 +msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"

5689

5467 -#: pretty.c:983

5468 -msgid "unable to parse --pretty format"

5469 -msgstr "不能解析 --pretty 格式"

5690 +#: object-name.c:1784

5691 +msgid "relative path syntax can't be used outside working tree"

5692 +msgstr "不能在工作区之外使用相对路径语法"

5693

5471 -#: promisor-remote.c:30

5472 -msgid "promisor-remote: unable to fork off fetch subprocess"

5473 -msgstr "promisor-remote：无法派生 fetch 子进程"

5694 +#: object-name.c:1922

5695 +#, c-format

5696 +msgid "invalid object name '%.*s'."

5697 +msgstr "无效的对象名 '%.*s'。"

5698

5475 -#: promisor-remote.c:35 promisor-remote.c:37

5476 -msgid "promisor-remote: could not write to fetch subprocess"

5477 -msgstr "promisor-remote：无法向 fetch 子进程写入"

5699 +#: object.c:53

5700 +#, c-format

5701 +msgid "invalid object type \"%s\""

5702 +msgstr "无效的对象类型 \"%s\""

5703

5479 -#: promisor-remote.c:41

5480 -msgid "promisor-remote: could not close stdin to fetch subprocess"

5481 -msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"

5704 +#: object.c:173

5705 +#, c-format

5706 +msgid "object %s is a %s, not a %s"

5707 +msgstr "对象 %s 是一个 %s，不是一个 %s"

5708

5483 -#: promisor-remote.c:53

5709 +#: object.c:233

5710 #, c-format

5485 -msgid "promisor remote name cannot begin with '/': %s"

5486 -msgstr "promisor 远程名称不能以 '/' 开始：%s"

5711 +msgid "object %s has unknown type id %d"

5712 +msgstr "对象 %s 有未知的类型 id %d"

5713

5488 -#: prune-packed.c:35

5489 -msgid "Removing duplicate objects"

5490 -msgstr "正在删除重复对象"

5714 +#: object.c:246

5715 +#, c-format

5716 +msgid "unable to parse object: %s"

5717 +msgstr "不能解析对象：%s"

5718

5492 -#: range-diff.c:77

5493 -msgid "could not start `log`"

5494 -msgstr "不能启动 `log`"

5719 +#: object.c:266 object.c:278

5720 +#, c-format

5721 +msgid "hash mismatch %s"

5722 +msgstr "哈希值与 %s 不匹配"

5723

5496 -#: range-diff.c:79

5497 -msgid "could not read `log` output"

5498 -msgstr "不能读取 `log` 的输出"

5724 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5725 +#, c-format

5726 +msgid "unable to get size of %s"

5727 +msgstr "无法得到 %s 的大小"

5728

5500 -#: range-diff.c:98 sequencer.c:5310

5729 +#: pack-bitmap.c:1489 builtin/rev-list.c:92

5730 #, c-format

5502 -msgid "could not parse commit '%s'"

5503 -msgstr "不能解析提交 '%s'"

5731 +msgid "unable to get disk usage of %s"

5732 +msgstr "无法得到 %s 的磁盘使用量"

5733

5505 -#: range-diff.c:112

5734 +#: pack-revindex.c:220

5735 #, c-format

5507 -msgid ""

5508 -"could not parse first line of `log` output: did not start with 'commit ': "

5509 -"'%s'"

5510 -msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"

5736 +msgid "reverse-index file %s is too small"

5737 +msgstr "反向索引文件 %s 太小"

5738

5512 -#: range-diff.c:137

5739 +#: pack-revindex.c:225

5740 #, c-format

5514 -msgid "could not parse git header '%.*s'"

5515 -msgstr "无法解析 git 头 '%.*s'"

5741 +msgid "reverse-index file %s is corrupt"

5742 +msgstr "反向索引文件 %s 损坏"

5743

5517 -#: range-diff.c:299

5518 -msgid "failed to generate diff"

5519 -msgstr "生成 diff 失败"

5744 +#: pack-revindex.c:233

5745 +#, c-format

5746 +msgid "reverse-index file %s has unknown signature"

5747 +msgstr "反向索引文件 %s 有错误的签名"

5748

5521 -#: range-diff.c:532 range-diff.c:534

5749 +#: pack-revindex.c:237

5750 #, c-format

5523 -msgid "could not parse log for '%s'"

5524 -msgstr "不能解析 '%s' 的日志"

5751 +msgid "reverse-index file %s has unsupported version %<PRIu32>"

5752 +msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"

5753

5526 -#: read-cache.c:682

5754 +#: pack-revindex.c:242

5755 #, c-format

5528 -msgid "will not add file alias '%s' ('%s' already exists in index)"

5529 -msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

5756 +msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5757 +msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"

5758

5531 -#: read-cache.c:698

5532 -msgid "cannot create an empty blob in the object database"

5533 -msgstr "不能在对象数据库中创建空的数据对象"

5759 +#: pack-write.c:236

5760 +msgid "cannot both write and verify reverse index"

5761 +msgstr "无法同时写入和校验反向索引"

5762

5535 -#: read-cache.c:720

5763 +#: pack-write.c:257

5764 #, c-format

5537 -msgid "%s: can only add regular files, symbolic links or git-directories"

5538 -msgstr "%s：只能添加常规文件、符号链接或 git 目录"

5765 +msgid "could not stat: %s"

5766 +msgstr "不能调用 stat：%s"

5767

5540 -#: read-cache.c:725

5768 +#: pack-write.c:269

5769 #, c-format

5542 -msgid "'%s' does not have a commit checked out"

5543 -msgstr "'%s' 没有检出一个提交"

5770 +msgid "failed to make %s readable"

5771 +msgstr "无法设置 %s 为可读"

5772

5545 -#: read-cache.c:777

5773 +#: pack-write.c:508

5774 #, c-format

5547 -msgid "unable to index file '%s'"

5548 -msgstr "无法索引文件 '%s'"

5775 +msgid "could not write '%s' promisor file"

5776 +msgstr "无法写入 '%s' 承诺者文件"

5777

5550 -#: read-cache.c:796

5551 -#, c-format

5552 -msgid "unable to add '%s' to index"

5553 -msgstr "无法在索引中添加 '%s'"

5778 +#: packfile.c:625

5779 +msgid "offset before end of packfile (broken .idx?)"

5780 +msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5781

5555 -#: read-cache.c:807

5782 +#: packfile.c:1934

5783 #, c-format

5557 -msgid "unable to stat '%s'"

5558 -msgstr "无法对 %s 执行 stat"

5784 +msgid "offset before start of pack index for %s (corrupt index?)"

5785 +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5786

5560 -#: read-cache.c:1318

5787 +#: packfile.c:1938

5788 #, c-format

5562 -msgid "'%s' appears as both a file and as a directory"

5563 -msgstr "'%s' 看起来既是文件又是目录"

5789 +msgid "offset beyond end of pack index for %s (truncated index?)"

5790 +msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

5791

5565 -#: read-cache.c:1524

5566 -msgid "Refresh index"

5567 -msgstr "刷新索引"

5792 +#: parse-options-cb.c:20 parse-options-cb.c:24

5793 +#, c-format

5794 +msgid "option `%s' expects a numerical value"

5795 +msgstr "选项 `%s' 期望一个数字值"

5796

5569 -#: read-cache.c:1639

5797 +#: parse-options-cb.c:41

5798 #, c-format

5571 -msgid ""

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

5573 -"Using version %i"

5574 -msgstr ""

5575 -"设置了 index.version，但是取值无效。\n"

5576 -"使用版本 %i"

5799 +msgid "malformed expiration date '%s'"

5800 +msgstr "格式错误的到期时间：'%s'"

5801

5578 -#: read-cache.c:1649

5802 +#: parse-options-cb.c:54

5803 #, c-format

5580 -msgid ""

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

5582 -"Using version %i"

5583 -msgstr ""

5584 -"设置了 GIT_INDEX_VERSION，但是取值无效。\n"

5585 -"使用版本 %i"

5804 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5805 +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5806

5587 -#: read-cache.c:1705

5807 +#: parse-options-cb.c:132 parse-options-cb.c:149

5808 #, c-format

5589 -msgid "bad signature 0x%08x"

5590 -msgstr "坏的签名 0x%08x"

5809 +msgid "malformed object name '%s'"

5810 +msgstr "格式错误的对象名 '%s'"

5811

5592 -#: read-cache.c:1708

5812 +#: parse-options.c:38

5813 #, c-format

5594 -msgid "bad index version %d"

5595 -msgstr "坏的索引版本 %d"

5814 +msgid "%s requires a value"

5815 +msgstr "%s 需要一个值"

5816

5597 -#: read-cache.c:1717

5598 -msgid "bad index file sha1 signature"

5599 -msgstr "坏的索引文件 sha1 签名"

5817 +#: parse-options.c:73

5818 +#, c-format

5819 +msgid "%s is incompatible with %s"

5820 +msgstr "%s 与 %s 不兼容"

5821

5601 -#: read-cache.c:1747

5822 +#: parse-options.c:78

5823 #, c-format

5603 -msgid "index uses %.4s extension, which we do not understand"

5604 -msgstr "索引使用不被支持的 %.4s 扩展"

5824 +msgid "%s : incompatible with something else"

5825 +msgstr "%s：和其它的不兼容"

5826

5606 -#

5607 -#: read-cache.c:1749

5827 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5828 #, c-format

5609 -msgid "ignoring %.4s extension"

5610 -msgstr "忽略 %.4s 扩展"

5829 +msgid "%s takes no value"

5830 +msgstr "%s 不取值"

5831

5612 -#: read-cache.c:1786

5832 +#: parse-options.c:94

5833 #, c-format

5614 -msgid "unknown index entry format 0x%08x"

5615 -msgstr "未知的索引条目格式 0x%08x"

5834 +msgid "%s isn't available"

5835 +msgstr "%s 不可用"

5836

5617 -#: read-cache.c:1802

5837 +#: parse-options.c:217

5838 #, c-format

5619 -msgid "malformed name field in the index, near path '%s'"

5620 -msgstr "索引中靠近路径 '%s' 有错误的名称字段"

5839 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5840 +msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

5841

5622 -#: read-cache.c:1859

5623 -msgid "unordered stage entries in index"

5624 -msgstr "索引中有未排序的暂存条目"

5842 +#: parse-options.c:386

5843 +#, c-format

5844 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5845 +msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5846

5626 -#: read-cache.c:1862

5847 +#: parse-options.c:420 parse-options.c:428

5848 #, c-format

5628 -msgid "multiple stage entries for merged file '%s'"

5629 -msgstr "合并文件 '%s' 有多个暂存条目"

5849 +msgid "did you mean `--%s` (with two dashes)?"

5850 +msgstr "你的意思是 `--%s`（有两个短线）？"

5851

5631 -#: read-cache.c:1865

5852 +#: parse-options.c:666 parse-options.c:971

5853 #, c-format

5633 -msgid "unordered stage entries for '%s'"

5634 -msgstr "'%s' 的未排序暂存条目"

5854 +msgid "alias of --%s"

5855 +msgstr "--%s 的别名"

5856

5636 -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5637 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5638 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5639 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5640 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5641 -#: builtin/submodule--helper.c:332

5642 -msgid "index file corrupt"

5643 -msgstr "索引文件损坏"

5857 +#: parse-options.c:862

5858 +#, c-format

5859 +msgid "unknown option `%s'"

5860 +msgstr "未知选项 `%s'"

5861

5645 -#: read-cache.c:2115

5862 +#: parse-options.c:864

5863 #, c-format

5647 -msgid "unable to create load_cache_entries thread: %s"

5648 -msgstr "无法创建 load_cache_entries 线程：%s"

5864 +msgid "unknown switch `%c'"

5865 +msgstr "未知开关 `%c'"

5866

5650 -#: read-cache.c:2128

5867 +#: parse-options.c:866

5868 #, c-format

5652 -msgid "unable to join load_cache_entries thread: %s"

5653 -msgstr "无法加入 load_cache_entries 线程：%s"

5869 +msgid "unknown non-ascii option in string: `%s'"

5870 +msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5871 +

5872 +#: parse-options.c:890

5873 +msgid "..."

5874 +msgstr "..."

5875

5655 -#: read-cache.c:2161

5876 +#: parse-options.c:909

5877 #, c-format

5657 -msgid "%s: index file open failed"

5658 -msgstr "%s：打开索引文件失败"

5878 +msgid "usage: %s"

5879 +msgstr "用法：%s"

5880

5660 -#: read-cache.c:2165

5881 +#. TRANSLATORS: the colon here should align with the

5882 +#. one in "usage: %s" translation.

5883 +#.

5884 +#: parse-options.c:915

5885 #, c-format

5662 -msgid "%s: cannot stat the open index"

5663 -msgstr "%s：不能对打开的索引执行 stat 操作"

5886 +msgid " or: %s"

5887 +msgstr " 或：%s"

5888

5665 -#: read-cache.c:2169

5889 +# 译者：为保证在输出中对齐，注意调整句中空格！

5890 +#: parse-options.c:918

5891 #, c-format

5667 -msgid "%s: index file smaller than expected"

5668 -msgstr "%s：索引文件比预期的小"

5892 +msgid " %s"

5893 +msgstr " %s"

5894 +

5895 +#: parse-options.c:957

5896 +msgid "-NUM"

5897 +msgstr "-数字"

5898

5670 -#: read-cache.c:2173

5899 +#: path.c:915

5900 #, c-format

5672 -msgid "%s: unable to map index file"

5673 -msgstr "%s：无法对索引文件执行 map 操作"

5901 +msgid "Could not make %s writable by group"

5902 +msgstr "不能设置 %s 为组可写"

5903 +

5904 +#: pathspec.c:130

5905 +msgid "Escape character '\\' not allowed as last character in attr value"

5906 +msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

5907 +

5908 +#: pathspec.c:148

5909 +msgid "Only one 'attr:' specification is allowed."

5910 +msgstr "只允许一个 'attr:' 规格。"

5911 +

5912 +#: pathspec.c:151

5913 +msgid "attr spec must not be empty"

5914 +msgstr "属性规格不能为空"

5915

5675 -#: read-cache.c:2215

5916 +#: pathspec.c:194

5917 #, c-format

5677 -msgid "unable to create load_index_extensions thread: %s"

5678 -msgstr "无法创建 load_index_extensions 线程：%s"

5918 +msgid "invalid attribute name %s"

5919 +msgstr "无效的属性名 %s"

5920 +

5921 +#: pathspec.c:259

5922 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5923 +msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

5924 +

5925 +#: pathspec.c:266

5926 +msgid ""

5927 +"global 'literal' pathspec setting is incompatible with all other global "

5928 +"pathspec settings"

5929 +msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

5930 +

5931 +#: pathspec.c:306

5932 +msgid "invalid parameter for pathspec magic 'prefix'"

5933 +msgstr "路径规格包含无效的神奇前缀"

5934

5680 -#: read-cache.c:2242

5935 +#: pathspec.c:327

5936 #, c-format

5682 -msgid "unable to join load_index_extensions thread: %s"

5683 -msgstr "无法加入 load_index_extensions 线程：%s"

5937 +msgid "Invalid pathspec magic '%.*s' in '%s'"

5938 +msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

5939

5685 -#: read-cache.c:2274

5940 +#: pathspec.c:332

5941 #, c-format

5687 -msgid "could not freshen shared index '%s'"

5688 -msgstr "无法刷新共享索引 '%s'"

5942 +msgid "Missing ')' at the end of pathspec magic in '%s'"

5943 +msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

5944

5690 -#: read-cache.c:2321

5945 +#: pathspec.c:370

5946 #, c-format

5692 -msgid "broken index, expect %s in %s, got %s"

5693 -msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5947 +msgid "Unimplemented pathspec magic '%c' in '%s'"

5948 +msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

5949

5695 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5950 +#: pathspec.c:429

5951 #, c-format

5697 -msgid "could not close '%s'"

5698 -msgstr "不能关闭 '%s'"

5952 +msgid "%s: 'literal' and 'glob' are incompatible"

5953 +msgstr "%s：'literal' 和 'glob' 不兼容"

5954

5700 -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5955 +#: pathspec.c:445

5956 #, c-format

5702 -msgid "could not stat '%s'"

5703 -msgstr "不能对 '%s' 调用 stat"

5957 +msgid "%s: '%s' is outside repository at '%s'"

5958 +msgstr "%s：'%s' 在位于 '%s' 的仓库之外"

5959

5705 -#: read-cache.c:3133

5960 +#: pathspec.c:521

5961 #, c-format

5707 -msgid "unable to open git dir: %s"

5708 -msgstr "不能打开 git 目录：%s"

5962 +msgid "'%s' (mnemonic: '%c')"

5963 +msgstr "'%s'（助记符：'%c'）"

5964

5710 -#: read-cache.c:3145

5965 +#: pathspec.c:531

5966 #, c-format

5712 -msgid "unable to unlink: %s"

5713 -msgstr "无法删除：%s"

5967 +msgid "%s: pathspec magic not supported by this command: %s"

5968 +msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

5969

5715 -#: read-cache.c:3170

5970 +#: pathspec.c:598

5971 #, c-format

5717 -msgid "cannot fix permission bits on '%s'"

5718 -msgstr "不能修复 '%s' 的权限位"

5972 +msgid "pathspec '%s' is beyond a symbolic link"

5973 +msgstr "路径规格 '%s' 位于符号链接中"

5974

5720 -#: read-cache.c:3319

5975 +#: pathspec.c:643

5976 #, c-format

5722 -msgid "%s: cannot drop to stage #0"

5723 -msgstr "%s：不能落到暂存区 #0"

5977 +msgid "line is badly quoted: %s"

5978 +msgstr "行被错误地引用：%s"

5979

5725 -#: rebase-interactive.c:11

5726 -msgid ""

5727 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5728 -"continue'.\n"

5729 -"Or you can abort the rebase with 'git rebase --abort'.\n"

5730 -msgstr ""

5731 -"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

5732 -"或者您可以用 'git rebase --abort' 终止变基。\n"

5980 +#: pkt-line.c:92

5981 +msgid "unable to write flush packet"

5982 +msgstr "无法写 flush 包"

5983

5734 -#: rebase-interactive.c:33

5735 -#, c-format

5736 -msgid ""

5737 -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5738 -msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

5984 +#: pkt-line.c:99

5985 +msgid "unable to write delim packet"

5986 +msgstr "无法写 delim 包"

5987

5740 -#: rebase-interactive.c:42

5741 -msgid ""

5742 -"\n"

5743 -"Commands:\n"

5744 -"p, pick <commit> = use commit\n"

5745 -"r, reword <commit> = use commit, but edit the commit message\n"

5746 -"e, edit <commit> = use commit, but stop for amending\n"

5747 -"s, squash <commit> = use commit, but meld into previous commit\n"

5748 -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

5749 -"x, exec <command> = run command (the rest of the line) using shell\n"

5750 -"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

5751 -"d, drop <commit> = remove commit\n"

5752 -"l, label <label> = label current HEAD with a name\n"

5753 -"t, reset <label> = reset HEAD to a label\n"

5754 -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

5755 -". create a merge commit using the original merge commit's\n"

5756 -". message (or the oneline, if no original merge commit was\n"

5757 -". specified). Use -c <commit> to reword the commit message.\n"

5758 -"\n"

5759 -"These lines can be re-ordered; they are executed from top to bottom.\n"

5760 -msgstr ""

5761 -"\n"

5762 -"命令:\n"

5763 -"p, pick <提交> = 使用提交\n"

5764 -"r, reword <提交> = 使用提交，但修改提交说明\n"

5765 -"e, edit <提交> = 使用提交，进入 shell 以便进行提交修补\n"

5766 -"s, squash <提交> = 使用提交，但融合到前一个提交\n"

5767 -"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"

5768 -"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"

5769 -"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"

5770 -"d, drop <提交> = 删除提交\n"

5771 -"l, label <label> = 为当前 HEAD 打上标记\n"

5772 -"t, reset <label> = 重置 HEAD 到该标记\n"

5773 -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

5774 -". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"

5775 -". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"

5776 -". -c <提交> 可以编辑提交说明。\n"

5777 -"\n"

5778 -"可以对这些行重新排序，将从上至下执行。\n"

5988 +#: pkt-line.c:106

5989 +msgid "unable to write stateless separator packet"

5990 +msgstr "无法写入无状态分隔符数据包"

5991

5780 -#: rebase-interactive.c:63

5781 -#, c-format

5782 -msgid "Rebase %s onto %s (%d command)"

5783 -msgid_plural "Rebase %s onto %s (%d commands)"

5784 -msgstr[0] "变基 %s 到 %s（%d 个提交）"

5785 -msgstr[1] "变基 %s 到 %s（%d 个提交）"

5992 +#: pkt-line.c:113

5993 +msgid "flush packet write failed"

5994 +msgstr "flush 包写错误"

5995

5787 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5788 -msgid ""

5789 -"\n"

5790 -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

5791 -msgstr ""

5792 -"\n"

5793 -"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

5996 +#: pkt-line.c:153 pkt-line.c:239

5997 +msgid "protocol error: impossibly long line"

5998 +msgstr "协议错误：不可能的长行"

5999

5795 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5796 -msgid ""

5797 -"\n"

5798 -"If you remove a line here THAT COMMIT WILL BE LOST.\n"

5799 -msgstr ""

5800 -"\n"

5801 -"如果您在这里删除一行，对应的提交将会丢失。\n"

6000 +#: pkt-line.c:169 pkt-line.c:171

6001 +msgid "packet write with format failed"

6002 +msgstr "格式化包写入错误"

6003

5803 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5804 -msgid ""

5805 -"\n"

5806 -"You are editing the todo file of an ongoing interactive rebase.\n"

5807 -"To continue rebase after editing, run:\n"

5808 -" git rebase --continue\n"

5809 -"\n"

5810 -msgstr ""

5811 -"\n"

5812 -"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"

5813 -"请执行：\n"

5814 -" git rebase --continue\n"

5815 -"\n"

6004 +#: pkt-line.c:203

6005 +msgid "packet write failed - data exceeds max packet size"

6006 +msgstr "写数据包失败：数据超过了包的最大长度"

6007

5817 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

5818 -msgid ""

5819 -"\n"

5820 -"However, if you remove everything, the rebase will be aborted.\n"

5821 -"\n"

5822 -msgstr ""

5823 -"\n"

5824 -"然而，如果您删除全部内容，变基操作将会终止。\n"

5825 -"\n"

6008 +#: pkt-line.c:210 pkt-line.c:217

6009 +msgid "packet write failed"

6010 +msgstr "数据包写入失败"

6011

5827 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5828 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

5829 -#, c-format

5830 -msgid "could not write '%s'"

5831 -msgstr "不能写入 '%s'"

6012 +#: pkt-line.c:302

6013 +msgid "read error"

6014 +msgstr "读取错误"

6015

5833 -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5834 -#: builtin/rebase.c:252

5835 -#, c-format

5836 -msgid "could not write '%s'."

5837 -msgstr "不能写入 '%s'。"

6016 +#: pkt-line.c:310

6017 +msgid "the remote end hung up unexpectedly"

6018 +msgstr "远端意外挂断了"

6019

5839 -#: rebase-interactive.c:193

6020 +#: pkt-line.c:338

6021 #, c-format

5841 -msgid ""

5842 -"Warning: some commits may have been dropped accidentally.\n"

5843 -"Dropped commits (newer to older):\n"

5844 -msgstr ""

5845 -"警告：一些提交可能被意外丢弃。\n"

5846 -"丢弃的提交（从新到旧）：\n"

6022 +msgid "protocol error: bad line length character: %.4s"

6023 +msgstr "协议错误：错误的行长度字符串：%.4s"

6024

5848 -#: rebase-interactive.c:200

6025 +#: pkt-line.c:352 pkt-line.c:357

6026 #, c-format

5850 -msgid ""

5851 -"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

5852 -"\n"

5853 -"Use 'git config rebase.missingCommitsCheck' to change the level of "

5854 -"warnings.\n"

5855 -"The possible behaviours are: ignore, warn, error.\n"

5856 -"\n"

5857 -msgstr ""

5858 -"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"

5859 -"\n"

5860 -"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"

5861 -"可选值有：ignore、warn、error。\n"

5862 -"\n"

6027 +msgid "protocol error: bad line length %d"

6028 +msgstr "协议错误：错误的行长度 %d"

6029

5864 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5865 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5866 -#: builtin/rebase.c:264

6030 +#: pkt-line.c:373 sideband.c:165

6031 #, c-format

5868 -msgid "could not read '%s'."

5869 -msgstr "不能读取 '%s'。"

6032 +msgid "remote error: %s"

6033 +msgstr "远程错误：%s"

6034

5871 -#: ref-filter.c:42 wt-status.c:1973

5872 -msgid "gone"

5873 -msgstr "丢失"

6035 +#: preload-index.c:125

6036 +msgid "Refreshing index"

6037 +msgstr "正在刷新索引"

6038

5875 -#: ref-filter.c:43

6039 +#: preload-index.c:144

6040 #, c-format

5877 -msgid "ahead %d"

5878 -msgstr "领先 %d"

6041 +msgid "unable to create threaded lstat: %s"

6042 +msgstr "无法创建线程 lstat：%s"

6043

5880 -#: ref-filter.c:44

5881 -#, c-format

5882 -msgid "behind %d"

5883 -msgstr "落后 %d"

6044 +#: pretty.c:984

6045 +msgid "unable to parse --pretty format"

6046 +msgstr "不能解析 --pretty 格式"

6047

5885 -#: ref-filter.c:45

5886 -#, c-format

5887 -msgid "ahead %d, behind %d"

5888 -msgstr "领先 %d，落后 %d"

6048 +#: promisor-remote.c:30

6049 +msgid "promisor-remote: unable to fork off fetch subprocess"

6050 +msgstr "promisor-remote：无法派生 fetch 子进程"

6051

5890 -#: ref-filter.c:169

5891 -#, c-format

5892 -msgid "expected format: %%(color:<color>)"

5893 -msgstr "期望的格式：%%(color:<颜色>)"

6052 +#: promisor-remote.c:35 promisor-remote.c:37

6053 +msgid "promisor-remote: could not write to fetch subprocess"

6054 +msgstr "promisor-remote：无法向 fetch 子进程写入"

6055

5895 -#: ref-filter.c:171

5896 -#, c-format

5897 -msgid "unrecognized color: %%(color:%s)"

5898 -msgstr "未能识别的颜色：%%(color:%s)"

6056 +#: promisor-remote.c:41

6057 +msgid "promisor-remote: could not close stdin to fetch subprocess"

6058 +msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"

6059

5900 -#: ref-filter.c:193

6060 +#: promisor-remote.c:53

6061 #, c-format

5902 -msgid "Integer value expected refname:lstrip=%s"

5903 -msgstr "期望整数值 refname:lstrip=%s"

6062 +msgid "promisor remote name cannot begin with '/': %s"

6063 +msgstr "promisor 远程名称不能以 '/' 开始：%s"

6064

5905 -#: ref-filter.c:197

5906 -#, c-format

5907 -msgid "Integer value expected refname:rstrip=%s"

5908 -msgstr "期望整数值 refname:rstrip=%s"

6065 +#: prune-packed.c:35

6066 +msgid "Removing duplicate objects"

6067 +msgstr "正在删除重复对象"

6068

5910 -#: ref-filter.c:199

5911 -#, c-format

5912 -msgid "unrecognized %%(%s) argument: %s"

5913 -msgstr "未能识别的 %%(%s) 参数：%s"

6069 +#: range-diff.c:78

6070 +msgid "could not start `log`"

6071 +msgstr "不能启动 `log`"

6072

5915 -#: ref-filter.c:254

5916 -#, c-format

5917 -msgid "%%(objecttype) does not take arguments"

5918 -msgstr "%%(objecttype) 不带参数"

6073 +#: range-diff.c:80

6074 +msgid "could not read `log` output"

6075 +msgstr "不能读取 `log` 的输出"

6076

5920 -#: ref-filter.c:276

6077 +#: range-diff.c:101 sequencer.c:5318

6078 #, c-format

5922 -msgid "unrecognized %%(objectsize) argument: %s"

5923 -msgstr "未能识别的 %%(objectsize) 参数：%s"

6079 +msgid "could not parse commit '%s'"

6080 +msgstr "不能解析提交 '%s'"

6081

5925 -#: ref-filter.c:284

6082 +#: range-diff.c:115

6083 #, c-format

5927 -msgid "%%(deltabase) does not take arguments"

5928 -msgstr "%%(deltabase) 不带参数"

6084 +msgid ""

6085 +"could not parse first line of `log` output: did not start with 'commit ': "

6086 +"'%s'"

6087 +msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"

6088

5930 -#: ref-filter.c:296

6089 +#: range-diff.c:140

6090 #, c-format

5932 -msgid "%%(body) does not take arguments"

5933 -msgstr "%%(body) 不带参数"

6091 +msgid "could not parse git header '%.*s'"

6092 +msgstr "无法解析 git 头 '%.*s'"

6093

5935 -#: ref-filter.c:309

5936 -#, c-format

5937 -msgid "unrecognized %%(subject) argument: %s"

5938 -msgstr "未能识别的 %%(subject) 参数：%s"

6094 +#: range-diff.c:306

6095 +msgid "failed to generate diff"

6096 +msgstr "生成 diff 失败"

6097

5940 -#: ref-filter.c:330

5941 -#, c-format

5942 -msgid "unknown %%(trailers) argument: %s"

5943 -msgstr "未知的 %%(trailers) 参数：%s"

6098 +#: range-diff.c:558

6099 +msgid "--left-only and --right-only are mutually exclusive"

6100 +msgstr "--left-only 和 --right-only 互斥"

6101

5945 -#: ref-filter.c:363

6102 +#: range-diff.c:561 range-diff.c:563

6103 #, c-format

5947 -msgid "positive value expected contents:lines=%s"

5948 -msgstr "期望一个正数 contents:lines=%s"

6104 +msgid "could not parse log for '%s'"

6105 +msgstr "不能解析 '%s' 的日志"

6106

5950 -#: ref-filter.c:365

6107 +#: read-cache.c:682

6108 #, c-format

5952 -msgid "unrecognized %%(contents) argument: %s"

5953 -msgstr "未能识别的 %%(contents) 参数：%s"

6109 +msgid "will not add file alias '%s' ('%s' already exists in index)"

6110 +msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

6111 +

6112 +#: read-cache.c:698

6113 +msgid "cannot create an empty blob in the object database"

6114 +msgstr "不能在对象数据库中创建空的数据对象"

6115

5955 -#: ref-filter.c:380

6116 +#: read-cache.c:720

6117 #, c-format

5957 -msgid "positive value expected '%s' in %%(%s)"

5958 -msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"

6118 +msgid "%s: can only add regular files, symbolic links or git-directories"

6119 +msgstr "%s：只能添加常规文件、符号链接或 git 目录"

6120

5960 -#: ref-filter.c:384

6121 +#: read-cache.c:725

6122 #, c-format

5962 -msgid "unrecognized argument '%s' in %%(%s)"

5963 -msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"

6123 +msgid "'%s' does not have a commit checked out"

6124 +msgstr "'%s' 没有检出一个提交"

6125

5965 -#: ref-filter.c:398

6126 +#: read-cache.c:777

6127 #, c-format

5967 -msgid "unrecognized email option: %s"

5968 -msgstr "未识别的邮件选项：%s"

6128 +msgid "unable to index file '%s'"

6129 +msgstr "无法索引文件 '%s'"

6130

5970 -#: ref-filter.c:428

6131 +#: read-cache.c:796

6132 #, c-format

5972 -msgid "expected format: %%(align:<width>,<position>)"

5973 -msgstr "期望的格式：%%(align:<宽度>,<位置>)"

6133 +msgid "unable to add '%s' to index"

6134 +msgstr "无法在索引中添加 '%s'"

6135

5975 -#: ref-filter.c:440

6136 +#: read-cache.c:807

6137 #, c-format

5977 -msgid "unrecognized position:%s"

5978 -msgstr "未能识别的位置：%s"

6138 +msgid "unable to stat '%s'"

6139 +msgstr "无法对 %s 执行 stat"

6140

5980 -#: ref-filter.c:447

6141 +#: read-cache.c:1318

6142 #, c-format

5982 -msgid "unrecognized width:%s"

5983 -msgstr "未能识别的宽度：%s"

6143 +msgid "'%s' appears as both a file and as a directory"

6144 +msgstr "'%s' 看起来既是文件又是目录"

6145

5985 -#: ref-filter.c:456

5986 -#, c-format

5987 -msgid "unrecognized %%(align) argument: %s"

5988 -msgstr "未能识别的 %%(align) 参数：%s"

6146 +#: read-cache.c:1532

6147 +msgid "Refresh index"

6148 +msgstr "刷新索引"

6149

5990 -#: ref-filter.c:464

6150 +#: read-cache.c:1657

6151 #, c-format

5992 -msgid "positive width expected with the %%(align) atom"

5993 -msgstr "元素 %%(align) 需要一个正数的宽度"

6152 +msgid ""

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

6154 +"Using version %i"

6155 +msgstr ""

6156 +"设置了 index.version，但是取值无效。\n"

6157 +"使用版本 %i"

6158

5995 -#: ref-filter.c:482

6159 +#: read-cache.c:1667

6160 #, c-format

5997 -msgid "unrecognized %%(if) argument: %s"

5998 -msgstr "未能识别的 %%(if) 参数：%s"

6161 +msgid ""

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

6163 +"Using version %i"

6164 +msgstr ""

6165 +"设置了 GIT_INDEX_VERSION，但是取值无效。\n"

6166 +"使用版本 %i"

6167

6000 -#: ref-filter.c:584

6168 +#: read-cache.c:1723

6169 #, c-format

6002 -msgid "malformed field name: %.*s"

6003 -msgstr "格式错误的字段名：%.*s"

6170 +msgid "bad signature 0x%08x"

6171 +msgstr "坏的签名 0x%08x"

6172

6005 -#: ref-filter.c:611

6173 +#: read-cache.c:1726

6174 #, c-format

6007 -msgid "unknown field name: %.*s"

6008 -msgstr "未知的字段名：%.*s"

6175 +msgid "bad index version %d"

6176 +msgstr "坏的索引版本 %d"

6177

6010 -#: ref-filter.c:615

6011 -#, c-format

6012 -msgid ""

6013 -"not a git repository, but the field '%.*s' requires access to object data"

6014 -msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"

6178 +#: read-cache.c:1735

6179 +msgid "bad index file sha1 signature"

6180 +msgstr "坏的索引文件 sha1 签名"

6181

6016 -#: ref-filter.c:739

6182 +#: read-cache.c:1765

6183 #, c-format

6018 -msgid "format: %%(if) atom used without a %%(then) atom"

6019 -msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

6184 +msgid "index uses %.4s extension, which we do not understand"

6185 +msgstr "索引使用不被支持的 %.4s 扩展"

6186

6021 -#: ref-filter.c:802

6187 +#

6188 +#: read-cache.c:1767

6189 #, c-format

6023 -msgid "format: %%(then) atom used without an %%(if) atom"

6024 -msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

6190 +msgid "ignoring %.4s extension"

6191 +msgstr "忽略 %.4s 扩展"

6192

6026 -#: ref-filter.c:804

6193 +#: read-cache.c:1804

6194 #, c-format

6028 -msgid "format: %%(then) atom used more than once"

6029 -msgstr "格式：%%(then) 元素用了多次"

6195 +msgid "unknown index entry format 0x%08x"

6196 +msgstr "未知的索引条目格式 0x%08x"

6197

6031 -#: ref-filter.c:806

6198 +#: read-cache.c:1820

6199 #, c-format

6033 -msgid "format: %%(then) atom used after %%(else)"

6034 -msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

6200 +msgid "malformed name field in the index, near path '%s'"

6201 +msgstr "索引中靠近路径 '%s' 有错误的名称字段"

6202 +

6203 +#: read-cache.c:1877

6204 +msgid "unordered stage entries in index"

6205 +msgstr "索引中有未排序的暂存条目"

6206

6036 -#: ref-filter.c:834

6207 +#: read-cache.c:1880

6208 #, c-format

6038 -msgid "format: %%(else) atom used without an %%(if) atom"

6039 -msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

6209 +msgid "multiple stage entries for merged file '%s'"

6210 +msgstr "合并文件 '%s' 有多个暂存条目"

6211

6041 -#: ref-filter.c:836

6212 +#: read-cache.c:1883

6213 #, c-format

6043 -msgid "format: %%(else) atom used without a %%(then) atom"

6044 -msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

6214 +msgid "unordered stage entries for '%s'"

6215 +msgstr "'%s' 的未排序暂存条目"

6216

6046 -#: ref-filter.c:838

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

6222 +#: builtin/submodule--helper.c:332

6223 +msgid "index file corrupt"

6224 +msgstr "索引文件损坏"

6225 +

6226 +#: read-cache.c:2133

6227 #, c-format

6048 -msgid "format: %%(else) atom used more than once"

6049 -msgstr "格式：%%(else) 元素用了多次"

6228 +msgid "unable to create load_cache_entries thread: %s"

6229 +msgstr "无法创建 load_cache_entries 线程：%s"

6230

6051 -#: ref-filter.c:853

6231 +#: read-cache.c:2146

6232 #, c-format

6053 -msgid "format: %%(end) atom used without corresponding atom"

6054 -msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

6233 +msgid "unable to join load_cache_entries thread: %s"

6234 +msgstr "无法加入 load_cache_entries 线程：%s"

6235

6056 -#: ref-filter.c:910

6236 +#: read-cache.c:2179

6237 #, c-format

6058 -msgid "malformed format string %s"

6059 -msgstr "错误的格式化字符串 %s"

6238 +msgid "%s: index file open failed"

6239 +msgstr "%s：打开索引文件失败"

6240

6061 -#: ref-filter.c:1549

6241 +#: read-cache.c:2183

6242 #, c-format

6063 -msgid "no branch, rebasing %s"

6064 -msgstr "非分支，正变基 %s"

6243 +msgid "%s: cannot stat the open index"

6244 +msgstr "%s：不能对打开的索引执行 stat 操作"

6245

6066 -#: ref-filter.c:1552

6246 +#: read-cache.c:2187

6247 #, c-format

6068 -msgid "no branch, rebasing detached HEAD %s"

6069 -msgstr "非分支，正变基分离头指针 %s"

6248 +msgid "%s: index file smaller than expected"

6249 +msgstr "%s：索引文件比预期的小"

6250

6071 -#: ref-filter.c:1555

6251 +#: read-cache.c:2191

6252 #, c-format

6073 -msgid "no branch, bisect started on %s"

6074 -msgstr "非分支，二分查找开始于 %s"

6253 +msgid "%s: unable to map index file"

6254 +msgstr "%s：无法对索引文件执行 map 操作"

6255

6076 -#: ref-filter.c:1565

6077 -msgid "no branch"

6078 -msgstr "非分支"

6256 +#: read-cache.c:2233

6257 +#, c-format

6258 +msgid "unable to create load_index_extensions thread: %s"

6259 +msgstr "无法创建 load_index_extensions 线程：%s"

6260

6080 -#: ref-filter.c:1599 ref-filter.c:1808

6261 +#: read-cache.c:2260

6262 #, c-format

6082 -msgid "missing object %s for %s"

6083 -msgstr "缺失 %2$s 的对象 %1$s"

6263 +msgid "unable to join load_index_extensions thread: %s"

6264 +msgstr "无法加入 load_index_extensions 线程：%s"

6265

6085 -#: ref-filter.c:1609

6266 +#: read-cache.c:2292

6267 #, c-format

6087 -msgid "parse_object_buffer failed on %s for %s"

6088 -msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

6268 +msgid "could not freshen shared index '%s'"

6269 +msgstr "无法刷新共享索引 '%s'"

6270

6090 -#: ref-filter.c:2062

6271 +#: read-cache.c:2339

6272 #, c-format

6092 -msgid "malformed object at '%s'"

6093 -msgstr "格式错误的对象 '%s'"

6273 +msgid "broken index, expect %s in %s, got %s"

6274 +msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6275

6095 -#: ref-filter.c:2151

6276 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

6277 #, c-format

6097 -msgid "ignoring ref with broken name %s"

6098 -msgstr "忽略带有错误名称 %s 的引用"

6278 +msgid "could not close '%s'"

6279 +msgstr "不能关闭 '%s'"

6280

6100 -#: ref-filter.c:2156 refs.c:676

6281 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

6282 #, c-format

6102 -msgid "ignoring broken ref %s"

6103 -msgstr "忽略损坏的引用 %s"

6283 +msgid "could not stat '%s'"

6284 +msgstr "不能对 '%s' 调用 stat"

6285

6105 -#: ref-filter.c:2472

6286 +#: read-cache.c:3151

6287 #, c-format

6107 -msgid "format: %%(end) atom missing"

6108 -msgstr "格式：缺少 %%(end) 元素"

6288 +msgid "unable to open git dir: %s"

6289 +msgstr "不能打开 git 目录：%s"

6290

6110 -#: ref-filter.c:2571

6291 +#: read-cache.c:3163

6292 #, c-format

6112 -msgid "malformed object name %s"

6113 -msgstr "格式错误的对象名 %s"

6293 +msgid "unable to unlink: %s"

6294 +msgstr "无法删除：%s"

6295

6115 -#: ref-filter.c:2576

6296 +#: read-cache.c:3188

6297 #, c-format

6117 -msgid "option `%s' must point to a commit"

6118 -msgstr "选项 `%s' 必须指向一个提交"

6298 +msgid "cannot fix permission bits on '%s'"

6299 +msgstr "不能修复 '%s' 的权限位"

6300

6120 -#: refs.c:264

6301 +#: read-cache.c:3337

6302 #, c-format

6122 -msgid "%s does not point to a valid object!"

6123 -msgstr "%s 没有指向一个有效的对象！"

6303 +msgid "%s: cannot drop to stage #0"

6304 +msgstr "%s：不能落到暂存区 #0"

6305

6125 -#: refs.c:566

6306 +#: rebase-interactive.c:11

6307 +msgid ""

6308 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

6309 +"continue'.\n"

6310 +"Or you can abort the rebase with 'git rebase --abort'.\n"

6311 +msgstr ""

6312 +"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

6313 +"或者您可以用 'git rebase --abort' 终止变基。\n"

6314 +

6315 +#: rebase-interactive.c:33

6316 #, c-format

6317 msgid ""

6128 -"Using '%s' as the name for the initial branch. This default branch name\n"

6129 -"is subject to change. To configure the initial branch name to use in all\n"

6130 -"of your new repositories, which will suppress this warning, call:\n"

6131 -"\n"

6132 -"\tgit config --global init.defaultBranch <name>\n"

6318 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

6319 +msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

6320 +

6321 +#: rebase-interactive.c:42

6322 +msgid ""

6323 "\n"

6134 -"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"

6135 -"'development'. The just-created branch can be renamed via this command:\n"

6324 +"Commands:\n"

6325 +"p, pick <commit> = use commit\n"

6326 +"r, reword <commit> = use commit, but edit the commit message\n"

6327 +"e, edit <commit> = use commit, but stop for amending\n"

6328 +"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"

6330 +"x, exec <command> = run command (the rest of the line) using shell\n"

6331 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

6332 +"d, drop <commit> = remove commit\n"

6333 +"l, label <label> = label current HEAD with a name\n"

6334 +"t, reset <label> = reset HEAD to a label\n"

6335 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6336 +". create a merge commit using the original merge commit's\n"

6337 +". message (or the oneline, if no original merge commit was\n"

6338 +". specified). Use -c <commit> to reword the commit message.\n"

6339 "\n"

6137 -"\tgit branch -m <name>\n"

6340 +"These lines can be re-ordered; they are executed from top to bottom.\n"

6341 msgstr ""

6139 -"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"

6140 -"配置使用初始分支名，并消除这条警告，请执行：\n"

6342 "\n"

6142 -"\tgit config --global init.defaultBranch <名称>\n"

6143 -"\n"

6144 -"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"

6145 -"可以通过以下命令重命名刚创建的分支：\n"

6343 +"命令:\n"

6344 +"p, pick <提交> = 使用提交\n"

6345 +"r, reword <提交> = 使用提交，但修改提交说明\n"

6346 +"e, edit <提交> = 使用提交，进入 shell 以便进行提交修补\n"

6347 +"s, squash <提交> = 使用提交，但融合到前一个提交\n"

6348 +"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"

6349 +"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"

6350 +"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"

6351 +"d, drop <提交> = 删除提交\n"

6352 +"l, label <label> = 为当前 HEAD 打上标记\n"

6353 +"t, reset <label> = 重置 HEAD 到该标记\n"

6354 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6355 +". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"

6356 +". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"

6357 +". -c <提交> 可以编辑提交说明。\n"

6358 "\n"

6147 -"\tgit branch -m <name>\n"

6148 -

6149 -#: refs.c:588

6150 -#, c-format

6151 -msgid "could not retrieve `%s`"

6152 -msgstr "无法获取 `%s`"

6359 +"可以对这些行重新排序，将从上至下执行。\n"

6360

6154 -#: refs.c:598

6361 +#: rebase-interactive.c:63

6362 #, c-format

6156 -msgid "invalid branch name: %s = %s"

6157 -msgstr "无效的分支名：%s = %s"

6363 +msgid "Rebase %s onto %s (%d command)"

6364 +msgid_plural "Rebase %s onto %s (%d commands)"

6365 +msgstr[0] "变基 %s 到 %s（%d 个提交）"

6366 +msgstr[1] "变基 %s 到 %s（%d 个提交）"

6367

6159 -#: refs.c:674

6160 -#, c-format

6161 -msgid "ignoring dangling symref %s"

6162 -msgstr "忽略悬空符号引用 %s"

6368 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

6369 +msgid ""

6370 +"\n"

6371 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

6372 +msgstr ""

6373 +"\n"

6374 +"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

6375

6164 -#: refs.c:911

6165 -#, c-format

6166 -msgid "log for ref %s has gap after %s"

6167 -msgstr "引用 %s 的日志在 %s 之后有缺口"

6376 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

6377 +msgid ""

6378 +"\n"

6379 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

6380 +msgstr ""

6381 +"\n"

6382 +"如果您在这里删除一行，对应的提交将会丢失。\n"

6383

6169 -#: refs.c:917

6170 -#, c-format

6171 -msgid "log for ref %s unexpectedly ended on %s"

6172 -msgstr "引用 %s 的日志意外终止于 %s "

6384 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

6385 +msgid ""

6386 +"\n"

6387 +"You are editing the todo file of an ongoing interactive rebase.\n"

6388 +"To continue rebase after editing, run:\n"

6389 +" git rebase --continue\n"

6390 +"\n"

6391 +msgstr ""

6392 +"\n"

6393 +"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"

6394 +"请执行：\n"

6395 +" git rebase --continue\n"

6396 +"\n"

6397

6174 -#: refs.c:976

6175 -#, c-format

6176 -msgid "log for %s is empty"

6177 -msgstr "%s 的日志为空"

6398 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

6399 +msgid ""

6400 +"\n"

6401 +"However, if you remove everything, the rebase will be aborted.\n"

6402 +"\n"

6403 +msgstr ""

6404 +"\n"

6405 +"然而，如果您删除全部内容，变基操作将会终止。\n"

6406 +"\n"

6407

6179 -#: refs.c:1068

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

6410 #, c-format

6181 -msgid "refusing to update ref with bad name '%s'"

6182 -msgstr "拒绝更新有错误名称 '%s' 的引用"

6411 +msgid "could not write '%s'"

6412 +msgstr "不能写入 '%s'"

6413

6184 -#: refs.c:1139

6414 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230

6415 +#: builtin/rebase.c:254

6416 #, c-format

6186 -msgid "update_ref failed for ref '%s': %s"

6187 -msgstr "对引用 '%s' 执行 update_ref 失败：%s"

6417 +msgid "could not write '%s'."

6418 +msgstr "不能写入 '%s'。"

6419

6189 -#: refs.c:1963

6420 +#: rebase-interactive.c:193

6421 #, c-format

6191 -msgid "multiple updates for ref '%s' not allowed"

6192 -msgstr "不允许对引用 '%s' 多次更新"

6193 -

6194 -#: refs.c:2043

6195 -msgid "ref updates forbidden inside quarantine environment"

6196 -msgstr "在隔离环境中禁止更新引用"

6197 -

6198 -#: refs.c:2054

6199 -msgid "ref updates aborted by hook"

6200 -msgstr "引用更新被钩子中止"

6422 +msgid ""

6423 +"Warning: some commits may have been dropped accidentally.\n"

6424 +"Dropped commits (newer to older):\n"

6425 +msgstr ""

6426 +"警告：一些提交可能被意外丢弃。\n"

6427 +"丢弃的提交（从新到旧）：\n"

6428

6202 -#: refs.c:2154 refs.c:2184

6429 +#: rebase-interactive.c:200

6430 #, c-format

6204 -msgid "'%s' exists; cannot create '%s'"

6205 -msgstr "'%s' 已存在，无法创建 '%s'"

6431 +msgid ""

6432 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

6433 +"\n"

6434 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

6435 +"warnings.\n"

6436 +"The possible behaviours are: ignore, warn, error.\n"

6437 +"\n"

6438 +msgstr ""

6439 +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"

6440 +"\n"

6441 +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"

6442 +"可选值有：ignore、warn、error。\n"

6443 +"\n"

6444

6207 -#: refs.c:2160 refs.c:2195

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

6448 #, c-format

6209 -msgid "cannot process '%s' and '%s' at the same time"

6210 -msgstr "无法同时处理 '%s' 和 '%s'"

6449 +msgid "could not read '%s'."

6450 +msgstr "不能读取 '%s'。"

6451

6212 -#: refs/files-backend.c:1228

6213 -#, c-format

6214 -msgid "could not remove reference %s"

6215 -msgstr "无法删除引用 %s"

6452 +#: ref-filter.c:42 wt-status.c:1975

6453 +msgid "gone"

6454 +msgstr "丢失"

6455

6217 -#: refs/files-backend.c:1242 refs/packed-backend.c:1542

6218 -#: refs/packed-backend.c:1552

6456 +#: ref-filter.c:43

6457 #, c-format

6220 -msgid "could not delete reference %s: %s"

6221 -msgstr "无法删除引用 %s：%s"

6458 +msgid "ahead %d"

6459 +msgstr "领先 %d"

6460

6223 -#: refs/files-backend.c:1245 refs/packed-backend.c:1555

6461 +#: ref-filter.c:44

6462 #, c-format

6225 -msgid "could not delete references: %s"

6226 -msgstr "无法删除引用：%s"

6463 +msgid "behind %d"

6464 +msgstr "落后 %d"

6465

6228 -#: refspec.c:170

6466 +#: ref-filter.c:45

6467 #, c-format

6230 -msgid "invalid refspec '%s'"

6231 -msgstr "无效的引用表达式：'%s'"

6468 +msgid "ahead %d, behind %d"

6469 +msgstr "领先 %d，落后 %d"

6470

6233 -#: remote.c:351

6471 +#: ref-filter.c:175

6472 #, c-format

6235 -msgid "config remote shorthand cannot begin with '/': %s"

6236 -msgstr "配置的远程短名称不能以 '/' 开始：%s"

6237 -

6238 -#: remote.c:399

6239 -msgid "more than one receivepack given, using the first"

6240 -msgstr "提供了一个以上的 receivepack，使用第一个"

6241 -

6242 -#: remote.c:407

6243 -msgid "more than one uploadpack given, using the first"

6244 -msgstr "提供了一个以上的 uploadpack，使用第一个"

6473 +msgid "expected format: %%(color:<color>)"

6474 +msgstr "期望的格式：%%(color:<颜色>)"

6475

6246 -#: remote.c:590

6476 +#: ref-filter.c:177

6477 #, c-format

6248 -msgid "Cannot fetch both %s and %s to %s"

6249 -msgstr "不能同时获取 %s 和 %s 至 %s"

6478 +msgid "unrecognized color: %%(color:%s)"

6479 +msgstr "未能识别的颜色：%%(color:%s)"

6480

6251 -#: remote.c:594

6481 +#: ref-filter.c:199

6482 #, c-format

6253 -msgid "%s usually tracks %s, not %s"

6254 -msgstr "%s 通常跟踪 %s，而非 %s"

6483 +msgid "Integer value expected refname:lstrip=%s"

6484 +msgstr "期望整数值 refname:lstrip=%s"

6485

6256 -#: remote.c:598

6486 +#: ref-filter.c:203

6487 #, c-format

6258 -msgid "%s tracks both %s and %s"

6259 -msgstr "%s 同时跟踪 %s 和 %s"

6488 +msgid "Integer value expected refname:rstrip=%s"

6489 +msgstr "期望整数值 refname:rstrip=%s"

6490

6261 -#: remote.c:666

6491 +#: ref-filter.c:205

6492 #, c-format

6263 -msgid "key '%s' of pattern had no '*'"

6264 -msgstr "模式的键 '%s' 没有 '*'"

6493 +msgid "unrecognized %%(%s) argument: %s"

6494 +msgstr "未能识别的 %%(%s) 参数：%s"

6495

6266 -#: remote.c:676

6496 +#: ref-filter.c:260

6497 #, c-format

6268 -msgid "value '%s' of pattern has no '*'"

6269 -msgstr "模式的值 '%s' 没有 '*'"

6498 +msgid "%%(objecttype) does not take arguments"

6499 +msgstr "%%(objecttype) 不带参数"

6500

6271 -#: remote.c:1073

6501 +#: ref-filter.c:282

6502 #, c-format

6273 -msgid "src refspec %s does not match any"

6274 -msgstr "源引用表达式 %s 没有匹配"

6503 +msgid "unrecognized %%(objectsize) argument: %s"

6504 +msgstr "未能识别的 %%(objectsize) 参数：%s"

6505

6276 -#: remote.c:1078

6506 +#: ref-filter.c:290

6507 #, c-format

6278 -msgid "src refspec %s matches more than one"

6279 -msgstr "源引用表达式 %s 匹配超过一个"

6508 +msgid "%%(deltabase) does not take arguments"

6509 +msgstr "%%(deltabase) 不带参数"

6510

6281 -#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

6282 -#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6283 -#. the <src>.

6284 -#.

6285 -#: remote.c:1093

6511 +#: ref-filter.c:302

6512 #, c-format

6287 -msgid ""

6288 -"The destination you provided is not a full refname (i.e.,\n"

6289 -"starting with \"refs/\"). We tried to guess what you meant by:\n"

6290 -"\n"

6291 -"- Looking for a ref that matches '%s' on the remote side.\n"

6292 -"- Checking if the <src> being pushed ('%s')\n"

6293 -" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

6294 -" refs/{heads,tags}/ prefix on the remote side.\n"

6295 -"\n"

6296 -"Neither worked, so we gave up. You must fully qualify the ref."

6297 -msgstr ""

6298 -"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"

6299 -"试着猜测您的想法：\n"

6300 -"\n"

6301 -"- 在远端查询和 '%s' 匹配的引用。\n"

6302 -"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"

6303 -" 引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"

6304 -"\n"

6305 -"都不行，所以我们已放弃。您必须给出完整的引用。"

6513 +msgid "%%(body) does not take arguments"

6514 +msgstr "%%(body) 不带参数"

6515

6307 -#: remote.c:1113

6516 +#: ref-filter.c:315

6517 #, c-format

6309 -msgid ""

6310 -"The <src> part of the refspec is a commit object.\n"

6311 -"Did you mean to create a new branch by pushing to\n"

6312 -"'%s:refs/heads/%s'?"

6313 -msgstr ""

6314 -"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

6315 -"'%s:refs/heads/%s' 推送么？"

6518 +msgid "unrecognized %%(subject) argument: %s"

6519 +msgstr "未能识别的 %%(subject) 参数：%s"

6520

6317 -#: remote.c:1118

6521 +#: ref-filter.c:334

6522 #, c-format

6319 -msgid ""

6320 -"The <src> part of the refspec is a tag object.\n"

6321 -"Did you mean to create a new tag by pushing to\n"

6322 -"'%s:refs/tags/%s'?"

6323 -msgstr ""

6324 -"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

6325 -"'%s:refs/tags/%s' 推送么？"

6523 +msgid "expected %%(trailers:key=<value>)"

6524 +msgstr "预期 %%(trailers:key=<值>)"

6525

6327 -#: remote.c:1123

6526 +#: ref-filter.c:336

6527 #, c-format

6329 -msgid ""

6330 -"The <src> part of the refspec is a tree object.\n"

6331 -"Did you mean to tag a new tree by pushing to\n"

6332 -"'%s:refs/tags/%s'?"

6333 -msgstr ""

6334 -"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

6335 -"'%s:refs/tags/%s' 推送么？"

6528 +msgid "unknown %%(trailers) argument: %s"

6529 +msgstr "未知的 %%(trailers) 参数：%s"

6530

6337 -#: remote.c:1128

6531 +#: ref-filter.c:367

6532 #, c-format

6339 -msgid ""

6340 -"The <src> part of the refspec is a blob object.\n"

6341 -"Did you mean to tag a new blob by pushing to\n"

6342 -"'%s:refs/tags/%s'?"

6343 -msgstr ""

6344 -"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

6345 -"'%s:refs/tags/%s' 推送么？"

6533 +msgid "positive value expected contents:lines=%s"

6534 +msgstr "期望一个正数 contents:lines=%s"

6535

6347 -#: remote.c:1164

6536 +#: ref-filter.c:369

6537 #, c-format

6349 -msgid "%s cannot be resolved to branch"

6350 -msgstr "%s 无法被解析为分支"

6538 +msgid "unrecognized %%(contents) argument: %s"

6539 +msgstr "未能识别的 %%(contents) 参数：%s"

6540

6352 -#: remote.c:1175

6541 +#: ref-filter.c:384

6542 #, c-format

6354 -msgid "unable to delete '%s': remote ref does not exist"

6355 -msgstr "无法删除 '%s'：远程引用不存在"

6543 +msgid "positive value expected '%s' in %%(%s)"

6544 +msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"

6545

6357 -#: remote.c:1187

6546 +#: ref-filter.c:388

6547 #, c-format

6359 -msgid "dst refspec %s matches more than one"

6360 -msgstr "目标引用表达式 %s 匹配超过一个"

6548 +msgid "unrecognized argument '%s' in %%(%s)"

6549 +msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"

6550

6362 -#: remote.c:1194

6551 +#: ref-filter.c:402

6552 #, c-format

6364 -msgid "dst ref %s receives from more than one src"

6365 -msgstr "目标引用 %s 接收超过一个源"

6366 -

6367 -#: remote.c:1714 remote.c:1815

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

6369 -msgstr "HEAD 没有指向一个分支"

6553 +msgid "unrecognized email option: %s"

6554 +msgstr "未识别的邮件选项：%s"

6555

6371 -#: remote.c:1723

6556 +#: ref-filter.c:432

6557 #, c-format

6373 -msgid "no such branch: '%s'"

6374 -msgstr "没有此分支：'%s'"

6558 +msgid "expected format: %%(align:<width>,<position>)"

6559 +msgstr "期望的格式：%%(align:<宽度>,<位置>)"

6560

6376 -#: remote.c:1726

6561 +#: ref-filter.c:444

6562 #, c-format

6378 -msgid "no upstream configured for branch '%s'"

6379 -msgstr "尚未给分支 '%s' 设置上游"

6563 +msgid "unrecognized position:%s"

6564 +msgstr "未能识别的位置：%s"

6565

6381 -#: remote.c:1732

6566 +#: ref-filter.c:451

6567 #, c-format

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

6384 -msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

6568 +msgid "unrecognized width:%s"

6569 +msgstr "未能识别的宽度：%s"

6570

6386 -#: remote.c:1747

6571 +#: ref-filter.c:460

6572 #, c-format

6388 -msgid "push destination '%s' on remote '%s' has no local tracking branch"

6389 -msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

6573 +msgid "unrecognized %%(align) argument: %s"

6574 +msgstr "未能识别的 %%(align) 参数：%s"

6575

6391 -#: remote.c:1759

6576 +#: ref-filter.c:468

6577 #, c-format

6393 -msgid "branch '%s' has no remote for pushing"

6394 -msgstr "分支 '%s' 没有设置要推送的远程服务器"

6578 +msgid "positive width expected with the %%(align) atom"

6579 +msgstr "元素 %%(align) 需要一个正数的宽度"

6580

6396 -#: remote.c:1769

6581 +#: ref-filter.c:486

6582 #, c-format

6398 -msgid "push refspecs for '%s' do not include '%s'"

6399 -msgstr "向 '%s' 推送引用规格未包含 '%s'"

6400 -

6401 -#: remote.c:1782

6402 -msgid "push has no destination (push.default is 'nothing')"

6403 -msgstr "推送无目标（push.default 是 'nothing'）"

6404 -

6405 -#: remote.c:1804

6406 -msgid "cannot resolve 'simple' push to a single destination"

6407 -msgstr "无法解析 'simple' 推送至一个单独的目标"

6583 +msgid "unrecognized %%(if) argument: %s"

6584 +msgstr "未能识别的 %%(if) 参数：%s"

6585

6409 -#: remote.c:1933

6586 +#: ref-filter.c:588

6587 #, c-format

6411 -msgid "couldn't find remote ref %s"

6412 -msgstr "无法找到远程引用 %s"

6588 +msgid "malformed field name: %.*s"

6589 +msgstr "格式错误的字段名：%.*s"

6590

6414 -#: remote.c:1946

6591 +#: ref-filter.c:615

6592 #, c-format

6416 -msgid "* Ignoring funny ref '%s' locally"

6417 -msgstr "* 在本地忽略可笑的引用 '%s'"

6593 +msgid "unknown field name: %.*s"

l10n: zh_CN: for git v2.31.0 l10n round 1 and 2