l10n: zh_CN: Update Translation of "tag"

- "tag" translated as "标签". - "annotated tag" translated as "附注标签". - "mergetag" translated as "合并标签". - "tag name" translated as "标签名称". - Relevant adjustments. Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Ray Chen committed Jul 28, 2015 at 12:52 UTC 55a16ee48748089e73d6c7e6c22a3618f90bedc4
1 file changed +67 -67
po/zh_CN.po
+67 -67
@@ -13,7 +13,7 @@ msgstr ""
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2015-07-14 07:19+0800\n"
16 -"PO-Revision-Date: 2015-07-27 23:37+0800\n"
16 +"PO-Revision-Date: 2015-07-30 23:41+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
19 "Language: zh_CN\n"
@@ -5011,17 +5011,17 @@ msgstr "git describe [<选项>] --dirty"
5011 #: builtin/describe.c:217
5012 #, c-format
5013 msgid "annotated tag %s not available"
5014 -msgstr "注释 tag %s 无效"
5014 +msgstr "附注标签 %s 无效"
5015
5016 #: builtin/describe.c:221
5017 #, c-format
5018 msgid "annotated tag %s has no embedded name"
5019 -msgstr "注释 tag %s 没有嵌入名称"
5019 +msgstr "附注标签 %s 没有嵌入名称"
5020
5021 #: builtin/describe.c:223
5022 #, c-format
5023 msgid "tag '%s' is really '%s' here"
5024 -msgstr "tag '%s' 的确是在 '%s'"
5024 +msgstr "标签 '%s' 的确是在 '%s'"
5025
5026 #: builtin/describe.c:250 builtin/log.c:452
5027 #, c-format
@@ -5036,7 +5036,7 @@ msgstr "%s 不是一个有效的 '%s' 对象"
5036 #: builtin/describe.c:270
5037 #, c-format
5038 msgid "no tag exactly matches '%s'"
5039 -msgstr "没有 tag 准确匹配 '%s'"
5039 +msgstr "没有标签准确匹配 '%s'"
5040
5041 #: builtin/describe.c:272
5042 #, c-format
@@ -5054,8 +5054,8 @@ msgid ""
5054 "No annotated tags can describe '%s'.\n"
5055 "However, there were unannotated tags: try --tags."
5056 msgstr ""
5057 -"没有注释 tag 能描述 '%s'。\n"
5058 -"然而,有非注释 tag:尝试 --tags。"
5057 +"没有附注标签能描述 '%s'。\n"
5058 +"然而,存在未附注标签:尝试 --tags。"
5059
5060 #: builtin/describe.c:350
5061 #, c-format
@@ -5063,8 +5063,8 @@ msgid ""
5063 "No tags can describe '%s'.\n"
5064 "Try --always, or create some tags."
5065 msgstr ""
5066 -"没有注释 tag 能描述 '%s'。\n"
5067 -"尝试 --always,或者创建一些 tag。"
5066 +"没有标签能描述 '%s'。\n"
5067 +"尝试 --always,或者创建一些标签。"
5068
5069 #: builtin/describe.c:371
5070 #, c-format
@@ -5077,12 +5077,12 @@ msgid ""
5077 "more than %i tags found; listed %i most recent\n"
5078 "gave up search at %s\n"
5079 msgstr ""
5080 -"发现多于 %i 个 tag,列出最近的 %i 个\n"
5080 +"发现多于 %i 个标签,列出最近的 %i 个\n"
5081 "在 %s 放弃搜索\n"
5082
5083 #: builtin/describe.c:396
5084 msgid "find the tag that comes after the commit"
5085 -msgstr "寻找提交之后的 tag(用于描述提交)"
5085 +msgstr "寻找该提交之后的标签"
5086
5087 #: builtin/describe.c:397
5088 msgid "debug search strategy on stderr"
@@ -5094,7 +5094,7 @@ msgstr "使用任意引用"
5094
5095 #: builtin/describe.c:399
5096 msgid "use any tag, even unannotated"
5097 -msgstr "使用任意 tag,即使未带注解"
5097 +msgstr "使用任意标签,即使未附带注释"
5098
5099 #: builtin/describe.c:400
5100 msgid "always use long format"
@@ -5110,11 +5110,11 @@ msgstr "只输出精确匹配"
5110
5111 #: builtin/describe.c:406
5112 msgid "consider <n> most recent tags (default: 10)"
5113 -msgstr "考虑最近 <n> 个 tags(默认:10)"
5113 +msgstr "考虑最近 <n> 个标签(默认:10)"
5114
5115 #: builtin/describe.c:408
5116 msgid "only consider tags matching <pattern>"
5117 -msgstr "只考虑匹配 <模式> 的 tags"
5117 +msgstr "只考虑匹配 <模式> 的标签"
5118
5119 #: builtin/describe.c:410 builtin/name-rev.c:318
5120 msgid "show abbreviated commit object as fallback"
@@ -5179,11 +5179,11 @@ msgstr "在 <n> 个对象之后显示进度"
5179
5180 #: builtin/fast-export.c:981
5181 msgid "select handling of signed tags"
5182 -msgstr "选择如何处理签名 tags"
5182 +msgstr "选择如何处理签名标签"
5183
5184 #: builtin/fast-export.c:984
5185 msgid "select handling of tags that tag filtered objects"
5186 -msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5186 +msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5187
5188 #: builtin/fast-export.c:987
5189 msgid "Dump marks to this file"
@@ -5195,7 +5195,7 @@ msgstr "从这个文件导入标记"
5195
5196 #: builtin/fast-export.c:991
5197 msgid "Fake a tagger when tags lack one"
5198 -msgstr "当 tags 缺少标记者字段时,假装提供一个"
5198 +msgstr "当标签缺少标记者字段时,假装提供一个"
5199
5200 #: builtin/fast-export.c:993
5201 msgid "Output full tree for each commit"
@@ -5259,11 +5259,11 @@ msgstr "从多个远程抓取"
5259
5260 #: builtin/fetch.c:98
5261 msgid "fetch all tags and associated objects"
5262 -msgstr "抓取所有的 tags 和关联对象"
5262 +msgstr "抓取所有的标签和关联对象"
5263
5264 #: builtin/fetch.c:100
5265 msgid "do not fetch all tags (--no-tags)"
5266 -msgstr "不抓取任何 tags (--no-tags)"
5266 +msgstr "不抓取任何标签(--no-tags)"
5267
5268 #: builtin/fetch.c:102
5269 msgid "prune remote-tracking branches no longer on remote"
@@ -5342,7 +5342,7 @@ msgstr "[已拒绝]"
5342
5343 #: builtin/fetch.c:488
5344 msgid "[tag update]"
5345 -msgstr "[tag更新]"
5345 +msgstr "[标签更新]"
5346
5347 # 译者:注意保持前导空格
5348 #: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
@@ -5351,7 +5351,7 @@ msgstr " (不能更新本地引用)"
5351
5352 #: builtin/fetch.c:508
5353 msgid "[new tag]"
5354 -msgstr "[新tag]"
5354 +msgstr "[新标签]"
5355
5356 #: builtin/fetch.c:511
5357 msgid "[new branch]"
@@ -5460,7 +5460,7 @@ msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定
5460
5461 #: builtin/fetch.c:1106
5462 msgid "You need to specify a tag name."
5463 -msgstr "您需要指定一个 tag 名称。"
5463 +msgstr "您需要指定一个标签名称。"
5464
5465 #: builtin/fetch.c:1148
5466 msgid "--depth and --unshallow cannot be used together"
@@ -5585,7 +5585,7 @@ msgstr "显示摇摆的对象"
5585
5586 #: builtin/fsck.c:619
5587 msgid "report tags"
5588 -msgstr "报告 tags"
5588 +msgstr "报告标签"
5589
5590 #: builtin/fsck.c:620
5591 msgid "report root nodes"
@@ -7488,7 +7488,7 @@ msgstr "只打印名称(无 SHA-1)"
7488
7489 #: builtin/name-rev.c:310
7490 msgid "only use tags to name the commits"
7491 -msgstr "只使用 tags 来命名提交"
7491 +msgstr "只使用标签来命名提交"
7492
7493 #: builtin/name-rev.c:312
7494 msgid "only use refs matching <pattern>"
@@ -7508,7 +7508,7 @@ msgstr "允许打印 `未定义` 的名称(默认)"
7508
7509 #: builtin/name-rev.c:322
7510 msgid "dereference tags in the input (internal use)"
7511 -msgstr "反向解析输入中的 tags(内部使用)"
7511 +msgstr "反向解析输入中的标签(内部使用)"
7512
7513 #: builtin/notes.c:24
7514 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
@@ -8062,7 +8062,7 @@ msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
8062
8063 #: builtin/push.c:85
8064 msgid "tag shorthand without <tag>"
8065 -msgstr "tag 后面未提供 <标签> 参数"
8065 +msgstr "标签后面未提供 <标签> 参数"
8066
8067 #: builtin/push.c:95
8068 msgid "--delete only accepts plain target ref names"
@@ -8228,7 +8228,7 @@ msgstr ""
8228
8229 #: builtin/push.c:298
8230 msgid "Updates were rejected because the tag already exists in the remote."
8231 -msgstr "更新被拒绝因为 tag 在远程已经存在。"
8231 +msgstr "更新被拒绝,因为该标签在远程已经存在。"
8232
8233 #: builtin/push.c:301
8234 msgid ""
@@ -8313,7 +8313,7 @@ msgstr "删除引用"
8313
8314 #: builtin/push.c:507
8315 msgid "push tags (can't be used with --all or --mirror)"
8316 -msgstr "推送 tags(不能使用 --all or --mirror)"
8316 +msgstr "推送标签(不能使用 --all or --mirror)"
8317
8318 #: builtin/push.c:510
8319 msgid "force updates"
@@ -8353,7 +8353,7 @@ msgstr "绕过 pre-push 钩子"
8353
8354 #: builtin/push.c:527
8355 msgid "push missing but relevant tags"
8356 -msgstr "推送缺失的有关的 tags"
8356 +msgstr "推送缺失但有关的标签"
8357
8358 #: builtin/push.c:529
8359 msgid "GPG sign the push"
@@ -8556,11 +8556,11 @@ msgstr "抓取远程的分支"
8556
8557 #: builtin/remote.c:155
8558 msgid "import all tags and associated objects when fetching"
8559 -msgstr "抓取时导入所有的 tags 和关联对象"
8559 +msgstr "抓取时导入所有的标签和关联对象"
8560
8561 #: builtin/remote.c:158
8562 msgid "or do not fetch any tag at all (--no-tags)"
8563 -msgstr "或不抓取任何 tag(--no-tags)"
8563 +msgstr "或不抓取任何标签(--no-tags)"
8564
8565 #: builtin/remote.c:160
8566 msgid "branch(es) to track"
@@ -9043,19 +9043,19 @@ msgstr "不是一个有效的对象名:'%s'"
9043 #: builtin/replace.c:355
9044 #, c-format
9045 msgid "bad mergetag in commit '%s'"
9046 -msgstr "提交 '%s' 中损坏的 mergetag"
9046 +msgstr "提交 '%s' 中含有损坏的合并标签"
9047
9048 #: builtin/replace.c:357
9049 #, c-format
9050 msgid "malformed mergetag in commit '%s'"
9051 -msgstr "提交 '%s' 中非法的 mergetag"
9051 +msgstr "提交 '%s' 中含有非法的合并标签"
9052
9053 #: builtin/replace.c:368
9054 #, c-format
9055 msgid ""
9056 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9057 "instead of --graft"
9058 -msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
9058 +msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9059
9060 #: builtin/replace.c:401
9061 #, c-format
@@ -9576,11 +9576,11 @@ msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9576
9577 #: builtin/show-ref.c:170
9578 msgid "only show tags (can be combined with heads)"
9579 -msgstr "只显示 tags(可以和头共用)"
9579 +msgstr "只显示标签(可以和头共用)"
9580
9581 #: builtin/show-ref.c:171
9582 msgid "only show heads (can be combined with tags)"
9583 -msgstr "只显示头(可以和 tags 共用)"
9583 +msgstr "只显示头(可以和标签共用)"
9584
9585 #: builtin/show-ref.c:172
9586 msgid "stricter reference checking, requires exact ref path"
@@ -9592,7 +9592,7 @@ msgstr "显示 HEAD 引用,即使被过滤掉"
9592
9593 #: builtin/show-ref.c:179
9594 msgid "dereference tags into object IDs"
9595 -msgstr "转换 tags 到对象ID"
9595 +msgstr "转换标签到对象ID"
9596
9597 #: builtin/show-ref.c:181
9598 msgid "only show SHA1 hash using <n> digits"
@@ -9664,22 +9664,22 @@ msgstr "非法的对象于 '%s'"
9664 #: builtin/tag.c:301
9665 #, c-format
9666 msgid "tag name too long: %.*s..."
9667 -msgstr "tag 名字太长:%.*s..."
9667 +msgstr "标签名称太长:%.*s..."
9668
9669 #: builtin/tag.c:306
9670 #, c-format
9671 msgid "tag '%s' not found."
9672 -msgstr "tag '%s' 未发现。"
9672 +msgstr "未发现标签 '%s'。"
9673
9674 #: builtin/tag.c:321
9675 #, c-format
9676 msgid "Deleted tag '%s' (was %s)\n"
9677 -msgstr "已删除 tag '%s'(曾为 %s)\n"
9677 +msgstr "已删除标签 '%s'(曾为 %s)\n"
9678
9679 #: builtin/tag.c:333
9680 #, c-format
9681 msgid "could not verify the tag '%s'"
9682 -msgstr "不能校验 tag '%s'"
9682 +msgstr "不能校验该标签 '%s'"
9683
9684 #: builtin/tag.c:343
9685 #, c-format
@@ -9690,7 +9690,7 @@ msgid ""
9690 "Lines starting with '%c' will be ignored.\n"
9691 msgstr ""
9692 "\n"
9693 -"输入一个 tag 说明:\n"
9693 +"输入一个标签说明:\n"
9694 " %s\n"
9695 "以 '%c' 开头的行将被忽略。\n"
9696
@@ -9704,7 +9704,7 @@ msgid ""
9704 "want to.\n"
9705 msgstr ""
9706 "\n"
9707 -"输入一个 tag 说明:\n"
9707 +"输入一个标签说明:\n"
9708 " %s\n"
9709 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9710
@@ -9720,11 +9720,11 @@ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9720
9721 #: builtin/tag.c:428
9722 msgid "unable to sign the tag"
9723 -msgstr "无法签署 tag"
9723 +msgstr "无法签署标签"
9724
9725 #: builtin/tag.c:430
9726 msgid "unable to write tag file"
9727 -msgstr "无法写 tag 文件"
9727 +msgstr "无法写标签文件"
9728
9729 #: builtin/tag.c:455
9730 msgid "bad object type."
@@ -9732,16 +9732,16 @@ msgstr "坏的对象类型。"
9732
9733 #: builtin/tag.c:468
9734 msgid "tag header too big."
9735 -msgstr "tag 头信息太大。"
9735 +msgstr "标签头信息太大。"
9736
9737 #: builtin/tag.c:504
9738 msgid "no tag message?"
9739 -msgstr "无 tag 说明?"
9739 +msgstr "无标签说明?"
9740
9741 #: builtin/tag.c:510
9742 #, c-format
9743 msgid "The tag message has been left in %s\n"
9744 -msgstr "tag 说明被保留在 %s\n"
9744 +msgstr "标签说明被保留在 %s\n"
9745
9746 #: builtin/tag.c:559
9747 msgid "switch 'points-at' requires an object"
@@ -9754,63 +9754,63 @@ msgstr "非法的对象名 '%s'"
9754
9755 #: builtin/tag.c:589
9756 msgid "list tag names"
9757 -msgstr "列出tag名称"
9757 +msgstr "列出标签名称"
9758
9759 #: builtin/tag.c:591
9760 msgid "print <n> lines of each tag message"
9761 -msgstr "每个 tag 信息打印 <n> 行"
9761 +msgstr "每个标签信息打印 <n> 行"
9762
9763 #: builtin/tag.c:593
9764 msgid "delete tags"
9765 -msgstr "删除 tags"
9765 +msgstr "删除标签"
9766
9767 #: builtin/tag.c:594
9768 msgid "verify tags"
9769 -msgstr "验证 tags"
9769 +msgstr "验证标签"
9770
9771 #: builtin/tag.c:596
9772 msgid "Tag creation options"
9773 -msgstr "Tag 创建选项"
9773 +msgstr "标签创建选项"
9774
9775 #: builtin/tag.c:598
9776 msgid "annotated tag, needs a message"
9777 -msgstr "注解 tag,需要一个说明"
9777 +msgstr "附注标签,需要一个说明"
9778
9779 #: builtin/tag.c:600
9780 msgid "tag message"
9781 -msgstr "tag 说明"
9781 +msgstr "标签说明"
9782
9783 #: builtin/tag.c:602
9784 msgid "annotated and GPG-signed tag"
9785 -msgstr "注解并 GPG 签名的 tag"
9785 +msgstr "附注并附加 GPG 签名的标签"
9786
9787 #: builtin/tag.c:606
9788 msgid "use another key to sign the tag"
9789 -msgstr "使用另外的私钥签名 tag"
9789 +msgstr "使用另外的私钥签名该标签"
9790
9791 #: builtin/tag.c:607
9792 msgid "replace the tag if exists"
9793 -msgstr "如果存在,替换现有的 tag"
9793 +msgstr "如果存在,替换现有的标签"
9794
9795 #: builtin/tag.c:609
9796 msgid "Tag listing options"
9797 -msgstr "Tag 列表选项"
9797 +msgstr "标签列表选项"
9798
9799 #: builtin/tag.c:610
9800 msgid "show tag list in columns"
9801 -msgstr "以列的方式显示 tag"
9801 +msgstr "以列的方式显示标签列表"
9802
9803 #: builtin/tag.c:612
9804 msgid "sort tags"
9805 -msgstr "排序 tags"
9805 +msgstr "排序标签"
9806
9807 #: builtin/tag.c:617 builtin/tag.c:623
9808 msgid "print only tags that contain the commit"
9809 -msgstr "只打印包含提交的tags"
9809 +msgstr "只打印包含提交的标签"
9810
9811 #: builtin/tag.c:629
9812 msgid "print only tags of the object"
9813 -msgstr "只打印tags对象"
9813 +msgstr "只打印对象的标签"
9814
9815 #: builtin/tag.c:655
9816 msgid "--column and -n are incompatible"
@@ -9843,17 +9843,17 @@ msgstr "太多参数"
9843 #: builtin/tag.c:712
9844 #, c-format
9845 msgid "'%s' is not a valid tag name."
9846 -msgstr "'%s' 不是一个有效的tag名称。"
9846 +msgstr "'%s' 不是一个有效的标签名称。"
9847
9848 #: builtin/tag.c:717
9849 #, c-format
9850 msgid "tag '%s' already exists"
9851 -msgstr "tag '%s' 已存在"
9851 +msgstr "标签 '%s' 已存在"
9852
9853 #: builtin/tag.c:741
9854 #, c-format
9855 msgid "Updated tag '%s' (was %s)\n"
9856 -msgstr "已更新tag '%s'(曾为 %s)\n"
9856 +msgstr "已更新标签 '%s'(曾为 %s)\n"
9857
9858 #: builtin/unpack-objects.c:489
9859 msgid "Unpacking objects"
@@ -10103,7 +10103,7 @@ msgstr "git verify-tag [-v | --verbose] <标签>..."
10103
10104 #: builtin/verify-tag.c:73
10105 msgid "print tag contents"
10106 -msgstr "打印 tag 内容"
10106 +msgstr "打印标签内容"
10107
10108 #: builtin/worktree.c:11
10109 msgid "git worktree add [<options>] <path> <branch>"