summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2015-11-16 07:02:11 +0800
committerJiang Xin <worldhello.net@gmail.com>2015-12-20 19:33:14 +0800
commit94550ed38c7e94a3572f42ba8bcc0a8e62ba510f (patch)
treed9db75043086dad4bcd262b9e2553f40a4310f11
parent5b82d4ee294cc3eae47433e48466889849f25777 (diff)
downloadgit-94550ed38c7e94a3572f42ba8bcc0a8e62ba510f.tar.gz
l10n: zh_CN: for git v2.7.0 l10n round 1
Update 66 translations (2477t0f0u) for git v2.7.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
-rw-r--r--po/zh_CN.po3113
1 files changed, 1669 insertions, 1444 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fcdaa7eda5..cd535a2560 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -87,6 +87,7 @@
# pickaxe | 挖掘
# plumbing | 管件(Git 底层核心命令的别称)
# porcelain | 瓷件(Git 上层封装命令的别称)
+# precious-objects repo | 珍品仓库
# prune | 清除
# pull | 拉,拉取
# push | 推,推送
@@ -134,8 +135,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-15 21:49+0800\n"
+"POT-Creation-Date: 2015-12-11 23:36+0800\n"
+"PO-Revision-Date: 2015-12-14 22:12+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -157,12 +158,12 @@ msgstr ""
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
+msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
#: advice.c:104
@@ -187,76 +188,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "格式"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "归档格式"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1228
msgid "prefix"
msgstr "前缀"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "文件"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "只存储"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "仓库"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)提取归档文件"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "命令"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
@@ -268,81 +269,81 @@ msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "分支 %s 设置为跟踪本地分支 %s。"
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "分支 %s 设置为跟踪远程引用 %s。"
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "分支 %s 设置为跟踪本地引用 %s。"
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -360,22 +361,22 @@ msgstr ""
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名:'%s'。"
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名:'%s'。"
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
@@ -390,7 +391,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -399,9 +400,9 @@ msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -441,7 +442,7 @@ msgstr "rev-list 终止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
@@ -459,13 +460,13 @@ msgstr "不能创建 '%s'"
msgid "index-pack died"
msgstr "index-pack 终止"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -624,23 +625,23 @@ msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名检测"
# 译者:注意保持前导空格
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注意保持前导空格
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -649,16 +650,16 @@ msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,停止在 %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow 参数后只跟一个 pathspec"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -667,16 +668,16 @@ msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "缓存未跟踪文件在本系统被禁用"
@@ -785,8 +786,8 @@ msgstr "%s:%s - %s"
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -804,64 +805,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "无法创建符号链接 '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "在树中有不支持的对象类型"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -870,7 +871,7 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被保留。"
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -879,20 +880,20 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本保留于 %8$s 中。"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -901,144 +902,144 @@ msgstr ""
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr "(留下未解决)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
"%5$s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "严重的合并错误,不应发生。"
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "已经是最新的!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处理的路径??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "合并:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "不能写入索引。"
@@ -1068,32 +1069,42 @@ msgstr "坏的 %s 值:'%s'"
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-数字"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "非法的对象名 '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
@@ -1160,11 +1171,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "完成"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1173,7 +1184,7 @@ msgstr ""
"设置了 index.version,但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1182,118 +1193,163 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
"使用版本 %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "要为 contents:lines=%s 提供一个正数"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格式:%%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "不能解析格式"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式:%%(align:<width>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "输入了不正确的格式 align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一个正数的宽度"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "非法的对象于 '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格式:缺少 %%(end) 元素"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "非法的对象名 %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s,而非 %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标(push.default 是 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2135
+#: remote.c:2094
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1302,11 +1358,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
# 译者:注意保持前导空格
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1322,28 +1378,28 @@ msgstr[1] ""
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者:注意保持前导空格
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
-#: revision.c:2198
+#: revision.c:2191
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2201
+#: revision.c:2194
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2395
+#: revision.c:2388
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "不能调用 dup2(%d,%d)"
@@ -1558,7 +1614,7 @@ msgstr "不能解析 HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s:%s"
@@ -1600,12 +1656,12 @@ msgstr "不能作为初始提交还原"
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1649,7 +1705,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目"
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "不能在 %s 中设置 core.worktree"
@@ -1660,7 +1716,7 @@ msgstr "不能在 %s 中设置 core.worktree"
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
@@ -1727,8 +1783,8 @@ msgstr "无法打开 '%s' 进行读写"
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
@@ -1756,17 +1812,17 @@ msgstr "无此用户"
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wrapper.c:631
+#: wrapper.c:647
#, c-format
msgid "could not open %s for writing"
msgstr "不能写入 %s"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:658 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "不能写入 %s"
-#: wrapper.c:648
+#: wrapper.c:664
#, c-format
msgid "could not close %s"
msgstr "不能关闭 %s"
@@ -2128,27 +2184,27 @@ msgstr "您在执行二分查找操作。"
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中;至 "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中;至 "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
@@ -2233,25 +2289,25 @@ msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
msgid "nothing to commit, working directory clean\n"
msgstr "无文件要提交,干净的工作区\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD(非分支)"
-
# 译者:注意保持句尾空格
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "初始提交于 "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD(非分支)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "丢失"
# 译者:注意保持句尾空格
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "落后 "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -2265,7 +2321,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "更新文件失败"
@@ -2278,7 +2334,7 @@ msgstr "删除 '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "不能读取索引"
@@ -2313,15 +2369,15 @@ msgstr "不能应用 '%s'"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "冗长输出"
@@ -2329,7 +2385,7 @@ msgstr "冗长输出"
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
@@ -2386,145 +2442,145 @@ msgstr "-A 和 -u 选项互斥"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "不能获取 %s 的文件状态"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行:'%s'。"
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "无法打开 '%s' 进行读取:%s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "无法打开 '%s' 进行写入:%s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "补丁格式检测失败。"
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "补丁为空。是不是切分错误?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1344
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识:%s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个(三方合并的)基础目录树..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2532,37 +2588,37 @@ msgstr ""
"您是否曾手动编辑过您的补丁?\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s 不存在。"
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联,不能进行交互式操作。"
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "提交内容为:"
@@ -2571,35 +2627,35 @@ msgstr "提交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引:不能应用补丁(脏文件:%s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于:%s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2609,7 +2665,7 @@ msgstr ""
"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2617,166 +2673,168 @@ msgstr ""
"您的索引中仍有未合并的路径。\n"
"您是否忘了执行 'git add'?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [选项] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [选项] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要,允许使用三方合并。"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "动作"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "根目录"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "路径"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "数字"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "格式"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2784,16 +2842,16 @@ msgstr ""
"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2802,7 +2860,7 @@ msgstr ""
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行,我们不会继续。"
@@ -2810,62 +2868,62 @@ msgstr "解决操作未进行,我们不会继续。"
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:意外的行:%.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2876,77 +2934,77 @@ msgid_plural ""
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s 成为空文件但并未删除"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏:%.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2955,319 +3013,319 @@ msgstr ""
"当查询:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "读取 %s 失败"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在于索引中"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不匹配"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已经存在于索引中"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已经存在于工作区中"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补丁未应用"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能枚举新建文件 '%s' 的状态"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "内部错误"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "不能打开补丁 '%s'"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3329,95 +3387,95 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1(默认:关闭)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界(默认:关闭)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名(默认:自动)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号(默认:关闭)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号(默认:关闭)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳(默认:关闭)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字(默认:关闭)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
@@ -3427,28 +3485,32 @@ msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:150
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3458,7 +3520,7 @@ msgstr ""
" '%s',但未合并到 HEAD。"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3467,12 +3529,12 @@ msgstr ""
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3481,343 +3543,335 @@ msgstr ""
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它,执行 'git branch -D %s'。"
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "分支 '%s' 未指向一个提交"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 丢失]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:落后 %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[落后 %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,落后 %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,落后 %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(非分支,正变基 %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(非分支,二分查找开始于 %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(头指针分离于 %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(头指针分离自 %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(非分支)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "对象 '%s' 没有指向一个提交"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "一些引用不能读取"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新 config 文件失败"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "非法的对象名 %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "不能写分支描述模版:%s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式(参见 git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "提交"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "删除分支(即使没有合并)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支,以及它的引用日志"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支,即使目标已存在"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "只打印没有合并的分支"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "只打印已经合并的分支"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "只打印合并的分支"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "key"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "排序的字段名"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "对象"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "只打印指向该对象的分支"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3825,7 +3879,7 @@ msgid ""
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3836,12 +3890,12 @@ msgstr ""
"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3868,11 +3922,8 @@ msgstr ""
">|--textconv) <对象>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3927,8 +3978,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3946,7 +3997,7 @@ msgstr "从标准输入读出文件名"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -4032,6 +4083,8 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "字符串"
@@ -4051,106 +4104,106 @@ msgstr "git checkout [<选项>] <分支>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':无法合并"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "损坏的索引文件"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者:注意保持前导空格
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4171,7 +4224,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4198,144 +4251,150 @@ msgstr[1] ""
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "只要一个引用,却给出了 %d 个"
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树:%s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "成为指向该提交的分离头指针"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格(merge 或 diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "缺少分支名;尝试 -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4344,12 +4403,12 @@ msgstr ""
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4387,7 +4446,7 @@ msgstr "将忽略仓库 %s\n"
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4399,7 +4458,7 @@ msgstr ""
"foo - 通过标题选择一个选项\n"
" - (空)什么也不选择"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4419,36 +4478,36 @@ msgstr ""
"* - 选择所有选项\n"
" - (空)结束选择"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告:无法找到和 %s 匹配的条目"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]?"
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "再见。"
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4466,69 +4525,69 @@ msgstr ""
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目:"
msgstr[1] "将删除如下条目:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件,退出。"
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "强制"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4539,16 +4598,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "创建一个纯仓库"
@@ -4572,15 +4626,15 @@ msgstr "设置为共享仓库"
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "参考仓库"
@@ -4604,7 +4658,7 @@ msgstr "检出 <分支> 而不是远程 HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr "深度"
@@ -4617,11 +4671,11 @@ msgstr "创建一个指定深度的浅克隆"
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
@@ -4633,52 +4687,57 @@ msgstr "key=value"
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被嫁接"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状态"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4688,121 +4747,117 @@ msgstr ""
"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "检查连接... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "提供了参数 --dissociate,但未提供 --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆,忽略 --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -4838,15 +4893,15 @@ msgstr "两列之间的填充空间"
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4870,7 +4925,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4893,7 +4948,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -4902,7 +4957,7 @@ msgstr ""
"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4916,11 +4971,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "否则,请使用命令 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4936,103 +4991,103 @@ msgstr ""
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
"操作。\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有非法的作者信息"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式:%s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读取日志信息)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -5046,7 +5101,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5060,7 +5115,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5069,7 +5124,7 @@ msgstr ""
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5080,340 +5135,346 @@ msgstr ""
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者:%.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "聪明... 用脏索引修补最后一个提交。"
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "以长格式显示状态(默认)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr "(根提交)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "提交"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "强制编辑提交"
# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "default"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "绕过 pre-commit 钩子"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件(%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明:%s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交;您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5550,11 +5611,11 @@ msgstr "只显示变量名"
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5569,16 +5630,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
@@ -5698,7 +5759,7 @@ msgstr "考虑最近 <n> 个标签(默认:10)"
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
@@ -5876,7 +5937,7 @@ msgstr "深化浅克隆的历史"
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:118 builtin/log.c:1233
+#: builtin/fetch.c:118 builtin/log.c:1232
msgid "dir"
msgstr "目录"
@@ -5918,7 +5979,7 @@ msgstr "[最新]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[已拒绝]"
@@ -5943,39 +6004,39 @@ msgstr "[新分支]"
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(非快进式)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s:%s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5985,87 +6046,87 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者:注意保持前导空格
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 将成为摇摆状态)"
# 译者:注意保持前导空格
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成为摇摆状态)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(无)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
@@ -6074,23 +6135,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名(已弃用)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "从文件中读取"
@@ -6098,95 +6159,115 @@ msgstr "从文件中读取"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<选项>] [<模式>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <对象>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<对象>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "引用占位符适用于 perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "引用占位符适用于 python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "引用占位符适用于 Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "key"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "排序的字段名"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "只打印已经合并的引用"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "只打印没有合并的引用"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "只打印包含该提交的引用"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "检查连接中"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点(默认)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "检查对象中"
@@ -6194,55 +6275,69 @@ msgstr "检查对象中"
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s:'%s'"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "不正常的长对象目录 %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
+"在该文件被删除之前,自动清理将不会执行。\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "更彻底(增加运行时间)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
@@ -6276,200 +6371,196 @@ msgstr "开关 `%c' 期望一个数字值"
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式(默认)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数,而不显示匹配的行"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "不输出,而用退出码标识命中状态"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)(本次构建忽略)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "显示用法"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
@@ -6482,10 +6573,10 @@ msgstr ""
"[--] <文件>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <路径列表>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "类型"
@@ -6556,12 +6647,12 @@ msgstr "无法解析 emacsclient 版本。"
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老(< 22)。"
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "无法执行 '%s':%s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6570,7 +6661,7 @@ msgstr ""
"'%s':不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6579,61 +6670,61 @@ msgstr ""
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s':未知的 man 查看器。"
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "每一天 Git 常用的约 20 条命令"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Git 词汇表"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "最常用的 Git 向导有:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别名"
@@ -6926,87 +7017,62 @@ msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "太长的模版名 %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "不能枚举 '%s' 状态"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能枚举模版 '%s' 状态"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能打开目录 '%s'"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能读取链接 '%s'"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "太长的符号链接 %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "太长的模版路径 %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "不正常的 git 目录 %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
@@ -7014,25 +7080,25 @@ msgstr "不能移动 %s 至 %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git 仓库于 %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "重新初始化现存的"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "初始化空的"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr "共享"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7040,32 +7106,32 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "权限"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
@@ -7151,217 +7217,217 @@ msgstr "format.headers 没有值"
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to:%s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "两个输出目录?"
-#: builtin/log.c:1211
+#: builtin/log.c:1210
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],即使只有一个补丁"
-#: builtin/log.c:1214
+#: builtin/log.c:1213
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],即使有多个补丁"
-#: builtin/log.c:1218
+#: builtin/log.c:1217
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1220
+#: builtin/log.c:1219
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1222
+#: builtin/log.c:1221
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1223
+#: builtin/log.c:1222
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1224
+#: builtin/log.c:1223
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1226
+#: builtin/log.c:1225
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号,而不是1"
-#: builtin/log.c:1228
+#: builtin/log.c:1227
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1230
+#: builtin/log.c:1229
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1233
+#: builtin/log.c:1232
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1236
+#: builtin/log.c:1235
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1239
+#: builtin/log.c:1238
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1241
+#: builtin/log.c:1240
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1243
+#: builtin/log.c:1242
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的(补丁+状态)"
-#: builtin/log.c:1245
+#: builtin/log.c:1244
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1246
+#: builtin/log.c:1245
msgid "header"
msgstr "header"
-#: builtin/log.c:1247
+#: builtin/log.c:1246
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1247 builtin/log.c:1249
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1248
+#: builtin/log.c:1247
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1250
+#: builtin/log.c:1249
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1252
+#: builtin/log.c:1251
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1253
+#: builtin/log.c:1252
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
-#: builtin/log.c:1255
+#: builtin/log.c:1254
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1256
+#: builtin/log.c:1255
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1256 builtin/log.c:1259
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1258
+#: builtin/log.c:1257
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1261
+#: builtin/log.c:1260
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1265
+#: builtin/log.c:1264
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索,风格:浅,深"
-#: builtin/log.c:1267
+#: builtin/log.c:1266
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1268
+#: builtin/log.c:1267
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1270
+#: builtin/log.c:1269
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1271
+#: builtin/log.c:1270
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1360
+#: builtin/log.c:1359
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1362
+#: builtin/log.c:1361
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1370
+#: builtin/log.c:1369
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1372
+#: builtin/log.c:1371
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1374
+#: builtin/log.c:1373
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1397
+#: builtin/log.c:1396
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
-#: builtin/log.c:1399
+#: builtin/log.c:1398
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1496
+#: builtin/log.c:1495
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1559
+#: builtin/log.c:1558
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1607
+#: builtin/log.c:1606
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1660
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
@@ -7462,35 +7528,35 @@ msgstr "显示调试数据"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "只显示树"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "递归到子树"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "当递归时显示树"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "条目以 NUL 字符终止"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "包括对象大小"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "只列出文件名"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "使用文件的全路径"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
@@ -7720,16 +7786,16 @@ msgstr "当前分支没有定义默认的上游分支。"
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7737,7 +7803,7 @@ msgstr ""
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7745,51 +7811,51 @@ msgstr ""
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有一个 GPG 签名。"
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
@@ -7799,46 +7865,46 @@ msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利,按要求在提交前停止\n"
@@ -8026,48 +8092,48 @@ msgstr "%s,源=%s,目标=%s"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "只打印名称(无 SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称(默认)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签(内部使用)"
@@ -8194,7 +8260,7 @@ msgstr "不能读取 'show' 的输出"
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
@@ -8212,12 +8278,12 @@ msgstr "不能写注解对象"
msgid "The note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
@@ -8225,7 +8291,7 @@ msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -8259,11 +8325,6 @@ msgstr "注解内容作为一个字符串"
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "对象"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
@@ -8386,7 +8447,7 @@ msgstr "注解引用"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令:%s"
@@ -8592,20 +8653,24 @@ msgstr "正在删除重复对象"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "不删除,只显示"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "不能在珍品仓库中执行清理操作"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/pull.c:113
@@ -9141,12 +9206,12 @@ msgstr "跳过应用稀疏检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
@@ -9163,15 +9228,15 @@ msgstr ""
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名称> <地址>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <旧名称> <新名称>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
@@ -9192,48 +9257,52 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名称> <分支>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <名称>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名称> <新的地址>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名称> <地址>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名称> <分支>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <名称>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <名称>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9241,96 +9310,96 @@ msgstr ""
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数:%s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "抓取时导入所有的标签和关联对象"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何标签(--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "跟踪的分支"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "主线分支"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推送或抓取的镜像"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(匹配)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(删除)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "不能添加 '%s' 至 '%s'"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程:%s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9341,27 +9410,27 @@ msgstr ""
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "不能追加 '%s'"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "不能设置 '%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9371,126 +9440,126 @@ msgid_plural ""
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获取将存储于 remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' 来移除)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " 且有远程"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " 且有远程"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址:%s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(无 URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址:%s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -9498,138 +9567,151 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr "(状态未查询)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支:"
msgstr[1] " 为 'git pull' 配置的本地分支:"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s:"
msgstr[1] " 为 'git push' 配置的本地引用%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用:%s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者:注意保持前导空格
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态!"
# 译者:注意保持前导空格
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "查询推送 URL 地址,而非获取 URL 地址"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "返回所有 URL 地址"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "没有给远程仓库 '%s' 设定 URL"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版:%s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于子命令之前"
@@ -9701,7 +9783,11 @@ msgstr "每个包文件的最大尺寸"
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "不能删除珍品仓库中的打包文件"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "删除 '%s' 失败"
@@ -9794,7 +9880,7 @@ msgstr "使用此格式"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "在索引中注册干净的解决方案"
@@ -9930,23 +10016,23 @@ msgstr "不能写入新的索引文件。"
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10195,7 +10281,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "折行输出"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10207,71 +10293,71 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序,并尽可能地保持日期顺序"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
@@ -10284,41 +10370,133 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<模式>] < <引用列表>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<模式>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "只显示标签(可以和头共用)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "只显示头(可以和标签共用)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测,需要精确的引用路径"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用,即使被过滤掉"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "转换标签到对象 ID"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "跳过和移除所有的注释行"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "为每一行的行首添加注释符和空格"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "相对路径的替代锚记(anchor)"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <路径>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "新的子模组将要克隆的路径"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "新子模组的名称"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "克隆子模组的 url 地址"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "浅克隆的深度"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
+"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到子模组路径 '%s'"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "无法打开文件 '%s'"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "无法关闭文件 %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "无法得到 '%s' 的子模组目录"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
@@ -10347,54 +10525,50 @@ msgstr "原因"
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签名>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
+"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
+"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <标签名>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "非法的对象于 '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "标签名称太长:%.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'(曾为 %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "不能校验该标签 '%s'"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10407,7 +10581,7 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10421,153 +10595,138 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "不支持的排序规格 '%s'"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "标签头信息太大。"
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "无标签说明?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "开关 'points-at' 需要一个对象"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "非法的对象名 '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "附注标签,需要一个说明"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "如果存在,替换现有的标签"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "排序标签"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "只打印包含提交的标签"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "只打印已经合并的标签"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "只打印尚未合并的标签"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "只打印对象的标签"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort 和 -n 不兼容"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "-n 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "--contains 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "--points-at 选项只允许和 -l 同时使用。"
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s)\n"
@@ -10826,76 +10985,80 @@ msgstr "git verify-tag [-v | --verbose] <标签>..."
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<选项>] <路径> <分支>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<选项>] <路径> [<分支>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<选项>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s:不是一个有效的目录"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s:gitdir 文件不存在"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "无法删除:%s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s (标识符 %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
@@ -11041,23 +11204,23 @@ msgstr "到期时间"
msgid "no-op (backward compatibility)"
msgstr "空操作(向后兼容)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能,重用冲突解决更新索引"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "您需要执行 \"git bisect start\" 来开始"
@@ -11065,63 +11228,63 @@ msgstr "您需要执行 \"git bisect start\" 来开始"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "未能识别的选项:'$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' 看起来不像是一个有效的版本"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "坏的 bisect_write 参数:$state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "输入坏的版本:$arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "输入坏的版本:$rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
@@ -11130,11 +11293,11 @@ msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11143,7 +11306,7 @@ msgstr ""
"您需要给我至少一个好版本和一个坏版本。\n"
"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11154,16 +11317,16 @@ msgstr ""
"然后需要提供我至少一个好版本和一个坏版本。\n"
"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11172,25 +11335,25 @@ msgstr ""
"不能检出原始 HEAD '$branch'。\n"
"尝试 'git bisect reset <提交>'。"
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11199,11 +11362,11 @@ msgstr ""
"二分查找运行失败:\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11212,15 +11375,47 @@ msgstr ""
"二分查找运行失败:\n"
"'bisect_state $state' 退出码为 $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "请使用两个不同的术语"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' 不是一个有效的名称"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "不能使用内置命令 '$term' 作为术语"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "不能修改术语 '$term' 的含义"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "未定义术语"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"参数 $arg 对命令 'git bisect terms' 无效。\n"
+"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11259,23 +11454,23 @@ msgstr "钩子 pre-rebase 拒绝变基操作。"
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "选项 --exec 必须和选项 --interactive 同时使用"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "没有正在进行的变基?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11283,12 +11478,12 @@ msgstr ""
"您必须编辑所有的合并冲突,然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11307,64 +11502,64 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交:$onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误:无此分支:$branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的,强制变基。"
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先,回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
@@ -11437,112 +11632,97 @@ msgstr "无法保存当前状态"
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本:$REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}:不能丢弃进度条目"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(为恢复数据输入 \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11553,134 +11733,134 @@ msgstr ""
"$sm_path\n"
"如果您确实想添加它,使用 -f 参数。"
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "正在进入 '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "无法为子模组路径 '$displaypath' 注册 url"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除子模组工作区 '$displaypath'"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11689,108 +11869,153 @@ msgstr ""
"子模组路径 '$displaypath' 没有初始化\n"
"也许您想用 'update --init'?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包含提交 $sha1_src"
# 译者:注意保持前导空格
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "数据对象"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
+#~ msgid "show usage"
+#~ msgstr "显示用法"
+
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "分支 '%s' 未指向一个提交"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "对象 '%s' 没有指向一个提交"
+
+#~ msgid "print only merged branches"
+#~ msgstr "只打印合并的分支"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "提供了参数 --dissociate,但未提供 --reference"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "太长的模版名 %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "太长的符号链接 %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "太长的模版路径 %s"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "不正常的 git 目录 %s"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "不支持的排序规格 '%s'"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "开关 'points-at' 需要一个对象"
+
+#~ msgid "sort tags"
+#~ msgstr "排序标签"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort 和 -n 不兼容"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
+
#~ msgid "false|true|preserve"
#~ msgstr "false|true|preserve"