Update Git Glossary #265
Merged
Update Git Glossary #265
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"remote" translated as "远程" or "远程仓库". This also resolves progit#98 .
"dangling object" translated as "摇摆对象".
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.
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 progit#219 : index => index/索引/暂存区 - resolve progit#224 : backport => 向后移植 - resolve progit#234 : pull request => 拉取请求 - resolve progit#240 : fork => 派生 (only one choice to avoid ambiguous)
oldsharp
force-pushed
the
pull/update/git-glossary/sync
branch
from
a7f74ee to
3e0e962
Compare
|
@oldsharp 好的 |
This resolves progit#264 .
This resolves progit#262 .
Closed
Translate "commit message" as "提交说明". This resolves progit#263 .
Closed
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 thatterm.
<choice-2>,<choice-3>stand for the second and thirdtranslation 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.
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: