[CLOSED] Zh cn/yodfz

[core-ai-bot]

Issue by yodfz
Thursday Mar 21, 2013 at 15:08 GMT
Originally opened as adobe/brackets#3199

---

---

yodfz included the following code: https://github.com/adobe/brackets/pull/3199/commits

[core-ai-bot]

Comment by RaymondLim
Thursday Mar 21, 2013 at 20:11 GMT

---

You still haven't solved the merge conflict in your end. It seems like you need to fix it in your git client.

Are you on Windows? Please look for .gitattributes file in your Brackets folder on your machine. Open it in a text editor and see you have the following lines

# Auto detect text files and perform LF normalization
* text=auto

If you don't have it, then fix it in your .gitattributes file. If you have it and you still cannot solve the merge conflict, please let me know.

[core-ai-bot]

Comment by yodfz
Friday Mar 22, 2013 at 00:42 GMT

---

@RaymondLim Github .gitattributes have

# Auto detect text files and perform LF normalization
* text=auto

[core-ai-bot]

Comment by RaymondLim
Friday Mar 22, 2013 at 03:09 GMT

---

I know you're trying to translate all the new or updated strings, but your file has less lines (341) than English file which has 346 lines. So you have 5 strings missing. Not sure you miss any existing ones that are updated after your previous pulll request. So please diff the current English version with the previous English version that you use for your first version of translation.

[core-ai-bot]

Comment by yodfz
Friday Mar 22, 2013 at 03:19 GMT

---

@RaymondLim Show active line is show colour to active line?or highlight line?

[core-ai-bot]

Comment by RaymondLim
Friday Mar 22, 2013 at 03:25 GMT

---

Show active line is to highlight the line with the current cursor location in a different background color.

[core-ai-bot]

Comment by yodfz
Friday Mar 22, 2013 at 03:30 GMT

---

@RaymondLim Is highlight line!!!

[core-ai-bot]

Comment by RaymondLim
Monday Mar 25, 2013 at 21:16 GMT

---

You may want to check English version strings again. I noticed that you don't have translation for "CANNOT_WRITE_TEMP" string. Not sure that if there are any strings that were updated after you started your translation.

After you merge the latest and finish all translation, then I'll try to fix the line ending issue on our end for you.

[core-ai-bot]

Comment by RaymondLim
Friday Mar 29, 2013 at 03:36 GMT

---

I still can't resolve the merge conflict in this pull request. So I created a new pull request #3287 and close this one