Commit Graph

111 Commits

Author SHA1 Message Date
Jiang Xin
e9376a570c Merge branch 'master' of github.com:linusboyle/git 2018-12-13 22:25:55 +08:00
Zhilei Han
25c759021f l10n: zh_CN: fix typo of submodule init message
This patch somehow corrects a typo for 'git submodule init', which is
supposed to be mistakenly copyed from the deinit command

Signed-off-by: Zhilei Han <linusboyle@gmail.com>
2018-12-13 21:36:46 +08:00
Jiang Xin
4c27fcb576 l10n: zh_CN: for git v2.20.0 l10n round 1 to 3
Translate 257 new messages (4187t0f0u) for git 2.20.0.

Reviewed-by: Zhou Fangyi <fangyi.zhou@yuriko.moe>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-12-06 16:00:29 +08:00
Jiang Xin
e640d114ab l10n: zh_CN: review for git v2.19.0 l10n
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-09-12 10:14:07 +08:00
Jiang Xin
c1ac5258dc l10n: zh_CN: for git v2.19.0 l10n round 1 to 2
Translate 382 new messages (3958t0f0u) for git 2.19.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-09-09 22:38:39 +08:00
Jiang Xin
0fcd668fc4 l10n: zh_CN: review for git 2.18.0
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-07-02 10:32:10 +08:00
Jiang Xin
fd8cb37902 l10n: zh_CN: for git v2.18.0 l10n round 1 to 3
Translate 251 new messages (3608t0f0u) for git 2.18.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-06-18 00:31:45 +08:00
Ray Chen
610f8099cd l10n: zh_CN: review for git v2.17.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2018-03-29 22:09:39 +08:00
Jiang Xin
31e5e17b22 l10n: zh_CN: for git v2.17.0 l10n round 1
Translate 132 new messages (3376t0f0u) for git 2.17.0-rc0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-03-29 22:09:39 +08:00
Jiang Xin
5809aa05f7 l10n: zh_CN: for git v2.16.0 l10n round 2
Translate 72 messages (3288t0f0u) for git v2.16.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
2018-01-10 11:31:32 +08:00
Fangyi Zhou
58b6f0784c l10n: zh_CN translate parameter name
Translate parameters such as:

* <new-branch-name> in advice.c:126,
* <command>, <path>, <revision> in setup.c:171, setup.c:184,
  setup.c:252,
