Skip to content

Use normal you (你) instead of honorific you (您) #45

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.

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 11 commits into from
Nov 29, 2012
Merged

Use normal you (你) instead of honorific you (您) #45

merged 11 commits into from
Nov 29, 2012

Conversation

cyjake
Copy link
Contributor

@cyjake cyjake commented Nov 29, 2012

The zh version of git reference was initiated by myself long time ago.

I made a terrible choice of phrasing by using 您 instead of 你. 您 is the honorific version of word you in Chinese. That letter is abused in my first translation, which makes reading the article kinda weird.

So I replaced the word in my recent commits.

The other change I made is breaking these long

into lines. Long lines is prone to conflicts.

Hopefully these two changes can get merged. They only impact files under zh folder by the way.

cyjake and others added 11 commits April 11, 2011 09:35
do not use the honorific version of `you' in chinese.
indeed that was weird...
converted tabs to spaces also. but these commits is limited in the zh
version.

the reason I did this:

 - long lines is prone to conflict
 - the use of tab disturbs the indentation when switching editors
   without proper tab space setting, which you may never get it right.
   so why not give up and use spaces instead.

those changes is limited to the zh translation.

Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	.gitignore
	_layouts/zh_reference.html
	zh/basic/index.html
	zh/branching/index.html
	zh/creating/index.html
	zh/index.html
	zh/inspect/index.html
	zh/remotes/index.html
stop bragging about yourself, dotnil.
@matthewmccullough
Copy link
Member

Tremendous appreciation for this contribution to the Chinese-speaking Git community!

matthewmccullough pushed a commit that referenced this pull request Nov 29, 2012
Use normal you (你) instead of honorific you (您)
@matthewmccullough matthewmccullough merged commit b4179f8 into git:gh-pages Nov 29, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants