5b5336320b · matheusbsbs/matheus-bagliano

@@ -3,7 +3,7 @@

4 # This file is distributed under the same license as the Git package.

5 # Contributors:

6 -# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>

6 +# - Fangyi Zhou <me AT fangyi.io>

7 # - Jiang Xin <worldhello.net AT gmail.com>

8 # - Lian Cheng <rhythm.mail AT gmail.com>

9 # - Ray Chen <oldsharp AT gmail.com>

@@ -1051,7 +1051,7 @@ msgstr "%.*s 不是一个有效的属性名"

1051 #: attr.c:368

1052 #, c-format

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

1054 -msgstr "不允许 %s ：%s:%d"

1054 +msgstr "不允许 %s：%s:%d"

1055

1056 #: attr.c:408

1057 msgid ""

@@ -1614,7 +1614,7 @@ msgstr "提交图文件的校验码错误，可能已经损坏"

1614 #: commit-graph.c:1172

1615 #, c-format

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

1617 -msgstr "提交图形的 OID 顺序不正确：%s 然后 %s"

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

1618

1619 #: commit-graph.c:1182 commit-graph.c:1197

1620 #, c-format

@@ -1638,7 +1638,7 @@ msgstr "无法从提交图形的对象库中解析提交 %s"

1638 #: commit-graph.c:1226

1639 #, c-format

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

1641 -msgstr "提交图形中的提交 %s 的根树 OID 是 %s != %s"

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

1642

1643 #: commit-graph.c:1236

1644 #, c-format

@@ -2618,7 +2618,7 @@ msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

2618

2619 #: diff.c:5322

2620 msgid "generate diffstat"

2621 -msgstr "生成 diffstat"

2621 +msgstr "生成差异统计（diffstat）"

2622

2623 #: diff.c:5324 diff.c:5327 diff.c:5330

2624 msgid "<width>"

@@ -2728,7 +2728,7 @@ msgstr "<n>[/<m>]"

2728

2729 #: diff.c:5386

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

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

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

2732

2733 #: diff.c:5390

2734 msgid "detect renames"

@@ -2818,7 +2818,7 @@ msgstr "<文本>"

2818

2819 #: diff.c:5446

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

2821 -msgstr "使用“锚定差异算法生成差异"

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

2822

2823 #: diff.c:5448 diff.c:5457 diff.c:5460

2824 msgid "<mode>"

@@ -2934,7 +2934,7 @@ msgstr "控制输出中的文件显示顺序"

2934

2935 #: diff.c:5510

2936 msgid "<object-id>"

2937 -msgstr "<对象ID>"

2937 +msgstr "<对象 ID>"

2938

2939 #: diff.c:5511

2940 msgid ""

@@ -3929,7 +3929,7 @@ msgid ""

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

3930 "moving it to %s."

3931 msgstr ""

3932 -"路径更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

3932 +"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"

3933

3934 #: merge-recursive.c:3173

3935 #, c-format

@@ -3946,8 +3946,8 @@ msgid ""

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

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

3948 msgstr ""

3949 -"路径更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移动"

3950 -"到 %5$s。"

3949 +"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"

3950 +"动到 %5$s。"

3951

3952 #: merge-recursive.c:3180

3953 #, c-format

@@ -3955,7 +3955,7 @@ msgid ""

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

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

3957 msgstr ""

3958 -"冲突（文件未知）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

3958 +"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"

3959 "建议将其移动到 %5$s。"

3960

3961 #: merge-recursive.c:3294

@@ -4062,11 +4062,11 @@ msgstr "多包索引缺少必需的包名块"

4062

4063 #: midx.c:145

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

4065 -msgstr "多包索引缺少必需的 OID 扇出块"

4065 +msgstr "多包索引缺少必需的对象 ID 扇出块"

4066

4067 #: midx.c:147

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

4069 -msgstr "多包索引缺少必需的 OID 查询块"

4069 +msgstr "多包索引缺少必需的对象 ID 查询块"

4070

4071 #: midx.c:149

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

@@ -4118,16 +4118,16 @@ msgstr "正在查找引用的包文件"

4118 #, c-format

4119 msgid ""

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

4121 -msgstr "对象ID扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4121 +msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4122

4123 #: midx.c:1067

4124 msgid "Verifying OID order in MIDX"

4125 -msgstr "正在校验 MIDX 中的 OID 顺序"

4125 +msgstr "正在校验 MIDX 中的对象 ID 顺序"