* <base-commit-id> in builtin/log.c:1288,
* <conflicted_files> in git-rebase.sh:58, and more...

Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-12-03 10:12:35 +08:00
Zhou Fangyi
2090d5b4a0 l10n: zh_CN Fix typo
apply.c:125
say -> way

Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
2017-12-03 10:11:34 +08:00
Ray Chen
493a93228f l10n: zh_CN: review for git v2.15.0 l10n round 2
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2017-10-24 10:06:39 +08:00
Jiang Xin
6937cb4e3a l10n: zh_CN: for git v2.15.0 l10n round 2
Translate 69 messages (3245t0f0u) for git v2.15.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
2017-10-24 09:56:58 +08:00
Jiang Xin
554e850170 l10n: zh_CN: review for git v2.14.0 l10n
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-02 08:02:37 +08:00
Jiang Xin
a4f16749d2 l10n: zh_CN: for git v2.14.0 l10n round 2
Translate new l10n messages for git 2.14.0, and update translations on
"stash".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-01 09:26:19 +08:00
Jiang Xin
60638e9816 l10n: zh_CN: for git v2.13.0 l10n round 2
Translate 4 messages (3195t0f0u) for git v2.13.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-05-09 21:55:38 +08:00
Ray Chen
65e2041e40 l10n: zh_CN: review for git v2.13.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2017-05-09 07:03:34 +08:00
Jiang Xin
87cb7997f7 l10n: zh_CN: for git v2.13.0 l10n round 1
Translate 96 messages (3198t0f0u) for git v2.13.0-rc0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-05-05 09:32:08 +08:00
Jiang Xin
1a79b2f179 l10n: zh_CN: for git v2.12.0 l10n round 2
Translate 241 messages (3139t0f0u) for git v2.12.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-02-25 00:19:14 +08:00
Ray Chen
29004bbb34 l10n: zh_CN: review for git v2.11.0 l10n
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-01-02 20:11:49 +08:00
Jiang Xin
72351d7d4f l10n: fix unmatched single quote in error message
Translate one message introduced by commit:

 * 358718064b i18n: fix unmatched single quote in error message

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-25 23:26:34 +08:00
Jiang Xin
275588f93e l10n: Fixed typo of git fetch-pack command
Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed
the affected translations all in one batch.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-22 22:24:59 +08:00
Jiang Xin
a0b6b24660 l10n: zh_CN: for git v2.11.0 l10n round 1
Update 209 translations (2913t0f0u) for git v2.11.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-21 23:24:15 +08:00
Ray Chen
9a4b694c53 l10n: zh_CN: review for git v2.10.0 l10n
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2016-09-11 21:34:23 +08:00
Jiang Xin
7665d45926 l10n: zh_CN: fixed some typos for git 2.10.0
Reviewed-by: Ray <tvvocold@163.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-09-11 21:31:51 +08:00
Jiang Xin
5c57d7622e l10n: zh_CN: for git v2.10.0 l10n round 2
Update 215 translations (2757t0f0u) for git v2.10.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-08-31 00:11:13 +08:00
Ray Chen
aef18cc606 l10n: zh_CN: review for git v2.9.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-06-09 22:08:39 +08:00
Jiang Xin
5b04ee3b95 l10n: zh_CN: for git v2.9.0 l10n round 1
Update 104 new translations (2596t1f0u) for git v2.9.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-06-06 22:33:59 +08:00
Ray Chen
26e4cbec45 l10n: zh_CN: review for git v2.8.0 l10n round 2
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2016-03-20 18:46:02 +08:00
Jiang Xin
5c0c220c53 l10n: zh_CN: for git v2.8.0 l10n round 3
Update 1 new translations (2530t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-16 00:27:40 +08:00
Jiang Xin
3495628d4b l10n: zh_CN: for git v2.8.0 l10n round 2
Update 21 new translations (2529t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-16 00:07:06 +08:00
Jiang Xin
276ceeaa49 l10n: zh_CN: for git v2.8.0 l10n round 1
Update 48 new translations (2509t0f0u) for git v2.8.0-rc0.

Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: zh_CN: review for git v2.8.0 l10n round 1
2016-03-12 22:00:34 +08:00
Jiang Xin
89f80d72c1 l10n: zh_CN: for git v2.7.0 l10n round 2
Update 2 translations (2477t0f0u) for git v2.7.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-12-26 21:22:53 +08:00
Jiang Xin
94550ed38c l10n: zh_CN: for git v2.7.0 l10n round 1
Update 66 translations (2477t0f0u) for git v2.7.0-rc0.

Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-12-20 19:33:14 +08:00
Jiang Xin
03ea3327da l10n: zh_CN: for git v2.6.0 l10n round 2
Update 2 translations (2440t0f0u) for git v2.6.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-09-21 00:44:47 +08:00
Jiang Xin
1b7f4a3454 l10n: zh_CN: for git v2.6.0 l10n round 1
Update 123 translations (2441t0f0u) for git v2.6.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Ray Chen <oldsharp@gmail.com>
2015-09-08 23:07:20 +08:00
Ray Chen
667599e825 l10n: zh_CN: Update Git Glossary: "commit message"
Add "commit message" to glossary.  Translate it as "提交信息".

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-25 09:47:50 +08:00
Ray Chen
12e59059ee l10n: zh_CN: Update Git Glossary: pickaxe
Translate the term "pickaxe" as "挖掘".

Initially proposed by @louy2 .

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
e397e7e353 l10n: zh_CN: Update Git Glossary: fork
Remove "复刻" from translation option list of "fork", keeping "派生"
as the only one.

In Git context, by talking about the term "fork", one usually mean the
procedure that divides a branch into two or more history lines.  That
is quite like the "fork" concept in programming, which split a process
into two or more independent processes.

On the other hand, "复刻" by itself means "copy" or "mirror".  It is
considered more suitable for describing the procedure like
"fork a repository", which is common on public repository hosting
services, such as GitHub.  However, this is beyond the scope of
core-Git.  As a l10n work for core-Git, "复刻" should be removed here.

There used to be another option - "分岔".  Its a good idea to
translate "fork point" as "分岔点".  However, "派生点" is as good,
too.  So this option is finally discarded.

Also fix a relevant translation issue which was introduced in
`160fb2b`.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
933c015e37 l10n: zh_CN: Update Git Glossary: tag
Add verb form translation of tag.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
755c831b9f l10n: zh_CN: Update Git Glossary: "dumb", "smart"
"dumb/smart HTTP protocol" are normally considered as phrases.
Add "protocol" as a suffix after them makes more sense.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
ee7589bb22 l10n: zh_CN: Update Git Glossary: SHA-1
It's quite common to see the term "SHA-1" remain untranslated in many
l10n works. So update the "SHA-1" entry in Git glossary to match this
behavior.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:11:57 +08:00
Ray Chen
4375c10e28 l10n: zh_CN: Add Surrounding Spaces
Some English words inside the Chinese sentences appear without
surrounding spaces, which are considered irregular.

This commit try to fix this issue, with the help of some regular
express patterns.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-10 18:15:46 +08:00
Jiang Xin
160fb2b28b l10n: zh_CN: Add translations for Git glossary
Add translations of Git glossary (most of them are from the command `git
help glossary`) in the header of `zh_CN.po`.  Also fixes some translations
according to this glossary, such as "pathspec", "repository", "refspec".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-07 17:59:31 +08:00
Jiang Xin
bbdf0acc7d l10n: TEAMS: stash inactive zh_CN team members
Add Ray Chen as member of zh_CN l10n team member, and move other
inactive zh_CN l10n team members to the header of zh_CN.po.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-08-04 00:43:08 +08:00
Ray Chen
55a16ee487 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>
2015-07-30 23:42:27 +08:00
Ray Chen
dbd6cced19 l10n: zh_CN: Unify Translation of "packfile"
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-07-28 13:26:41 +08:00
Ray Chen
53438e8fe2 l10n: zh_CN: Update Translation: "tag object"
* "tag object" translated as "标签对象".
* "objects to be packed" translated as "待打包对象".
* Add "那些", for better reading experience.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-27 23:39:37 +08:00
Jiang Xin
5bb01d4f02 l10n: zh_CN: for git v2.5.0 l10n round 2
Update 9 translations (2359t0f0u) for git v2.5.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-15 23:21:08 +08:00