Skip to content

Commit 6fd3353

Browse files
YuanXiQWQYuanXiQWQ
committed
Merge branch 'update/11.6.0'
2 parents 64aaccb + 983717f commit 6fd3353

File tree

5 files changed

+5666
-39
lines changed

5 files changed

+5666
-39
lines changed

‎README.md‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,31 @@ GitKraken 安装目录下的 `strings.json` 文件。该文件的位置根据你
9696
9797
#### 翻译：
9898

99-
| 序号 | 专有名词 | 统一翻译 | 其它翻译 |
100-
|:--:|:-----------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|
101-
| 1 | Cherry Pick | [拣选](https://git-scm.com/book/zh/v2/%e5%88%86%e5%b8%83%e5%bc%8f-Git-%e7%bb%b4%e6%8a%a4%e9%a1%b9%e7%9b%ae#_rebase_cherry_pick) | 挑拣、挑选、樱桃挑选 |
102-
| 2 | Collaborator | [协作者](https://git-scm.com/book/zh/v2/%E6%9C%8D%E5%8A%A1%E5%99%A8%E4%B8%8A%E7%9A%84-Git-GitLab.html#_%E4%B8%80%E8%B5%B7%E5%B7%A5%E4%BD%9C) | [合作者](https://git-scm.com/book/zh/v2/GitHub-%E7%BB%B4%E6%8A%A4%E9%A1%B9%E7%9B%AE.html#_%E6%B7%BB%E5%8A%A0%E5%90%88%E4%BD%9C%E8%80%85) |
103-
| 3 | Compose | 编写 | ~~组合~~ |
104-
| 4 | Email | 邮箱 | 电子邮件 |
105-
| 5 | Email Address | 邮箱 | 电子邮件地址 |
106-
| 6 | Filter | [过滤器](https://git-scm.com/book/zh/v2/Git-%E5%9F%BA%E7%A1%80-%E6%9F%A5%E7%9C%8B%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2.html#_%E9%99%90%E5%88%B6%E8%BE%93%E5%87%BA%E9%95%BF%E5%BA%A6) | 筛选器 |
107-
| 7 | Fork | [分支](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_github_flow) | 分叉、[派生](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_%E6%B4%BE%E7%94%9F%E9%A1%B9%E7%9B%AE) |
108-
| 8 | GitKraken Desktop | GitKraken 桌面版 | GitKraken 客户端 |
109-
| 9 | Graph | 图 | 图形、图表 |
110-
| 10 | Git GUI | [Git 图形界面](https://git-scm.com/book/zh/v2/%E9%99%84%E5%BD%95-A:-%E5%9C%A8%E5%85%B6%E5%AE%83%E7%8E%AF%E5%A2%83%E4%B8%AD%E4%BD%BF%E7%94%A8-Git-%E5%9B%BE%E5%BD%A2%E7%95%8C%E9%9D%A2) | |
111-
| 11 | Git Provider | [Git 托管](https://git-scm.com/book/zh/v2/%E6%9C%8D%E5%8A%A1%E5%99%A8%E4%B8%8A%E7%9A%84-Git-%E7%AC%AC%E4%B8%89%E6%96%B9%E6%89%98%E7%AE%A1%E7%9A%84%E9%80%89%E6%8B%A9) | Git 提供商 |
112-
| 12 | Pull Request | [拉取请求](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_%E5%88%9B%E5%BB%BA%E6%8B%89%E5%8F%96%E8%AF%B7%E6%B1%82) | 合并请求 |
113-
| 13 | Hunk | [区块](https://git-scm.com/book/zh/v2/Git-%e5%b7%a5%e5%85%b7-%e4%ba%a4%e4%ba%92%e5%bc%8f%e6%9a%82%e5%ad%98) | 代码块、修改块 |
114-
| 14 | Others | [其它](https://cd.hwxnet.com/view.do?pindex=lngmcojihgjnegca) | ~~其他~~ |
115-
| 15 | Rebase | [变基](https://git-scm.com/book/zh/v2/Git-%E5%88%86%E6%94%AF-%E5%8F%98%E5%9F%BA) | ~~重新基于~~ |
116-
| 16 | Repo | [仓库](https://git-scm.com/book/zh/v2/%E5%88%86%E5%B8%83%E5%BC%8F-Git-%E5%88%86%E5%B8%83%E5%BC%8F%E5%B7%A5%E4%BD%9C%E6%B5%81%E7%A8%8B.html#_%E9%9B%86%E4%B8%AD%E5%BC%8F%E5%B7%A5%E4%BD%9C%E6%B5%81) | 代码库、存储库、库 |
117-
| 17 | Solo | 单独显示 | 单独、独立、独立展示 |
118-
| 18 | Stage | [暂存](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E4%BA%A4%E4%BA%92%E5%BC%8F%E6%9A%82%E5%AD%98) | |
119-
| 19 | Stash | [贮藏](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E8%B4%AE%E8%97%8F%E4%B8%8E%E6%B8%85%E7%90%86) | 储藏、~~隐藏的更改~~、~~藏匿~~、~~存放~~、~~隐藏~~、~~暂存~~ |
120-
| 20 | Working Directory | [工作目录](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E8%B4%AE%E8%97%8F%E4%B8%8E%E6%B8%85%E7%90%86.html#_git_clean) | ~~工作区~~ |
121-
| 21 | Workspace | 工作区 | ~~工作目录~~ |
99+
| 序号 | 专有名词 | 统一翻译 | 其它翻译 |
100+
|:--:|:--------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|
101+
| 1 | Bisect | [二分查找](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E4%BD%BF%E7%94%A8-Git-%E8%B0%83%E8%AF%95.html#_binary_search) | |
102+
| 2 | Cherry Pick | [拣选](https://git-scm.com/book/zh/v2/%e5%88%86%e5%b8%83%e5%bc%8f-Git-%e7%bb%b4%e6%8a%a4%e9%a1%b9%e7%9b%ae#_rebase_cherry_pick) | 挑拣、挑选、樱桃挑选 |
103+
| 3 | Collaborator | [协作者](https://git-scm.com/book/zh/v2/%E6%9C%8D%E5%8A%A1%E5%99%A8%E4%B8%8A%E7%9A%84-Git-GitLab.html#_%E4%B8%80%E8%B5%B7%E5%B7%A5%E4%BD%9C) | [合作者](https://git-scm.com/book/zh/v2/GitHub-%E7%BB%B4%E6%8A%A4%E9%A1%B9%E7%9B%AE.html#_%E6%B7%BB%E5%8A%A0%E5%90%88%E4%BD%9C%E8%80%85) |
104+
| 4 | Compose | 编写 | ~~组合~~ |
105+
| 5 | Conventional Commits | [约定式提交](https://www.conventionalcommits.org/zh-hans/v1.0.0/) | |
106+
| 6 | Email | 邮箱 | 电子邮件 |
107+
| 7 | Email Address | 邮箱 | 电子邮件地址 |
108+
| 8 | Filter | [过滤器](https://git-scm.com/book/zh/v2/Git-%E5%9F%BA%E7%A1%80-%E6%9F%A5%E7%9C%8B%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2.html#_%E9%99%90%E5%88%B6%E8%BE%93%E5%87%BA%E9%95%BF%E5%BA%A6) | 筛选器 |
109+
| 9 | Fork | [分支](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_github_flow) | 分叉、[派生](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_%E6%B4%BE%E7%94%9F%E9%A1%B9%E7%9B%AE) |
110+
| 10 | GitKraken Desktop | GitKraken 桌面版 | GitKraken 客户端 |
111+
| 11 | Graph | 图 | 图形、图表 |
112+
| 12 | Git GUI | [Git 图形界面](https://git-scm.com/book/zh/v2/%E9%99%84%E5%BD%95-A:-%E5%9C%A8%E5%85%B6%E5%AE%83%E7%8E%AF%E5%A2%83%E4%B8%AD%E4%BD%BF%E7%94%A8-Git-%E5%9B%BE%E5%BD%A2%E7%95%8C%E9%9D%A2) | |
113+
| 13 | Git Provider | [Git 托管](https://git-scm.com/book/zh/v2/%E6%9C%8D%E5%8A%A1%E5%99%A8%E4%B8%8A%E7%9A%84-Git-%E7%AC%AC%E4%B8%89%E6%96%B9%E6%89%98%E7%AE%A1%E7%9A%84%E9%80%89%E6%8B%A9) | Git 提供商 |
114+
| 14 | Pull Request | [拉取请求](https://git-scm.com/book/zh/v2/GitHub-%E5%AF%B9%E9%A1%B9%E7%9B%AE%E5%81%9A%E5%87%BA%E8%B4%A1%E7%8C%AE.html#_%E5%88%9B%E5%BB%BA%E6%8B%89%E5%8F%96%E8%AF%B7%E6%B1%82) | 合并请求 |
115+
| 15 | Hunk | [区块](https://git-scm.com/book/zh/v2/Git-%e5%b7%a5%e5%85%b7-%e4%ba%a4%e4%ba%92%e5%bc%8f%e6%9a%82%e5%ad%98) | 代码块、修改块 |
116+
| 16 | Others | [其它](https://cd.hwxnet.com/view.do?pindex=lngmcojihgjnegca) | ~~其他~~ |
117+
| 17 | Rebase | [变基](https://git-scm.com/book/zh/v2/Git-%E5%88%86%E6%94%AF-%E5%8F%98%E5%9F%BA) | ~~重新基于~~ |
118+
| 18 | Repo | [仓库](https://git-scm.com/book/zh/v2/%E5%88%86%E5%B8%83%E5%BC%8F-Git-%E5%88%86%E5%B8%83%E5%BC%8F%E5%B7%A5%E4%BD%9C%E6%B5%81%E7%A8%8B.html#_%E9%9B%86%E4%B8%AD%E5%BC%8F%E5%B7%A5%E4%BD%9C%E6%B5%81) | 代码库、存储库、库 |
119+
| 19 | Solo | 单独显示 | 单独、独立、独立展示 |
120+
| 20 | Stage | [暂存](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E4%BA%A4%E4%BA%92%E5%BC%8F%E6%9A%82%E5%AD%98) | |
121+
| 21 | Stash | [贮藏](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E8%B4%AE%E8%97%8F%E4%B8%8E%E6%B8%85%E7%90%86) | 储藏、~~隐藏的更改~~、~~藏匿~~、~~存放~~、~~隐藏~~、~~暂存~~ |
122+
| 22 | Working Directory | [工作目录](https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E8%B4%AE%E8%97%8F%E4%B8%8E%E6%B8%85%E7%90%86.html#_git_clean) | ~~工作区~~ |
123+
| 23 | Workspace | 工作区 | ~~工作目录~~ |
122124

123125
#### 保留，不作翻译：
124126

‎comparator.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,11 @@
552552

553553
// 固定翻译词汇
554554
fixedTranslations: [
555+
{term: 'Bisect', translation: '二分查找'},
555556
{term: 'Cherry Pick', translation: '拣选'},
556557
{term: 'Collaborator', translation: '协作者'},
557558
{term: 'Compose', translation: '编写'},
559+
{term: 'Conventional Commits', translation: '约定式提交'},
558560
{term: 'Email', translation: '邮箱'},
559561
{term: 'Email Address', translation: '邮箱'},
560562
{term: 'Filter', translation: '过滤器'},

0 commit comments

Comments
 (0)