Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Set src/nls/zh-cn/strings.js to binary #3164

Closed
wants to merge 1 commit into from

Conversation

DennisKehrig
Copy link
Contributor

I am not entirely sure this is the right way to do it.

Whenever I run git checkout master under Windows, and then git checkout <some branch>, git thinks I have changed src/nls/zh-cn/strings.js. By setting it to binary via .gitattributes, I no longer have this problem.

@RaymondLim
Copy link
Contributor

@DennisKehrig -- Are you on WinXP? It seems that no one else having any issue with this file after Kevin fixed the line endings in this file. Have you tried again after Kevin landed his changes? I don't have any issue on my Win 7 and Mac 10.8.2. So we may not need this one even if this is specific to WinXP, but I doubt it though. We've already had Japanese translation and this is just another utf-8 document with CJK characters.

@DennisKehrig
Copy link
Contributor Author

It seems I just barely missed Kevin's changes - bad timing. I'll close it!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants