From caf3ffd4f938146aecc5d7c2812b578b1d425a26 Mon Sep 17 00:00:00 2001
From: Qiaoyong Zhong <solary.sh@gmail.com>
Date: Tue, 20 May 2014 21:53:18 +0800
Subject: [PATCH] do not translate the language names

---
 qml/main.qml        |  18 +++++++++---------
 ts/2048-qt_ru_RU.qm | Bin 1969 -> 1818 bytes
 ts/2048-qt_ru_RU.ts |  11 ++---------
 ts/2048-qt_zh_CN.qm | Bin 1509 -> 1362 bytes
 ts/2048-qt_zh_CN.ts |   9 +++------
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/qml/main.qml b/qml/main.qml
index 1bc8631..67e9497 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -90,7 +90,7 @@ ApplicationWindow {
             Menu {
                 title: qsTr("Language")
                 MenuItem {
-                    text: qsTr("English")
+                    text: "English"
                     checkable: true
                     exclusiveGroup: languageSettingsGroup
                     checked: settings.value("language") === "en_US" ? true : false
@@ -102,25 +102,25 @@ ApplicationWindow {
                     }
                 }
                 MenuItem {
-                    text: qsTr("Russian")
+                    text: "简体中文"
                     checkable: true
                     exclusiveGroup: languageSettingsGroup
-                    checked: settings.value("language") === "ru_RU" ? true : false
+                    checked: settings.value("language") === "zh_CN" ? true : false
                     onTriggered: {
-                        if (settings.value("language") !== "ru_RU") {
-                            settings.setValue("language", "ru_RU");
+                        if (settings.value("language") !== "zh_CN") {
+                            settings.setValue("language", "zh_CN");
                             changeLanguageDialog.open();
                         }
                     }
                 }
                 MenuItem {
-                    text: qsTr("Simplified Chinese")
+                    text: "Русский"
                     checkable: true
                     exclusiveGroup: languageSettingsGroup
-                    checked: settings.value("language") === "zh_CN" ? true : false
+                    checked: settings.value("language") === "ru_RU" ? true : false
                     onTriggered: {
-                        if (settings.value("language") !== "zh_CN") {
-                            settings.setValue("language", "zh_CN");
+                        if (settings.value("language") !== "ru_RU") {
+                            settings.setValue("language", "ru_RU");
                             changeLanguageDialog.open();
                         }
                     }
diff --git a/ts/2048-qt_ru_RU.qm b/ts/2048-qt_ru_RU.qm
index 0c0a71c800045a6ec6aa2574b0062bea233f2d9e..59a6273fd2d486a023f9ee9d22c028927b3e6463 100644
GIT binary patch
delta 200
zcmdnUKZ|dI2<HI?hR|dN1{T$cvf}j-3@jH^85kJr8Cc#JFfcI5Gq_JX!oa`~$q?R>
z%D}*?$B-U74@kE&EiCy06z^rasqzu1&WpKJ(Fv$;3CrpiTY<DT>*Hz{1_tIJ_8^f$
zApZe-k9Imx-9Ppvk6D5GR5_SZ)&VVb<nY_{6{t>=Gba&fo;t%#&euBiKnwQrOu1YN
ol=#52o3R+k58>U`Hyg;`l*z!rrnm7`4CCf1CViI4f7rGH008(i(f|Me

delta 325
zcmbQmw~>E>2<HU`hR|dN2A0T)vf}kU3@jH^85kHhGqAidU|?VhW^kW&gn@w}k|De$
zm4SgZi6K399s>g#AJf8;FF^5Lrkg4sf$Hj*OBJ1f`fe~c?)?f>x0_}4i>*MuHtXYR
z7X}9AHufNqLZCVk_8#qYAm506$zxWaepL>plyyMMOF8^D0ri<P$8zQ*f(*XN`C6wQ
zXpsw#pTP~FK@mJtE|&ros_^V)ECyQ8!Mm+*HqfAFnLtHbH{Ob2R1;wlV6kN}X0c|m
zV6kLzWU&I#96+-e*npVbH7`9Uvp8e329qs|s|JfQi#>}2iyez6OCV5}EsHmcC4&N3
ij}wal7X3oOnYjfynQ57+DGJURnR%(jsguLm4g&!5h)EUz

diff --git a/ts/2048-qt_ru_RU.ts b/ts/2048-qt_ru_RU.ts
index d4b6fa1..5ca6119 100644
--- a/ts/2048-qt_ru_RU.ts
+++ b/ts/2048-qt_ru_RU.ts
@@ -60,19 +60,12 @@
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="93"/>
         <source>English</source>
-        <translation>Английский</translation>
+        <translation type="vanished">Английский</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="105"/>
         <source>Simplified Chinese</source>
-        <translation>Упрощённый китайский</translation>
-    </message>
-    <message>
-        <location filename="../qml/main.qml" line="117"/>
-        <source>Russian</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Упрощённый китайский</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="133"/>
diff --git a/ts/2048-qt_zh_CN.qm b/ts/2048-qt_zh_CN.qm
index d00e217926e8260fb720c3ea81c684ddff50c2d1..0b89ae3f35437c1fa12d13ef755592f2ec3e31c1 100644
GIT binary patch
delta 204
zcmaFLeTi#=2<HI?hR|dN24?k%vf}kJ3@jH^85kIC8Cc#J0O_p^?$eGiFfar&gtw#u
z6&+znkDbTBz{1V6u;dF+yp-vt%15BOYs{sJPCz=2W%Y}#K=GffkE>l67?|d;2Z<B{
z#XH!0w9|onKlUY$S%LDZ984+efabY#_-*<M6fft@Nd%gw&ajsAwN5?I0z;lDmrH>P
p7<hIw76a*LyxaO_0~KD&1WHzH{G`aZ*_>$w(`05=x5+iEnE**tG*bWo

delta 310
zcmcb_^^|*p2<Ht3hR|dN24?Sxvf}j)3@jH^85kH78Cc#J0O^|y?$eGiFfar&gtw$J
zFtG42q{q$!(rru&OTGZbOPOw}d<3fd#aycB1f-jo8~1(%$_KNoez6rO|C9A`wF?6S
z(*gD%kwT#S8ulLTbRfToeaT~1pu8#vQ_4D^<=Gs5n}GW4nPzk5B!UcH%Xw<P9#G;1
z=WCsMpn+?6{0x9DWt8EWa=8>JuEMjMu^1?>$Gfd>HqgLdnLy6xjkgpTMVmf$zvTcL
z!N3N@?5=s~Ihn;7o8K^QXA<>4f-DtOT3no&m^XO}OQ<SGb%TGfpKfY9T&GZQW^O@F
VW?E)yih^@SW?pJ>>g3xj<p8CjR8{~0

diff --git a/ts/2048-qt_zh_CN.ts b/ts/2048-qt_zh_CN.ts
index d305805..d03782c 100644
--- a/ts/2048-qt_zh_CN.ts
+++ b/ts/2048-qt_zh_CN.ts
@@ -60,19 +60,16 @@
         <translation>语言</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="93"/>
         <source>English</source>
-        <translation>英语</translation>
+        <translation type="vanished">英语</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="105"/>
         <source>Simplified Chinese</source>
-        <translation>简体中文</translation>
+        <translation type="vanished">简体中文</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="117"/>
         <source>Russian</source>
-        <translation>俄语</translation>
+        <translation type="vanished">俄语</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="133"/>