4126

4127 #: midx.c:1076

4128 #, c-format

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

4130 -msgstr "对象ID查询无序：oid[%d] = %s >= %s = oid[%d]"

4130 +msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

4131

4132 #: midx.c:1095

4133 msgid "Sorting objects by packfile"

@@ -4298,7 +4298,7 @@ msgstr "未知开关 `%c'"

4298 #: parse-options.c:863

4299 #, c-format

4300 msgid "unknown non-ascii option in string: `%s'"

4301 -msgstr "字符串中未知的非ascii字符选项：`%s'"

4301 +msgstr "字符串中未知的非 ascii 字符选项：`%s'"

4302

4303 #: parse-options.c:887

4304 msgid "..."

@@ -4551,7 +4551,7 @@ msgstr "无法对 %s 执行 stat"

4551 #: read-cache.c:1314

4552 #, c-format

4553 msgid "'%s' appears as both a file and as a directory"

4554 -msgstr "'%s' 既显示为文件又显示为目录"

4554 +msgstr "'%s' 看起来既是文件又是目录"

4555

4556 #: read-cache.c:1499

4557 msgid "Refresh index"

@@ -4587,7 +4587,7 @@ msgstr "坏的索引版本 %d"

4587

4588 #: read-cache.c:1691

4589 msgid "bad index file sha1 signature"

4590 -msgstr "坏的索引文件哈希值签名"

4590 +msgstr "坏的索引文件 sha1 签名"

4591

4592 #: read-cache.c:1721

4593 #, c-format

@@ -5230,7 +5230,7 @@ msgstr "选项 `%s' 必须指向一个提交"

5230 #: remote.c:363

5231 #, c-format

5232 msgid "config remote shorthand cannot begin with '/': %s"

5233 -msgstr "配置的远程名称不能以 '/' 开始：%s"

5233 +msgstr "配置的远程短名称不能以 '/' 开始：%s"

5234

5235 #: remote.c:410

5236 msgid "more than one receivepack given, using the first"

@@ -6364,7 +6364,7 @@ msgstr "不能检出 %s"

6364 #: sequencer.c:3652

6365 #, c-format

6366 msgid "%s: not a valid OID"

6367 -msgstr "%s：不是一个有效的对象ID"

6367 +msgstr "%s：不是一个有效的对象 ID"

6368

6369 #: sequencer.c:3657 git-rebase--preserve-merges.sh:724

6370 msgid "could not detach HEAD"

@@ -8061,17 +8061,17 @@ msgstr "您在执行反转提交 %s 的操作。"

8061 # 译者：注意保持前导空格

8062 #: wt-status.c:1431

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

8064 -msgstr " （解决冲突并运行 \"git revert --continue\"）"

8064 +msgstr " （解决冲突并执行 \"git revert --continue\"）"

8065

8066 # 译者：注意保持前导空格

8067 #: wt-status.c:1434

8068 msgid " (run \"git revert --continue\" to continue)"

8069 -msgstr " （运行 \"git revert --continue\" 以继续）"

8069 +msgstr " （执行 \"git revert --continue\" 以继续）"

8070

8071 # 译者：注意保持前导空格

8072 #: wt-status.c:1437

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

8074 -msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

8074 +msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"

8075

8076 # 译者：注意保持前导空格

8077 #: wt-status.c:1439

@@ -8924,7 +8924,7 @@ msgstr "坏的 bisect_write 参数：%s"

8924 #: builtin/bisect--helper.c:220

8925 #, c-format

8926 msgid "couldn't get the oid of the rev '%s'"

8927 -msgstr "无法获取版本 '%s' 的对象ID"

8927 +msgstr "无法获取版本 '%s' 的对象 ID"

8928

8929 #: builtin/bisect--helper.c:232

8930 #, c-format

@@ -8959,7 +8959,7 @@ msgstr ""

8959 #: builtin/bisect--helper.c:321

8960 #, c-format

8961 msgid "bisecting only with a %s commit"

8962 -msgstr "二分查找只有一个 %s 提交"

8962 +msgstr "在只有一个 %s 提交的情况下二分查找"

8963

8964 # 译者：注意保持句尾空格

8965 #. TRANSLATORS: Make sure to include [Y] and [n] in your

@@ -9055,7 +9055,7 @@ msgstr "打印二分查找术语"

9055

9056 #: builtin/bisect--helper.c:645

9057 msgid "start the bisect session"

