Skip to content

Translate 07-git-tools advanced-merging v2 #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Aug 14, 2015
Merged

Translate 07-git-tools advanced-merging v2 #169

Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2aeca9d
Translate 07-git-tools advanced-merging
networm Jul 3, 2015
592a770
Translate 07-git-tools advanced-merging v2
networm Jul 3, 2015
f9ab00b
Review 07-git-tools advanced-merging
networm Aug 8, 2015
c2a98aa
Review 07-git-tools advanced-merging v2
networm Aug 10, 2015
0cfc4ff
Translate documentation as '注释'
networm Aug 11, 2015
d1a12e2
Split sentence for better readability
networm Aug 11, 2015
c8a991e
Simplify translation
networm Aug 11, 2015
ab026d5
Add '状态' for better readability
networm Aug 11, 2015
fb2e3b5
Split sentence
networm Aug 11, 2015
7e2cc2c
Split sentence
networm Aug 13, 2015
b4b84af
Change "然后" to "并且"
networm Aug 13, 2015
afd58d8
Change to "是它们共同的祖先版本"
networm Aug 13, 2015
22646cf
Improve translation
networm Aug 13, 2015
ce65606
Fix "diff" typo
networm Aug 13, 2015
6440db9
Improve "manual merge" translation
networm Aug 13, 2015
1cc8e09
Split sentence
networm Aug 13, 2015
8c2b884
Change "正当" to "合理"
networm Aug 13, 2015
c0307cd
Clarify merge target
networm Aug 13, 2015
e15bfc2
Add"这时" for readability
networm Aug 13, 2015
16a7a2b
Change "文件" to "修改"
networm Aug 13, 2015
8e5309d
Change "不小心" to "意外"
networm Aug 13, 2015
ffbc386
Change "点" to "地方"
networm Aug 13, 2015
1ee13e0
Change to "让我们快速复习下"
networm Aug 13, 2015
7745170
Remove redundan "所有"
networm Aug 13, 2015
206ba7d
Change "标记" to "参数"
networm Aug 13, 2015
4f78d7b
Add missing "参数"
networm Aug 13, 2015
3eb4a05
Change "严励" to "严格"
networm Aug 13, 2015
e9d1b64
Improve translation
networm Aug 13, 2015
8ae5c35
Improve "backports" translation
networm Aug 13, 2015
de1a2a9
Fix Monospace Issue in advanced-merging
networm Aug 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading