Format the Project's Git-Glossary

Format our git-glossary as following:

  - All entries are listed in alphabetical order.

  - For individual entries:

    `<original-word> => <translation>[/<choice-2>[/<choice-3>]...]`

    Where:

      * <original-word> stands for the term to be translated.
      * <translation> stands for the translated Chinese word for that
        term.
      * <choice-2>, <choice-3> stand for the second and third
        translation choices for that term.  If the <original-word>
        itself is in this list, then it means we can leave it
        *untranslated* during translation process.  We can certainly
        append this list as needed.

Author: oldsharp

TRANSLATION_NOTES.asc

@@ -28,253 +28,253 @@
 
 ==== *A*
 
-abbreviate => [摘要]
+abbreviate => 摘要
 
-abbreviated => [简写的]
+abbreviated => 简写的
 
-amend => [修补]
+amend => 修补
 
-ancestor => [祖先]
+ancestor => 祖先
 
-annotate => [附注]
+annotate => 附注
 
-annotated =>  [附注的]
+annotated => 附注的
 
-annotated tag => [附注标签]
+annotated tag => 附注标签
 
-apply => [应用] (或者根据上下文也可以选择不翻译)
+apply => 应用/apply
 
-argument => [参数]
+argument => 参数
 
-authentication => [授权]
+authentication => 授权
 
 ==== *B*
 
-bare repo => [裸仓库]
+bare repo => 裸仓库
 
-binding => [绑定]
+binding => 绑定
 
-bisect => [二分查找]
+bisect => 二分查找
 
-blob object => [数据对象]
+blob object => 数据对象
 
-branch => [分支]
+branch => 分支
 
-bug => (保留原文不翻译)
+bug => bug
 
 ==== *C*
 
-certificate => [证书]
+certificate => 证书
 
-checkout => [检出](或者根据上下文也可以选择不翻译)
+checkout => 检出
 
-checksum => [校验和]
+checksum => 校验和
 
-cherry-pick => [拣选]
+cherry-pick => 拣选
 
-chunk => [块/区块]
+chunk => 块/区块
 
-client => [客户端]
+client => 客户端
 
-clone => [克隆]
+clone => 克隆
 
-code review => [代码审查]
+code review => 代码审查
 
-command => [命令]
+command => 命令
 
-commit => [提交/提交记录]
+commit => 提交/提交记录
 
-commit message => [提交信息]
+commit message => 提交信息
 
-commit object => [提交对象]
+commit object => 提交对象
 
-confilict => [冲突]
+confilict => 冲突
 
-contributing => [贡献]
+contributing => 贡献
 
 ==== *D*
 
-dangling object => [摇摆对象]
+dangling object => 摇摆对象
 
-dumb => [哑]
+dumb => 哑
 
 ==== *E*
 
-email address => [邮件地址]
+email address => 邮件地址
 
-endpoint => [接口]
+endpoint => 接口
 
 ==== *F*
 
-fast-forward => [快进]
+fast-forward => 快进
 
-fetch => [抓取]
+fetch => 抓取
 
-fork => [派生] (或根据上下文保留原文不翻译)
+fork => 派生
 
 ==== *G*
 
-guideline => [准则]
+guideline => 准则
 
 ==== *H*
 
-HEAD => (保留原文不翻译)
+HEAD => HEAD
 
-hunk => [数据块/区块/片段]
+hunk => 数据块/区块/片段
 
 ==== *I*
 
-ignore => [忽略]
+ignore => 忽略
 
-importer => [导入器]
+importer => 导入器
 
-issue => [缺陷/问题/议题] (根据上下文选择合适词语，也可以保留原文不翻译)
+issue => 缺陷/问题/议题/issue
 
 ==== *J*
 
 ==== *K*
 
 ==== *L*
 
-lightweight tag => [轻量标签]
+lightweight tag => 轻量标签
 
-log => [日志]
+log => 日志
 
-loose object => [松散对象]
+loose object => 松散对象
 
 ==== *M*
 
-merge => [合并]
+merge => 合并
 
 ==== *N*
 
 ==== *O*
 