9058 -msgstr "启动二分查找会话"

9058 +msgstr "启动二分查找过程"

9059

9060 #: builtin/bisect--helper.c:647

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

@@ -10865,7 +10865,7 @@ msgstr "父提交"

10865

10866 #: builtin/commit-tree.c:112

10867 msgid "id of a parent commit object"

10868 -msgstr "父提交对象ID"

10868 +msgstr "父提交对象 ID"

10869

10870 #: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268

10871 #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473

@@ -12138,11 +12138,11 @@ msgstr "匿名输出"

12138

12139 #: builtin/fast-export.c:1106

12140 msgid "Reference parents which are not in fast-export stream by object id"

12141 -msgstr "引用父对象ID不在 fast-export 流中"

12141 +msgstr "引用父对象 ID 不在 fast-export 流中"

12142

12143 #: builtin/fast-export.c:1108

12144 msgid "Show original object ids of blobs/commits"

12145 -msgstr "显示数据对象/提交的原始对象ID"

12145 +msgstr "显示数据对象/提交的原始对象 ID"

12146

12147 #: builtin/fetch.c:28

12148 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

@@ -12565,7 +12565,7 @@ msgstr "缺失 %s %s"

12565 #: builtin/fsck.c:321

12566 #, c-format

12567 msgid "unreachable %s %s"

12568 -msgstr "不可访问 %s %s"

12568 +msgstr "不可达 %s %s"

12569

12570 #: builtin/fsck.c:340

12571 #, c-format

@@ -14525,14 +14525,14 @@ msgstr ""

14525

14526 #: builtin/merge.c:813

14527 msgid "An empty message aborts the commit.\n"

14528 -msgstr "一个空的说明终止提交。\n"

14528 +msgstr "空的提交说明会终止提交。\n"

14529

14530 #: builtin/merge.c:816

14531 #, c-format

14532 msgid ""

14533 "Lines starting with '%c' will be ignored, and an empty message aborts\n"

14534 "the commit.\n"

14535 -msgstr "以 '%c' 开始的行将被忽略，而一个空的提交说明将终止提交。\n"

14535 +msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"

14536

14537 #: builtin/merge.c:857

14538 msgid "Empty commit message."

@@ -16452,7 +16452,7 @@ msgstr "签名提交"

16452

16453 #: builtin/rebase.c:459 builtin/rebase.c:1397

16454 msgid "display a diffstat of what changed upstream"

16455 -msgstr "显示上游变化的 diffstat"

16455 +msgstr "显示上游变化的差异统计"

16456

16457 #: builtin/rebase.c:461

16458 msgid "continue rebase"

@@ -16683,7 +16683,7 @@ msgstr "安静。暗示 --no-stat"

16683

16684 #: builtin/rebase.c:1400

16685 msgid "do not show diffstat of what changed upstream"

16686 -msgstr "不显示上游变化的 diffstat"

16686 +msgstr "不显示上游变化的差异统计"

16687

16688 #: builtin/rebase.c:1403

16689 msgid "add a Signed-off-by: line to each commit"

@@ -16867,25 +16867,25 @@ msgstr "--strategy 需要 --merge 或 --interactive"

16867

16868 #: builtin/rebase.c:1796

16869 msgid "cannot combine am options with either interactive or merge options"

16870 -msgstr "不能将 am 选项与交互或合并选项组合一起"

16870 +msgstr "不能将 am 选项与交互或合并选项同时使用"

16871

16872 #: builtin/rebase.c:1815

16873 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"

16874 -msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起"

16874 +msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"

16875

16876 #: builtin/rebase.c:1819

16877 msgid ""

16878 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"

16879 msgstr ""

16880 -"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 组合一起"

16880 +"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"

16881

16882 #: builtin/rebase.c:1825

16883 msgid "cannot combine '--rebase-merges' with '--strategy-option'"

16884 -msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 组合一起"

16884 +msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"

16885

16886 #: builtin/rebase.c:1828

16887 msgid "cannot combine '--rebase-merges' with '--strategy'"

16888 -msgstr "不能将 '--rebase-merges' 和 '--strategy' 组合一起"

16888 +msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"

16889

16890 #: builtin/rebase.c:1852

16891 #, c-format

@@ -17645,15 +17645,15 @@ msgstr ""

17645

17646 #: builtin/repack.c:200

17647 msgid "could not start pack-objects to repack promisor objects"

