Update the Project's Git-Glossary

Update the git-glossary mainly according to the last version of
https://github.com/git/git/blob/master/po/zh_CN.po
and some other additional entries.

This commit resolves issues listed as follow:

  - resolve #219 : index => index/索引/暂存区
  - resolve #224 : backport => 向后移植
  - resolve #234 : pull request => 拉取请求
  - resolve #240 : fork => 派生 (only one choice to avoid ambiguous)

Author: oldsharp

TRANSLATION_NOTES.asc

@@ -26,31 +26,39 @@
 
 术语的译法应当优先参考“link:https://github.com/git/git/blob/master/po/zh_CN.po[Git 软件包的简体中文翻译]”。
 
+==== *#*
+
+3-way merge => 三方合并
+
 ==== *A*
 
-abbreviate => 摘要
+abbreviate => 简写/简写的 SHA-1 值
 
 abbreviated => 简写的
 
 amend => 修补
 
-ancestor => 祖先
+ancestor => 祖先/祖先提交
 
 annotate => 附注
 
 annotated => 附注的
 
 annotated tag => 附注标签
 
-apply => 应用/apply
+apply => 应用
 
 argument => 参数
 
 authentication => 授权
 
 ==== *B*
 
-bare repo => 裸仓库
+backport => 向后移植
+
+bare repo => 纯仓库
+
+bare repository => 纯仓库
 
 binding => 绑定
 
@@ -68,35 +76,43 @@ certificate => 证书
 
 checkout => 检出
 
-checksum => 校验和
+checksum => 校验/校验和
 
 cherry-pick => 拣选
 
 chunk => 块/区块
 
+clean => 干净/干净的工作区
+
 client => 客户端
 
 clone => 克隆
 
 code review => 代码审查
 
+collaborator => 合作者
+
 command => 命令
 
-commit => 提交/提交记录
+commit => 提交
 
 commit message => 提交信息
 
 commit object => 提交对象
 
 confilict => 冲突
 
-contributing => 贡献
+contributing => 贡献/作贡献
+
+contribution => 贡献
+
+contributor => 贡献者
 
 ==== *D*
 
 dangling object => 摇摆对象
 
-dumb => 哑
+dumb HTTP protocol => 哑 HTTP 协议
 
 ==== *E*
 
@@ -108,7 +124,7 @@ endpoint => 接口
 
 fast-forward => 快进
 
-fetch => 抓取
+fetch => 获取
 
 fork => 派生
 
@@ -118,7 +134,15 @@ guideline => 准则
 
 ==== *H*
 
-HEAD => HEAD
+hash => 哈希/哈希值
+
+HEAD => HEAD/头指针/当前分支
+
+head => 头/分支
+
+header => 头信息
+
+hook => 钩子
 
 hunk => 数据块/区块/片段
 
@@ -128,6 +152,8 @@ ignore => 忽略
 
 importer => 导入器
 
+index => index/索引/暂存区
+
 issue => 缺陷/问题/议题/issue
 
 ==== *J*
@@ -150,6 +176,14 @@ merge => 合并
 
 ==== *O*
 
+object => 对象
+
+object database => 对象库
+
+object name => 对象名称
+
+object type => 对象类型
+
 option => 选项
 
 ==== *P*
@@ -166,17 +200,21 @@ parent => 父提交
 
 patch => 补丁
 
-plumbing => 底层命令
+pathspec => 路径规格
+
+pattern => 模式
 
-porcelain => 高层命令
+plumbing => 管件
+
+porcelain => 瓷件
 
 progressive-stability => 渐进稳定
 
-pull => 拉取/pull
+pull => 拉/拉取
 
-pull request => 合并请求
+pull request => 拉取请求
 
-push => 推送
+push => 推/推送
 
 ==== *Q*
 
@@ -186,60 +224,82 @@ reapply => 重新应用
 
 rebase => 变基
 
+ref => 引用
+
+reference => 引用
+
+reflog => 引用日志
+
+refspec => 引用规格
+
 regex => 正则表达式
 
 remote => 远程/远程仓库
 
-remote help => 远程助手
+remote helper => 远程助手
 
-replay => 重演
+remote-tracking branch => 远程跟踪分支
 
-repo => 仓库/repo
+replay => 重放
+
+repo => 仓库
 
 repository => 仓库
 
-reverse => 还原
+resolve => 解决
+
+reverse => 反转/相反
 
-revert => 恢复/反转
+revert => 还原
 
-revision => 修订版本
+revision => 版本
+
+rewind => 回退
 
 rewrite => 重写
 
 ==== *S*
 
+SCM => SCM/源代码管理工具
+
+SHA-1 => SHA-1
+
+shorthand => 简写
+
 show => 显示
 
 sign => 签名
 
 signed => 已签署的/已签名的
 
-silo => 流水线
+signed tag => 签名标签
 
-shorthand => 简写
+silo => 流水线
 
-smart => 智能
+smart HTTP protocol => 智能
 
-squash => 压缩/挤进
+squash => 压缩
 
-stage => 暂存/缓存
+stage => 暂存
 
-staged => 已暂存的/已缓存的
+staged => 已暂存的
 
-staging area => 暂存区/缓存区
+staging area => 暂存区
 
-stash => 保存进度
+stash => 进度保存/保存进度
 
 store => 保存/存储
 
-submodule => 子模块
+submodule => 子模组
 
 ==== *T*
 
 tag => 标签/打标签
 
 tag object => 标签对象
 
+tagger => 打标签者
+
 three-way merge => 三方合并
 
 track => 跟踪
@@ -256,10 +316,12 @@ tree object => 树对象
 
 unambiguous => 没有歧义/没有歧义的
 
-unannotated => 不含注解的
+unannotated tag => 未附注标签
 
 unpack => 解包
 
+unstage => 取消暂存
+
 upstream => 上游/上游仓库
 
 ==== *V*