-option => [选项]
+option => 选项
 
 ==== *P*
 
-pack => [打包/包]
+pack => 包/打包
 
-packed => [已经打包的]
+packed => 已打包的
 
-packfile => [包文件]
+packfile => 包文件
 
-parameter => [参数]
+parameter => 参数
 
-parent => [父提交]  `第一版中译者似乎把 parent ancestor 全部翻译成祖先`
+parent => 父提交
 
-patch => [补丁]
+patch => 补丁
 
-plumbing => [底层命令]
+plumbing => 底层命令
 
-porcelain => [高层命令]
+porcelain => 高层命令
 
-progressive-stability => [渐进稳定]
+progressive-stability => 渐进稳定
 
-pull => [拉取] (或者根据上下文不翻译)
+pull => 拉取/pull
 
-pull request => [合并请求]
+pull request => 合并请求
 
-push => [推送]
+push => 推送
 
 ==== *Q*
 
 ==== *R*
 
-reapply => [重新应用]
+reapply => 重新应用
 
-rebase => [变基]
+rebase => 变基
 
-regex => [正则表达式]
+regex => 正则表达式
 
-remote => [远程/远程仓库]
+remote => 远程/远程仓库
 
-remote help => [远程助手]
+remote help => 远程助手
 
-replay => [重演]
+replay => 重演
 
-repo => [仓库] (或者保留原文不翻译)
+repo => 仓库/repo
 
-repository => [仓库]
+repository => 仓库
 
-reverse => [还原]
+reverse => 还原
 
-revert => [恢复] `可以根据上下文决定翻译成 [恢复] 还是 [反转]`
+revert => 恢复/反转
 
-revision => [修订版本]
+revision => 修订版本
 
-rewrite => [重写]
+rewrite => 重写
 
 ==== *S*
 
-show => [显示]
+show => 显示
 
-sign => [签名]
+sign => 签名
 
-signed => [已经签署/签名的]
+signed => 已签署的/已签名的
 
-silo => [流水线]
+silo => 流水线
 
-shorthand => [简写]
+shorthand => 简写
 
-smart => [智能]
+smart => 智能
 
-squash => [压缩/挤进]  `第一版这个词没有很好的翻译出来`
+squash => 压缩/挤进
 
-stage => [暂存/缓存]
+stage => 暂存/缓存
 
-staged => [暂存的/缓存的]
+staged => 已暂存的/已缓存的
 
-staging area => [暂存区/缓存区]
+staging area => 暂存区/缓存区
 
-stash => [保存进度] (或者根据上下文选择相近含义的词)
+stash => 保存进度
 
-store => [保存/存储]
+store => 保存/存储
 
-submodule => [子模块]
+submodule => 子模块
 
 ==== *T*
 
-tag => [标签/打标签]
+tag => 标签/打标签
 
-tag object => [标签对象]
+tag object => 标签对象
 
-three-way merge => [三方合并]
+three-way merge => 三方合并
 
-track => [跟踪]
+track => 跟踪
 
-tracking branch => [跟踪分支]
+tracking branch => 跟踪分支
 
-topic branch => [特性分支]
+topic branch => 特性分支
 
-tree => [树/目录树]
+tree => 树/目录树
 
-tree object => [树对象]
+tree object => 树对象
 
 ==== *U*
 
-unambiguous => [没有歧义/没有歧义的]
+unambiguous => 没有歧义/没有歧义的
 
-unannotated => [不含注解的]
+unannotated => 不含注解的
 
-unpack => [解包]
+unpack => 解包
 
-upstream => [上游/上游仓库]
+upstream => 上游/上游仓库
 
 ==== *V*
 
-VCS => [版本控制系统] (或者根据上下文也可以选择不翻译)
+VCS => 版本控制系统/VCS
 
 ==== *W*
 
-whitespace => [多余的空白字符]
+whitespace => 多余的空白字符
 
-workflow => [工作流程]
+workflow => 工作流程
 
-working directory => [工作目录]
+working directory => 工作目录
 
-working tree => [工作区]
+working tree => 工作区
 
 ==== *X*