17648 -msgstr "无法运行 pack-objects 来重新打包 promisor 对象"

17648 +msgstr "无法开始 pack-objects 来重新打包 promisor 对象"

17649

17650 #: builtin/repack.c:239 builtin/repack.c:414

17651 msgid "repack: Expecting full hex object ID lines only from pack-objects."

17652 -msgstr "repack：期望来自 pack-objects 的完整十六进制对象ID。"

17652 +msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"

17653

17654 #: builtin/repack.c:256

17655 msgid "could not finish pack-objects to repack promisor objects"

17656 -msgstr "无法结束 pack-objects 来重新打包 promisor 对象"

17656 +msgstr "无法完成 pack-objects 来重新打包 promisor 对象"

17657

17658 #: builtin/repack.c:294

17659 msgid "pack everything in a single pack"

@@ -20241,7 +20241,7 @@ msgstr "未知选项：%s\n"

20241 #: git.c:359

20242 #, c-format

20243 msgid "while expanding alias '%s': '%s'"

20244 -msgstr "在扩展别名'%s' 时：'%s'"

20244 +msgstr "在扩展别名 '%s' 时：'%s'"

20245

20246 #: git.c:368

20247 #, c-format

@@ -20260,7 +20260,7 @@ msgstr "%s 的空别名"

20260 #: git.c:379

20261 #, c-format

20262 msgid "recursive alias: %s"

20263 -msgstr "别名递归：%s"

20263 +msgstr "递归的别名：%s"

20264

20265 #: git.c:459

20266 msgid "write failure on standard output"

@@ -20353,7 +20353,7 @@ msgstr ""

20353 #: remote-curl.c:157

20354 #, c-format

20355 msgid "invalid quoting in push-option value: '%s'"

20356 -msgstr "在 push-option 取值中无效的引用：'%s'"

20356 +msgstr "在 push-option 取值中无效的引号：'%s'"

20357

20358 #: remote-curl.c:254

20359 #, c-format

@@ -20391,7 +20391,7 @@ msgstr "重定向到 %s"

20391

20392 #: remote-curl.c:584

20393 msgid "shouldn't have EOF when not gentle on EOF"

20394 -msgstr "当没有设置温和处理 EOF 时，不应该有 EOF"

20394 +msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"

20395

20396 #: remote-curl.c:664

20397 msgid "unable to rewind rpc post data - try increasing http.postBuffer"

@@ -20709,7 +20709,7 @@ msgstr "清除不必要的文件和优化本地仓库"

20709

20710 #: command-list.h:101

20711 msgid "Extract commit ID from an archive created using git-archive"

20712 -msgstr "从 git-archive 创建的归档文件中提取提交ID"

20712 +msgstr "从 git-archive 创建的归档文件中提取提交 ID"

20713

20714 #: command-list.h:102

20715 msgid "Print lines matching a pattern"

@@ -20721,7 +20721,7 @@ msgstr "一个便携的 Git 图形客户端"

20721

20722 #: command-list.h:104

20723 msgid "Compute object ID and optionally creates a blob from a file"

20724 -msgstr "从一个文件计算对象ID，并可以创建 blob 数据对象"

20724 +msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"

20725

20726 #: command-list.h:105

20727 msgid "Display help information about Git"

@@ -20862,7 +20862,7 @@ msgstr "帮助解析远程仓库访问参数的例程"

20862

20863 #: command-list.h:139

20864 msgid "Compute unique ID for a patch"

20865 -msgstr "计算一个补丁的唯一ID"

20865 +msgstr "计算一个补丁的唯一 ID"

20866

20867 #: command-list.h:140

20868 msgid "Prune all unreachable objects from the object database"

@@ -21366,7 +21366,7 @@ msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"

21366 #: git-submodule.sh:239

21367 #, sh-format

21368 msgid "'$sm_path' does not have a commit checked out"

21369 -msgstr "'$sm_path' 没有检出一个提交"

21369 +msgstr "'$sm_path' 没有检出的提交"

21370

21371 #: git-submodule.sh:245

21372 #, sh-format

@@ -22526,7 +22526,7 @@ msgid ""

22526 "Clear the body content if you don't wish to send a summary.\n"

22527 msgstr ""

22528 "以 \"GIT:\" 开头的行将被删除。\n"

22529 -"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"

22529 +"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"

22530 "\n"

22531 "如果您不想发送摘要，清除内容。\n"

22532

l10n: zh_CN: Revision for git v2.22.0 l10n