l10n: zh_CN.po: translate 5 messages (2135t0f0u)
Translate 5 new messages came from git.pot update in b8ecf23
(l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
85ef881f6c
commit
b18943845c
346
po/zh_CN.po
346
po/zh_CN.po
@ -12,8 +12,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2013-07-26 14:19+0800\n"
|
||||
"PO-Revision-Date: 2013-08-03 14:13+0800\n"
|
||||
"POT-Creation-Date: 2013-08-06 14:10+0800\n"
|
||||
"PO-Revision-Date: 2013-08-06 14:45+0800\n"
|
||||
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
|
||||
"Language: zh_CN\n"
|
||||
@ -266,7 +266,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
|
||||
msgid "unrecognized header: %s%s (%d)"
|
||||
msgstr "未能识别的包头：%s%s (%d)"
|
||||
|
||||
#: bundle.c:89 builtin/commit.c:683
|
||||
#: bundle.c:89 builtin/commit.c:697
|
||||
#, c-format
|
||||
msgid "could not open '%s'"
|
||||
msgstr "不能打开 '%s'"
|
||||
@ -506,20 +506,20 @@ msgstr "'%s'：%s"
|
||||
msgid "'%s': short read %s"
|
||||
msgstr "'%s'：读取不完整 %s"
|
||||
|
||||
#: help.c:213
|
||||
#: help.c:210
|
||||
#, c-format
|
||||
msgid "available git commands in '%s'"
|
||||
msgstr "在 '%s' 下可用的 git 命令"
|
||||
|
||||
#: help.c:220
|
||||
#: help.c:217
|
||||
msgid "git commands available from elsewhere on your $PATH"
|
||||
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
|
||||
|
||||
#: help.c:236
|
||||
#: help.c:233
|
||||
msgid "The most commonly used git commands are:"
|
||||
msgstr "最常用的 git 命令有："
|
||||
|
||||
#: help.c:293
|
||||
#: help.c:290
|
||||
#, c-format
|
||||
msgid ""
|
||||
"'%s' appears to be a git command, but we were not\n"
|
||||
@ -528,11 +528,11 @@ msgstr ""
|
||||
"'%s' 像是一个 git 命令，但却无法运行。\n"
|
||||
"可能是 git-%s 受损？"
|
||||
|
||||
#: help.c:350
|
||||
#: help.c:347
|
||||
msgid "Uh oh. Your system reports no Git commands at all."
|
||||
msgstr "唉呀，您的系统中未发现 Git 命令。"
|
||||
|
||||
#: help.c:372
|
||||
#: help.c:369
|
||||
#, c-format
|
||||
msgid ""
|
||||
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
||||
@ -541,17 +541,17 @@ msgstr ""
|
||||
"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
|
||||
"是 '%s'"
|
||||
|
||||
#: help.c:377
|
||||
#: help.c:374
|
||||
#, c-format
|
||||
msgid "in %0.1f seconds automatically..."
|
||||
msgstr "在 %0.1f 秒钟后自动运行..."
|
||||
|
||||
#: help.c:384
|
||||
#: help.c:381
|
||||
#, c-format
|
||||
msgid "git: '%s' is not a git command. See 'git --help'."
|
||||
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
|
||||
|
||||
#: help.c:388 help.c:447
|
||||
#: help.c:385 help.c:444
|
||||
msgid ""
|
||||
"\n"
|
||||
"Did you mean this?"
|
||||
@ -565,7 +565,7 @@ msgstr[1] ""
|
||||
"\n"
|
||||
"您指的是这其中的某一个么？"
|
||||
|
||||
#: help.c:443
|
||||
#: help.c:440
|
||||
#, c-format
|
||||
msgid "%s: %s - %s"
|
||||
msgstr "%s：%s - %s"
|
||||
@ -1204,7 +1204,7 @@ msgid ""
|
||||
"\n"
|
||||
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
|
||||
"examine these refs and maybe delete them. Turn this message off by\n"
|
||||
"running \"git config advice.object_name_warning false\""
|
||||
"running \"git config advice.objectNameWarning false\""
|
||||
msgstr ""
|
||||
"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
|
||||
"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
|
||||
@ -1212,7 +1212,7 @@ msgstr ""
|
||||
" git checkout -b $br $(git rev-parse ...)\n"
|
||||
"\n"
|
||||
"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
|
||||
"可能需要删除它们。用 \"git config advice.object_name_warning false\""
|
||||
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
|
||||
"命令关闭本消息通知。"
|
||||
|
||||
#: sha1_name.c:1097
|
||||
@ -1786,7 +1786,7 @@ msgstr ""
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "意外的差异状态 %c"
|
||||
|
||||
#: builtin/add.c:149 builtin/commit.c:238
|
||||
#: builtin/add.c:149 builtin/commit.c:252
|
||||
msgid "updating files failed"
|
||||
msgstr "更新文件失败"
|
||||
|
||||
@ -1835,14 +1835,14 @@ msgstr "不能应用 '%s'"
|
||||
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
||||
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
|
||||
|
||||
#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63
|
||||
#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
|
||||
#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
|
||||
#: builtin/rm.c:268
|
||||
msgid "dry run"
|
||||
msgstr "演习"
|
||||
|
||||
#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
|
||||
#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613
|
||||
#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
|
||||
#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
|
||||
msgid "be verbose"
|
||||
msgstr "冗长输出"
|
||||
@ -1923,8 +1923,8 @@ msgstr "没有指定文件，也没有文件被添加。\n"
|
||||
msgid "Maybe you wanted to say 'git add .'?\n"
|
||||
msgstr "也许您想要执行 'git add .'？\n"
|
||||
|
||||
#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895
|
||||
#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297
|
||||
#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
|
||||
#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
|
||||
msgid "index file corrupt"
|
||||
msgstr "索引文件损坏"
|
||||
|
||||
@ -2777,8 +2777,8 @@ msgid "act on remote-tracking branches"
|
||||
msgstr "作用于远程跟踪分支"
|
||||
|
||||
#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
|
||||
#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415
|
||||
#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468
|
||||
#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
|
||||
#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
|
||||
msgid "commit"
|
||||
msgstr "提交"
|
||||
|
||||
@ -2959,43 +2959,43 @@ msgstr "需要一个版本库来创建包。"
|
||||
msgid "Need a repository to unbundle."
|
||||
msgstr "需要一个版本库来解包。"
|
||||
|
||||
#: builtin/cat-file.c:303
|
||||
#: builtin/cat-file.c:285
|
||||
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
|
||||
msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
|
||||
|
||||
#: builtin/cat-file.c:304
|
||||
#: builtin/cat-file.c:286
|
||||
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
|
||||
msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
|
||||
|
||||
#: builtin/cat-file.c:341
|
||||
#: builtin/cat-file.c:323
|
||||
msgid "<type> can be one of: blob, tree, commit, tag"
|
||||
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
|
||||
|
||||
#: builtin/cat-file.c:342
|
||||
#: builtin/cat-file.c:324
|
||||
msgid "show object type"
|
||||
msgstr "显示对象类型"
|
||||
|
||||
#: builtin/cat-file.c:343
|
||||
#: builtin/cat-file.c:325
|
||||
msgid "show object size"
|
||||
msgstr "显示对象大小"
|
||||
|
||||
#: builtin/cat-file.c:345
|
||||
#: builtin/cat-file.c:327
|
||||
msgid "exit with zero when there's no error"
|
||||
msgstr "当没有错误时退出并返回零"
|
||||
|
||||
#: builtin/cat-file.c:346
|
||||
#: builtin/cat-file.c:328
|
||||
msgid "pretty-print object's content"
|
||||
msgstr "美观地打印对象的内容"
|
||||
|
||||
#: builtin/cat-file.c:348
|
||||
#: builtin/cat-file.c:330
|
||||
msgid "for blob objects, run textconv on object's content"
|
||||
msgstr "对于数据（blob）对象，对其内容执行 textconv"
|
||||
|
||||
#: builtin/cat-file.c:350
|
||||
#: builtin/cat-file.c:332
|
||||
msgid "show info and content of objects fed from the standard input"
|
||||
msgstr "显示从标准输入提供的对象的信息和内容"
|
||||
|
||||
#: builtin/cat-file.c:353
|
||||
#: builtin/cat-file.c:335
|
||||
msgid "show info about objects fed from the standard input"
|
||||
msgstr "显示从标准输入提供的对象的信息"
|
||||
|
||||
@ -3473,35 +3473,35 @@ msgstr ""
|
||||
"* - 选择所有选项\n"
|
||||
" - （空）结束选择"
|
||||
|
||||
#: builtin/clean.c:491
|
||||
#: builtin/clean.c:515
|
||||
#, c-format
|
||||
msgid "Huh (%s)?"
|
||||
msgstr "嗯（%s）？"
|
||||
|
||||
#: builtin/clean.c:634
|
||||
#: builtin/clean.c:658
|
||||
#, c-format
|
||||
msgid "Input ignore patterns>> "
|
||||
msgstr "输入模版以排除条目>> "
|
||||
|
||||
#: builtin/clean.c:671
|
||||
#: builtin/clean.c:695
|
||||
#, c-format
|
||||
msgid "WARNING: Cannot find items matched by: %s"
|
||||
msgstr "警告：无法找到和 %s 匹配的条目"
|
||||
|
||||
#: builtin/clean.c:692
|
||||
#: builtin/clean.c:716
|
||||
msgid "Select items to delete"
|
||||
msgstr "选择要删除的条目"
|
||||
|
||||
#: builtin/clean.c:732
|
||||
#: builtin/clean.c:756
|
||||
#, c-format
|
||||
msgid "remove %s? "
|
||||
msgstr "删除 %s？"
|
||||
|
||||
#: builtin/clean.c:757
|
||||
#: builtin/clean.c:781
|
||||
msgid "Bye."
|
||||
msgstr "再见。"
|
||||
|
||||
#: builtin/clean.c:765
|
||||
#: builtin/clean.c:789
|
||||
msgid ""
|
||||
"clean - start cleaning\n"
|
||||
"filter by pattern - exclude items from deletion\n"
|
||||
@ -3519,69 +3519,69 @@ msgstr ""
|
||||
"help - 显示本帮助\n"
|
||||
"? - 显示如何在提示符下选择的帮助"
|
||||
|
||||
#: builtin/clean.c:792
|
||||
#: builtin/clean.c:816
|
||||
msgid "*** Commands ***"
|
||||
msgstr "*** 命令 ***"
|
||||
|
||||
#: builtin/clean.c:793
|
||||
#: builtin/clean.c:817
|
||||
msgid "What now"
|
||||
msgstr "请选择"
|
||||
|
||||
#: builtin/clean.c:801
|
||||
#: builtin/clean.c:825
|
||||
msgid "Would remove the following item:"
|
||||
msgid_plural "Would remove the following items:"
|
||||
msgstr[0] "将删除如下条目："
|
||||
msgstr[1] "将删除如下条目："
|
||||
|
||||
#: builtin/clean.c:818
|
||||
#: builtin/clean.c:842
|
||||
msgid "No more files to clean, exiting."
|
||||
msgstr "没有要清理的文件，退出。"
|
||||
|
||||
#: builtin/clean.c:850
|
||||
#: builtin/clean.c:874
|
||||
msgid "do not print names of files removed"
|
||||
msgstr "不打印删除文件的名称"
|
||||
|
||||
#: builtin/clean.c:852
|
||||
#: builtin/clean.c:876
|
||||
msgid "force"
|
||||
msgstr "强制"
|
||||
|
||||
#: builtin/clean.c:853
|
||||
#: builtin/clean.c:877
|
||||
msgid "interactive cleaning"
|
||||
msgstr "交互式清除"
|
||||
|
||||
#: builtin/clean.c:855
|
||||
#: builtin/clean.c:879
|
||||
msgid "remove whole directories"
|
||||
msgstr "删除整个目录"
|
||||
|
||||
#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716
|
||||
#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
|
||||
#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
|
||||
msgid "pattern"
|
||||
msgstr "模式"
|
||||
|
||||
#: builtin/clean.c:857
|
||||
#: builtin/clean.c:881
|
||||
msgid "add <pattern> to ignore rules"
|
||||
msgstr "添加<模式>到忽略规则"
|
||||
|
||||
#: builtin/clean.c:858
|
||||
#: builtin/clean.c:882
|
||||
msgid "remove ignored files, too"
|
||||
msgstr "也删除忽略的文件"
|
||||
|
||||
#: builtin/clean.c:860
|
||||
#: builtin/clean.c:884
|
||||
msgid "remove only ignored files"
|
||||
msgstr "只删除忽略的文件"
|
||||
|
||||
#: builtin/clean.c:878
|
||||
#: builtin/clean.c:902
|
||||
msgid "-x and -X cannot be used together"
|
||||
msgstr "-x 和 -X 不能同时使用"
|
||||
|
||||
#: builtin/clean.c:882
|
||||
#: builtin/clean.c:906
|
||||
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:885
|
||||
#: builtin/clean.c:909
|
||||
msgid ""
|
||||
"clean.requireForce defaults to true and neither -i, -n nor -f given; "
|
||||
"refusing to clean"
|
||||
@ -3911,102 +3911,120 @@ msgid ""
|
||||
"\n"
|
||||
" git commit --allow-empty\n"
|
||||
"\n"
|
||||
"Otherwise, please use 'git reset'\n"
|
||||
msgstr ""
|
||||
"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
|
||||
"也要提交，使用命令：\n"
|
||||
"\n"
|
||||
" git commit --allow-empty\n"
|
||||
"\n"
|
||||
"否则，请使用命令 'git reset'\n"
|
||||
|
||||
#: builtin/commit.c:265
|
||||
#: builtin/commit.c:69
|
||||
msgid "Otherwise, please use 'git reset'\n"
|
||||
msgstr "否则，请使用命令 'git reset'\n"
|
||||
|
||||
#: builtin/commit.c:72
|
||||
msgid ""
|
||||
"If you wish to skip this commit, use:\n"
|
||||
"\n"
|
||||
" git reset\n"
|
||||
"\n"
|
||||
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
||||
"the remaining commits.\n"
|
||||
msgstr ""
|
||||
"如果您想跳过这个提交，使用命令：\n"
|
||||
"\n"
|
||||
" git reset\n"
|
||||
"\n"
|
||||
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
|
||||
"操作。\n"
|
||||
|
||||
#: builtin/commit.c:279
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "无法解包 HEAD 树对象"
|
||||
|
||||
#: builtin/commit.c:307
|
||||
#: builtin/commit.c:321
|
||||
msgid "unable to create temporary index"
|
||||
msgstr "不能创建临时索引"
|
||||
|
||||
#: builtin/commit.c:313
|
||||
#: builtin/commit.c:327
|
||||
msgid "interactive add failed"
|
||||
msgstr "交互式添加失败"
|
||||
|
||||
#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417
|
||||
#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
|
||||
msgid "unable to write new_index file"
|
||||
msgstr "无法写 new_index 文件"
|
||||
|
||||
#: builtin/commit.c:398
|
||||
#: builtin/commit.c:412
|
||||
msgid "cannot do a partial commit during a merge."
|
||||
msgstr "在合并过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c:400
|
||||
#: builtin/commit.c:414
|
||||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "在拣选过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c:410
|
||||
#: builtin/commit.c:424
|
||||
msgid "cannot read the index"
|
||||
msgstr "无法读取索引"
|
||||
|
||||
#: builtin/commit.c:430
|
||||
#: builtin/commit.c:444
|
||||
msgid "unable to write temporary index file"
|
||||
msgstr "无法写临时索引文件"
|
||||
|
||||
#: builtin/commit.c:521 builtin/commit.c:527
|
||||
#: builtin/commit.c:535 builtin/commit.c:541
|
||||
#, c-format
|
||||
msgid "invalid commit: %s"
|
||||
msgstr "无效的提交：%s"
|
||||
|
||||
#: builtin/commit.c:549
|
||||
#: builtin/commit.c:563
|
||||
msgid "malformed --author parameter"
|
||||
msgstr "非法的 --author 参数"
|
||||
|
||||
#: builtin/commit.c:569
|
||||
#: builtin/commit.c:583
|
||||
#, c-format
|
||||
msgid "Malformed ident string: '%s'"
|
||||
msgstr "非法的身份字符串：'%s'"
|
||||
|
||||
#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963
|
||||
#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "不能查询提交 %s"
|
||||
|
||||
#: builtin/commit.c:619 builtin/shortlog.c:271
|
||||
#: builtin/commit.c:633 builtin/shortlog.c:271
|
||||
#, c-format
|
||||
msgid "(reading log message from standard input)\n"
|
||||
msgstr "（正从标准输入中读取日志信息）\n"
|
||||
|
||||
#: builtin/commit.c:621
|
||||
#: builtin/commit.c:635
|
||||
msgid "could not read log from standard input"
|
||||
msgstr "不能从标准输入中读取日志信息"
|
||||
|
||||
#: builtin/commit.c:625
|
||||
#: builtin/commit.c:639
|
||||
#, c-format
|
||||
msgid "could not read log file '%s'"
|
||||
msgstr "不能读取日志文件 '%s'"
|
||||
|
||||
#: builtin/commit.c:631
|
||||
#: builtin/commit.c:645
|
||||
msgid "commit has empty message"
|
||||
msgstr "提交说明为空"
|
||||
|
||||
#: builtin/commit.c:647
|
||||
#: builtin/commit.c:661
|
||||
msgid "could not read MERGE_MSG"
|
||||
msgstr "不能读取 MERGE_MSG"
|
||||
|
||||
#: builtin/commit.c:651
|
||||
#: builtin/commit.c:665
|
||||
msgid "could not read SQUASH_MSG"
|
||||
msgstr "不能读取 SQUASH_MSG"
|
||||
|
||||
#: builtin/commit.c:655
|
||||
#: builtin/commit.c:669
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
msgstr "不能读取 '%s'"
|
||||
|
||||
#: builtin/commit.c:716
|
||||
#: builtin/commit.c:730
|
||||
msgid "could not write commit template"
|
||||
msgstr "不能写提交模版"
|
||||
|
||||
#: builtin/commit.c:727
|
||||
#: builtin/commit.c:741
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\n"
|
||||
@ -4020,7 +4038,7 @@ msgstr ""
|
||||
"\t%s\n"
|
||||
"然后重试。\n"
|
||||
|
||||
#: builtin/commit.c:732
|
||||
#: builtin/commit.c:746
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\n"
|
||||
@ -4034,7 +4052,7 @@ msgstr ""
|
||||
"\t%s\n"
|
||||
"然后重试。\n"
|
||||
|
||||
#: builtin/commit.c:744
|
||||
#: builtin/commit.c:758
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Please enter the commit message for your changes. Lines starting\n"
|
||||
@ -4043,7 +4061,7 @@ msgstr ""
|
||||
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
|
||||
"说明将会终止提交。\n"
|
||||
|
||||
#: builtin/commit.c:749
|
||||
#: builtin/commit.c:763
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Please enter the commit message for your changes. Lines starting\n"
|
||||
@ -4054,355 +4072,355 @@ msgstr ""
|
||||
"也可以删除它们。一个空的提交说明将会终止提交。\n"
|
||||
|
||||
# 译者：为保证在输出中对齐，注意调整句中空格！
|
||||
#: builtin/commit.c:762
|
||||
#: builtin/commit.c:776
|
||||
#, c-format
|
||||
msgid "%sAuthor: %s"
|
||||
msgstr "%s作者： %s"
|
||||
|
||||
# 译者：为保证在输出中对齐，注意调整句中空格！
|
||||
#: builtin/commit.c:769
|
||||
#: builtin/commit.c:783
|
||||
#, c-format
|
||||
msgid "%sCommitter: %s"
|
||||
msgstr "%s提交者： %s"
|
||||
|
||||
#: builtin/commit.c:789
|
||||
#: builtin/commit.c:803
|
||||
msgid "Cannot read index"
|
||||
msgstr "无法读取索引"
|
||||
|
||||
#: builtin/commit.c:826
|
||||
#: builtin/commit.c:845
|
||||
msgid "Error building trees"
|
||||
msgstr "无法创建树对象"
|
||||
|
||||
#: builtin/commit.c:841 builtin/tag.c:359
|
||||
#: builtin/commit.c:860 builtin/tag.c:359
|
||||
#, c-format
|
||||
msgid "Please supply the message using either -m or -F option.\n"
|
||||
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
|
||||
|
||||
#: builtin/commit.c:938
|
||||
#: builtin/commit.c:957
|
||||
#, c-format
|
||||
msgid "No existing author found with '%s'"
|
||||
msgstr "没有找到匹配 '%s' 的作者"
|
||||
|
||||
#: builtin/commit.c:953 builtin/commit.c:1189
|
||||
#: builtin/commit.c:972 builtin/commit.c:1208
|
||||
#, c-format
|
||||
msgid "Invalid untracked files mode '%s'"
|
||||
msgstr "无效的未追踪文件参数 '%s'"
|
||||
|
||||
#: builtin/commit.c:990
|
||||
#: builtin/commit.c:1009
|
||||
msgid "--long and -z are incompatible"
|
||||
msgstr "--long 和 -z 选项不兼容"
|
||||
|
||||
#: builtin/commit.c:1020
|
||||
#: builtin/commit.c:1039
|
||||
msgid "Using both --reset-author and --author does not make sense"
|
||||
msgstr "同时使用 --reset-author 和 --author 没有意义"
|
||||
|
||||
#: builtin/commit.c:1031
|
||||
#: builtin/commit.c:1050
|
||||
msgid "You have nothing to amend."
|
||||
msgstr "您没有可修补的提交。"
|
||||
|
||||
#: builtin/commit.c:1034
|
||||
#: builtin/commit.c:1053
|
||||
msgid "You are in the middle of a merge -- cannot amend."
|
||||
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
|
||||
|
||||
#: builtin/commit.c:1036
|
||||
#: builtin/commit.c:1055
|
||||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
|
||||
|
||||
#: builtin/commit.c:1039
|
||||
#: builtin/commit.c:1058
|
||||
msgid "Options --squash and --fixup cannot be used together"
|
||||
msgstr "选项 --squash 和 --fixup 不能同时使用"
|
||||
|
||||
#: builtin/commit.c:1049
|
||||
#: builtin/commit.c:1068
|
||||
msgid "Only one of -c/-C/-F/--fixup can be used."
|
||||
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
|
||||
|
||||
#: builtin/commit.c:1051
|
||||
#: builtin/commit.c:1070
|
||||
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
|
||||
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
|
||||
|
||||
#: builtin/commit.c:1059
|
||||
#: builtin/commit.c:1078
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
|
||||
|
||||
#: builtin/commit.c:1076
|
||||
#: builtin/commit.c:1095
|
||||
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
||||
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
|
||||
|
||||
#: builtin/commit.c:1078
|
||||
#: builtin/commit.c:1097
|
||||
msgid "No paths with --include/--only does not make sense."
|
||||
msgstr "参数 --include/--only 不跟路径没有意义。"
|
||||
|
||||
#: builtin/commit.c:1080
|
||||
#: builtin/commit.c:1099
|
||||
msgid "Clever... amending the last one with dirty index."
|
||||
msgstr "聪明... 在索引不干净下修补最后的提交。"
|
||||
|
||||
#: builtin/commit.c:1082
|
||||
#: builtin/commit.c:1101
|
||||
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
|
||||
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
|
||||
|
||||
#: builtin/commit.c:1092 builtin/tag.c:575
|
||||
#: builtin/commit.c:1111 builtin/tag.c:575
|
||||
#, c-format
|
||||
msgid "Invalid cleanup mode %s"
|
||||
msgstr "无效的清理模式 %s"
|
||||
|
||||
#: builtin/commit.c:1097
|
||||
#: builtin/commit.c:1116
|
||||
msgid "Paths with -a does not make sense."
|
||||
msgstr "路径和 -a 选项同时使用没有意义。"
|
||||
|
||||
#: builtin/commit.c:1203 builtin/commit.c:1436
|
||||
#: builtin/commit.c:1222 builtin/commit.c:1455
|
||||
msgid "show status concisely"
|
||||
msgstr "以简洁的格式显示状态"
|
||||
|
||||
#: builtin/commit.c:1205 builtin/commit.c:1438
|
||||
#: builtin/commit.c:1224 builtin/commit.c:1457
|
||||
msgid "show branch information"
|
||||
msgstr "显示分支信息"
|
||||
|
||||
#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452
|
||||
#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
|
||||
msgid "machine-readable output"
|
||||
msgstr "机器可读的输出"
|
||||
|
||||
#: builtin/commit.c:1210 builtin/commit.c:1442
|
||||
#: builtin/commit.c:1229 builtin/commit.c:1461
|
||||
msgid "show status in long format (default)"
|
||||
msgstr "以长格式显示状态（默认）"
|
||||
|
||||
#: builtin/commit.c:1213 builtin/commit.c:1445
|
||||
#: builtin/commit.c:1232 builtin/commit.c:1464
|
||||
msgid "terminate entries with NUL"
|
||||
msgstr "条目以NUL字符结尾"
|
||||
|
||||
#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667
|
||||
#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
|
||||
#: builtin/fast-export.c:670 builtin/tag.c:459
|
||||
msgid "mode"
|
||||
msgstr "模式"
|
||||
|
||||
#: builtin/commit.c:1216 builtin/commit.c:1448
|
||||
#: builtin/commit.c:1235 builtin/commit.c:1467
|
||||
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
||||
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
|
||||
|
||||
#: builtin/commit.c:1219
|
||||
#: builtin/commit.c:1238
|
||||
msgid "show ignored files"
|
||||
msgstr "显示忽略的文件"
|
||||
|
||||
#: builtin/commit.c:1220 parse-options.h:154
|
||||
#: builtin/commit.c:1239 parse-options.h:154
|
||||
msgid "when"
|
||||
msgstr "何时"
|
||||
|
||||
#: builtin/commit.c:1221
|
||||
#: builtin/commit.c:1240
|
||||
msgid ""
|
||||
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
||||
"(Default: all)"
|
||||
msgstr ""
|
||||
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
|
||||
|
||||
#: builtin/commit.c:1223
|
||||
#: builtin/commit.c:1242
|
||||
msgid "list untracked files in columns"
|
||||
msgstr "以列的方式显示未跟踪的文件"
|
||||
|
||||
#: builtin/commit.c:1294
|
||||
#: builtin/commit.c:1313
|
||||
msgid "couldn't look up newly created commit"
|
||||
msgstr "无法找到新创建的提交"
|
||||
|
||||
#: builtin/commit.c:1296
|
||||
#: builtin/commit.c:1315
|
||||
msgid "could not parse newly created commit"
|
||||
msgstr "不能解析新创建的提交"
|
||||
|
||||
#: builtin/commit.c:1337
|
||||
#: builtin/commit.c:1356
|
||||
msgid "detached HEAD"
|
||||
msgstr "分离头指针"
|
||||
|
||||
# 译者：中文字符串拼接，可删除前导空格
|
||||
#: builtin/commit.c:1339
|
||||
#: builtin/commit.c:1358
|
||||
msgid " (root-commit)"
|
||||
msgstr "（根提交）"
|
||||
|
||||
#: builtin/commit.c:1406
|
||||
#: builtin/commit.c:1425
|
||||
msgid "suppress summary after successful commit"
|
||||
msgstr "提交成功后不显示概述信息"
|
||||
|
||||
#: builtin/commit.c:1407
|
||||
#: builtin/commit.c:1426
|
||||
msgid "show diff in commit message template"
|
||||
msgstr "在提交说明模板里显示差异"
|
||||
|
||||
#: builtin/commit.c:1409
|
||||
#: builtin/commit.c:1428
|
||||
msgid "Commit message options"
|
||||
msgstr "提交说明选项"
|
||||
|
||||
#: builtin/commit.c:1410 builtin/tag.c:457
|
||||
#: builtin/commit.c:1429 builtin/tag.c:457
|
||||
msgid "read message from file"
|
||||
msgstr "从文件中读取提交说明"
|
||||
|
||||
#: builtin/commit.c:1411
|
||||
#: builtin/commit.c:1430
|
||||
msgid "author"
|
||||
msgstr "作者"
|
||||
|
||||
#: builtin/commit.c:1411
|
||||
#: builtin/commit.c:1430
|
||||
msgid "override author for commit"
|
||||
msgstr "提交时覆盖作者"
|
||||
|
||||
#: builtin/commit.c:1412 builtin/gc.c:178
|
||||
#: builtin/commit.c:1431 builtin/gc.c:178
|
||||
msgid "date"
|
||||
msgstr "日期"
|
||||
|
||||
#: builtin/commit.c:1412
|
||||
#: builtin/commit.c:1431
|
||||
msgid "override date for commit"
|
||||
msgstr "提交时覆盖日期"
|
||||
|
||||
#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405
|
||||
#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
|
||||
#: builtin/notes.c:562 builtin/tag.c:455
|
||||
msgid "message"
|
||||
msgstr "说明"
|
||||
|
||||
#: builtin/commit.c:1413
|
||||
#: builtin/commit.c:1432
|
||||
msgid "commit message"
|
||||
msgstr "提交说明"
|
||||
|
||||
#: builtin/commit.c:1414
|
||||
#: builtin/commit.c:1433
|
||||
msgid "reuse and edit message from specified commit"
|
||||
msgstr "重用并编辑指定提交的提交说明"
|
||||
|
||||
#: builtin/commit.c:1415
|
||||
#: builtin/commit.c:1434
|
||||
msgid "reuse message from specified commit"
|
||||
msgstr "重用指定提交的提交说明"
|
||||
|
||||
#: builtin/commit.c:1416
|
||||
#: builtin/commit.c:1435
|
||||
msgid "use autosquash formatted message to fixup specified commit"
|
||||
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
|
||||
|
||||
#: builtin/commit.c:1417
|
||||
#: builtin/commit.c:1436
|
||||
msgid "use autosquash formatted message to squash specified commit"
|
||||
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
|
||||
|
||||
#: builtin/commit.c:1418
|
||||
#: builtin/commit.c:1437
|
||||
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
||||
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
|
||||
|
||||
#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111
|
||||
#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
|
||||
msgid "add Signed-off-by:"
|
||||
msgstr "添加 Signed-off-by: 签名"
|
||||
|
||||
#: builtin/commit.c:1420
|
||||
#: builtin/commit.c:1439
|
||||
msgid "use specified template file"
|
||||
msgstr "使用指定的模板文件"
|
||||
|
||||
#: builtin/commit.c:1421
|
||||
#: builtin/commit.c:1440
|
||||
msgid "force edit of commit"
|
||||
msgstr "强制编辑提交"
|
||||
|
||||
# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
|
||||
#: builtin/commit.c:1422
|
||||
#: builtin/commit.c:1441
|
||||
msgid "default"
|
||||
msgstr "default"
|
||||
|
||||
#: builtin/commit.c:1422 builtin/tag.c:460
|
||||
#: builtin/commit.c:1441 builtin/tag.c:460
|
||||
msgid "how to strip spaces and #comments from message"
|
||||
msgstr "设置如何删除提交说明里的空格和#注释"
|
||||
|
||||
#: builtin/commit.c:1423
|
||||
#: builtin/commit.c:1442
|
||||
msgid "include status in commit message template"
|
||||
msgstr "在提交说明模板里包含状态信息"
|
||||
|
||||
#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461
|
||||
#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
|
||||
msgid "key id"
|
||||
msgstr "key id"
|
||||
|
||||
#: builtin/commit.c:1425 builtin/merge.c:231
|
||||
#: builtin/commit.c:1444 builtin/merge.c:231
|
||||
msgid "GPG sign commit"
|
||||
msgstr "GPG 提交签名"
|
||||
|
||||
#. end commit message options
|
||||
#: builtin/commit.c:1428
|
||||
#: builtin/commit.c:1447
|
||||
msgid "Commit contents options"
|
||||
msgstr "提交内容选项"
|
||||
|
||||
#: builtin/commit.c:1429
|
||||
#: builtin/commit.c:1448
|
||||
msgid "commit all changed files"
|
||||
msgstr "提交所有改动的文件"
|
||||
|
||||
#: builtin/commit.c:1430
|
||||
#: builtin/commit.c:1449
|
||||
msgid "add specified files to index for commit"
|
||||
msgstr "添加指定的文件到索引区等待提交"
|
||||
|
||||
#: builtin/commit.c:1431
|
||||
#: builtin/commit.c:1450
|
||||
msgid "interactively add files"
|
||||
msgstr "交互式添加文件"
|
||||
|
||||
#: builtin/commit.c:1432
|
||||
#: builtin/commit.c:1451
|
||||
msgid "interactively add changes"
|
||||
msgstr "交互式添加变更"
|
||||
|
||||
#: builtin/commit.c:1433
|
||||
#: builtin/commit.c:1452
|
||||
msgid "commit only specified files"
|
||||
msgstr "只提交指定的文件"
|
||||
|
||||
#: builtin/commit.c:1434
|
||||
#: builtin/commit.c:1453
|
||||
msgid "bypass pre-commit hook"
|
||||
msgstr "绕过 pre-commit 钩子"
|
||||
|
||||
#: builtin/commit.c:1435
|
||||
#: builtin/commit.c:1454
|
||||
msgid "show what would be committed"
|
||||
msgstr "显示将要提交的内容"
|
||||
|
||||
#: builtin/commit.c:1446
|
||||
#: builtin/commit.c:1465
|
||||
msgid "amend previous commit"
|
||||
msgstr "修改先前的提交"
|
||||
|
||||
#: builtin/commit.c:1447
|
||||
#: builtin/commit.c:1466
|
||||
msgid "bypass post-rewrite hook"
|
||||
msgstr "绕过 post-rewrite 钩子"
|
||||
|
||||
#: builtin/commit.c:1452
|
||||
#: builtin/commit.c:1471
|
||||
msgid "ok to record an empty change"
|
||||
msgstr "允许一个空提交"
|
||||
|
||||
#: builtin/commit.c:1455
|
||||
#: builtin/commit.c:1474
|
||||
msgid "ok to record a change with an empty message"
|
||||
msgstr "允许空的提交说明"
|
||||
|
||||
#: builtin/commit.c:1488
|
||||
#: builtin/commit.c:1507
|
||||
msgid "could not parse HEAD commit"
|
||||
msgstr "不能解析 HEAD 提交"
|
||||
|
||||
#: builtin/commit.c:1526 builtin/merge.c:525
|
||||
#: builtin/commit.c:1545 builtin/merge.c:525
|
||||
#, c-format
|
||||
msgid "could not open '%s' for reading"
|
||||
msgstr "不能为读入打开 '%s'"
|
||||
|
||||
#: builtin/commit.c:1533
|
||||
#: builtin/commit.c:1552
|
||||
#, c-format
|
||||
msgid "Corrupt MERGE_HEAD file (%s)"
|
||||
msgstr "损坏的 MERGE_HEAD 文件（%s）"
|
||||
|
||||
#: builtin/commit.c:1540
|
||||
#: builtin/commit.c:1559
|
||||
msgid "could not read MERGE_MODE"
|
||||
msgstr "不能读取 MERGE_MODE"
|
||||
|
||||
#: builtin/commit.c:1559
|
||||
#: builtin/commit.c:1578
|
||||
#, c-format
|
||||
msgid "could not read commit message: %s"
|
||||
msgstr "不能读取提交说明：%s"
|
||||
|
||||
#: builtin/commit.c:1573
|
||||
#: builtin/commit.c:1592
|
||||
#, c-format
|
||||
msgid "Aborting commit; you did not edit the message.\n"
|
||||
msgstr "终止提交；您未更改来自模版的提交说明。\n"
|
||||
|
||||
#: builtin/commit.c:1578
|
||||
#: builtin/commit.c:1597
|
||||
#, c-format
|
||||
msgid "Aborting commit due to empty commit message.\n"
|
||||
msgstr "终止提交因为提交说明为空。\n"
|
||||
|
||||
#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886
|
||||
#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
|
||||
msgid "failed to write commit object"
|
||||
msgstr "无法写提交对象"
|
||||
|
||||
#: builtin/commit.c:1614
|
||||
#: builtin/commit.c:1633
|
||||
msgid "cannot lock HEAD ref"
|
||||
msgstr "无法锁定 HEAD 引用"
|
||||
|
||||
#: builtin/commit.c:1618
|
||||
#: builtin/commit.c:1637
|
||||
msgid "cannot update HEAD ref"
|
||||
msgstr "无法更新 HEAD 引用"
|
||||
|
||||
#: builtin/commit.c:1629
|
||||
#: builtin/commit.c:1648
|
||||
msgid ""
|
||||
"Repository has been updated, but unable to write\n"
|
||||
"new_index file. Check that disk is not full or quota is\n"
|
||||
@ -9722,7 +9740,7 @@ msgstr "无法保存 $stash_sha1"
|
||||
msgid ""
|
||||
"Applying autostash resulted in conflicts.\n"
|
||||
"Your changes are safe in the stash.\n"
|
||||
"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
|
||||
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
||||
msgstr ""
|
||||
"应用 autostash 导致冲突。\n"
|
||||
"您的修改安全地保存在 stash 中。\n"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user