| 1 | # Translation of git-gui glossary to Simplified Chinese |
| 2 | # Copyright (C) 2007 Shawn Pearce, et al. |
| 3 | # This file is distributed under the same license as the git package. |
| 4 | # Xudong Guan <xudong.guan@gmail.com> and the zh-kernel.org mailing list, 2007 |
| 5 | # |
| 6 | msgid "" |
| 7 | msgstr "" |
| 8 | "Project-Id-Version: git-gui glossary\n" |
| 9 | "PO-Revision-Date: 2007-07-23 22:07+0200\n" |
| 10 | "Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n" |
| 11 | "Language-Team: Simplified Chinese \n" |
| 12 | "MIME-Version: 1.0\n" |
| 13 | "Content-Type: text/plain; charset=UTF-8\n" |
| 14 | "Content-Transfer-Encoding: 8bit\n" |
| 15 | |
| 16 | #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" |
| 17 | msgid "" |
| 18 | "English Term (Dear translator: This file will never be visible to the user!)" |
| 19 | msgstr "注：这个文件是为了帮助翻译人员统一名词术语。最终用户不会关心这个文件。" |
| 20 | |
| 21 | #. "" |
| 22 | #. amend指用户修改最近一次commit的操作，修订？修改？修正？ |
| 23 | #. [WANG Cong]: 根据我的了解，这个词似乎翻译成“修订”多一些。“修正”也可以，“修改”再次之。 |
| 24 | #. [ZHANG Le]: 修订，感觉一般指对一些大型出版物的大规模升级，比如修订新华字典 |
| 25 | # 修正，其实每次amend的结果也不一定就是最后结果，说不定还需要修改。所以不 |
| 26 | # 如就叫修改 |
| 27 | msgid "amend" |
| 28 | msgstr "修订" |
| 29 | |
| 30 | #. "" |
| 31 | #. git annotate 文件名：用来标注文件的每一行在什么时候被谁最后修改。 |
| 32 | #. [WANG Cong]: "标记"一般是mark。;) |
| 33 | #. [ZHANG Le]: 标注，或者干脆用原意：注解，或注释 |
| 34 | msgid "annotate" |
| 35 | msgstr "标注" |
| 36 | |
| 37 | #. "A 'branch' is an active line of development." |
| 38 | msgid "branch [noun]" |
| 39 | msgstr "分支" |
| 40 | |
| 41 | #. "" |
| 42 | msgid "branch [verb]" |
| 43 | msgstr "建立分支" |
| 44 | |
| 45 | #. "" |
| 46 | #. [WANG Cong]: 网上有人翻译成“检出”，我感觉更好一些，毕竟把check的意思翻译出来了。 |
| 47 | #. [ZHNAG Le]: 提取吧，提取分支／版本 |
| 48 | #. [rae l]: 签出。subversion软件中的大多词汇已有翻译，既然git与subversion同是SCM管理，可以参考同类软件的翻译也不错。 |
| 49 | msgid "checkout [noun]" |
| 50 | msgstr "签出" |
| 51 | |
| 52 | #. "The action of updating the working tree to a revision which was stored in the object database." |
| 53 | msgid "checkout [verb]" |
| 54 | msgstr "签出" |
| 55 | |
| 56 | #. "A single point in the git history." |
| 57 | msgid "commit [noun]" |
| 58 | msgstr "提交" |
| 59 | |
| 60 | #. "The action of storing a new snapshot of the project's state in the git history." |
| 61 | msgid "commit [verb]" |
| 62 | msgstr "提交" |
| 63 | |
| 64 | #. "" |
| 65 | #. 差异？差别？ |
| 66 | #. [ZHANG Le]: 个人感觉差别更加中性一些 |
| 67 | msgid "diff [noun]" |
| 68 | msgstr "差别" |
| 69 | |
| 70 | #. "" |
| 71 | msgid "diff [verb]" |
| 72 | msgstr "比较" |
| 73 | |
| 74 | #. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." |
| 75 | msgid "fast forward merge" |
| 76 | msgstr "快进式合并" |
| 77 | |
| 78 | #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." |
| 79 | #. 获取？取得？下载？更新？注意和update的区分 |
| 80 | msgid "fetch" |
| 81 | msgstr "获取" |
| 82 | |
| 83 | #. "A collection of files. The index is a stored version of your working tree." |
| 84 | #. index是working tree和repository之间的缓存 |
| 85 | msgid "index (in git-gui: staging area)" |
| 86 | msgstr "工作缓存？" |
| 87 | |
| 88 | #. "A successful merge results in the creation of a new commit representing the result of the merge." |
| 89 | msgid "merge [noun]" |
| 90 | msgstr "合并" |
| 91 | |
| 92 | #. "To bring the contents of another branch into the current branch." |
| 93 | msgid "merge [verb]" |
| 94 | msgstr "合并" |
| 95 | |
| 96 | #. "" |
| 97 | #. message是指commit中的文字信息 |
| 98 | msgid "message" |
| 99 | msgstr "描述" |
| 100 | |
| 101 | #. "Pulling a branch means to fetch it and merge it." |
| 102 | msgid "pull" |
| 103 | msgstr "获取＋合并" |
| 104 | |
| 105 | #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" |
| 106 | msgid "push" |
| 107 | msgstr "推入" |
| 108 | |
| 109 | #. "" |
| 110 | msgid "redo" |
| 111 | msgstr "重做" |
| 112 | |
| 113 | #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" |
| 114 | msgid "repository" |
| 115 | msgstr "仓库" |
| 116 | |
| 117 | #. "" |
| 118 | msgid "reset" |
| 119 | msgstr "重置" |
| 120 | |
| 121 | #. "" |
| 122 | msgid "revert" |
| 123 | msgstr "恢复" |
| 124 | |
| 125 | #. "A particular state of files and directories which was stored in the object database." |
| 126 | msgid "revision" |
| 127 | msgstr "版本" |
| 128 | |
| 129 | #. "" |
| 130 | msgid "sign off" |
| 131 | msgstr "签名" |
| 132 | |
| 133 | #. "" |
| 134 | #. 似乎是git-gui里面显示的本次提交的文件清单区域 |
| 135 | msgid "staging area" |
| 136 | msgstr "提交暂存区" |
| 137 | |
| 138 | #. "" |
| 139 | msgid "status" |
| 140 | msgstr "状态" |
| 141 | |
| 142 | #. "A ref pointing to a tag or commit object" |
| 143 | msgid "tag [noun]" |
| 144 | msgstr "标签" |
| 145 | |
| 146 | #. "" |
| 147 | msgid "tag [verb]" |
| 148 | msgstr "添加标签" |
| 149 | |
| 150 | #. "A regular git branch that is used to follow changes from another repository." |
| 151 | msgid "tracking branch" |
| 152 | msgstr "跟踪分支" |
| 153 | |
| 154 | #. "" |
| 155 | msgid "undo" |
| 156 | msgstr "撤销" |
| 157 | |
| 158 | #. "" |
| 159 | msgid "update" |
| 160 | msgstr "更新。注意和fetch的区分" |
| 161 | |
| 162 | #. "" |
| 163 | msgid "verify" |
| 164 | msgstr "验证" |
| 165 | |
| 166 | #. "The tree of actual checked out files." |
| 167 | #. "工作副本？工作区域？工作目录" |
| 168 | #. [LI Yang]: 当前副本， 当前源码树？ |
| 169 | msgid "working copy, working tree" |
| 170 | msgstr "工作副本，工作源码树" |