diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
| commit | 69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch) | |
| tree | c34647abca3a765d525e222855a7a93f4658f800 /app/_locales/index.json | |
| parent | d4a15f22c24074f44daa9eeb4fda192ea3742792 (diff) | |
| parent | e715d0e6915a9bb0ac69db06144253ddff54ba44 (diff) | |
| download | tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.gz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.bz2 tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.lz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.xz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.zst tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.zip | |
fix merge conflicts
Diffstat (limited to 'app/_locales/index.json')
| -rw-r--r-- | app/_locales/index.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/_locales/index.json b/app/_locales/index.json index 7717502b7..f50c09f88 100644 --- a/app/_locales/index.json +++ b/app/_locales/index.json @@ -17,6 +17,6 @@ { "code": "tml", "name": "Tamil" }, { "code": "tr", "name": "Turkish" }, { "code": "vi", "name": "Vietnamese" }, - { "code": "zh_CN", "name": "Mandarin" }, - { "code": "zh_TW", "name": "Taiwanese" } + { "code": "zh_CN", "name": "Chinese (Simplified)" }, + { "code": "zh_TW", "name": "Chinese (Traditional)" } ] |