Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
More preferences ID cleanups
add zh-cn language

Translates roughly 1/3
add zh-cn language 2

add zh-cn language 2
add zh-cn language 3

add zh-cn language 3
and vs 2012 sln file.
language 4
edit string.js

edit string.js
add 214 alf

add 214 alf
add space to nls/string.js

add space to nls/string.js
Revert "add space to nls/string.js"

This reverts commit 574ee6ea1c018e3200a4166f267d2678df1722cf.
add space to nls/string.js

sorry ,i revert commit old code.
Edit translate

Edit translate
edit line 205

edit line 205
edit one char
edit line100,101