From c2e15100a41cf78137b2edd152eaae0c606d0425 Mon Sep 17 00:00:00 2001
From: Qiaoyong Zhong <solary.sh@gmail.com>
Date: Tue, 20 May 2014 16:18:27 +0800
Subject: [PATCH] added Russian translation

---
 2048-qt.pro                            |   2 +-
 README.md                              |   2 ++
 qml/main.qml                           |  12 +++++++++
 resources.qrc                          |   1 +
 ts/2048-qt_ru_RU.qm                    | Bin 0 -> 1969 bytes
 ts/{2048-qt_ru.ts => 2048-qt_ru_RU.ts} |  35 ++++++++++++++-----------
 ts/2048-qt_zh_CN.qm                    | Bin 1465 -> 1509 bytes
 ts/2048-qt_zh_CN.ts                    |  33 +++++++++++++----------
 8 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 ts/2048-qt_ru_RU.qm
 rename ts/{2048-qt_ru.ts => 2048-qt_ru_RU.ts} (81%)

diff --git a/2048-qt.pro b/2048-qt.pro
index e612ef6..b10d888 100644
--- a/2048-qt.pro
+++ b/2048-qt.pro
@@ -29,7 +29,7 @@ HEADERS += \
     myclass.h \
     settings.h
 
-TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru.ts
+TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.ts
 
 VERSION = 0.1.4
 
diff --git a/README.md b/README.md
index 403158a..dd86b79 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ A clone of [2048](https://github.com/gabrielecirulli/2048), implemented in Qt.
   - PRC (天朝)
 - Multi-language support, currently
   - English
+  - Russian (by [Sergey Basalaev](https://github.com/SBasalaev))
   - Simplified Chinese
 
 ## Screenshots
@@ -52,4 +53,5 @@ sudo apt-get install 2048-qt
 
 ## Todo
 
+- Allow the user to add his own label systems
 - AI support
diff --git a/qml/main.qml b/qml/main.qml
index b258090..1bc8631 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -101,6 +101,18 @@ ApplicationWindow {
                         }
                     }
                 }
+                MenuItem {
+                    text: qsTr("Russian")
+                    checkable: true
+                    exclusiveGroup: languageSettingsGroup
+                    checked: settings.value("language") === "ru_RU" ? true : false
+                    onTriggered: {
+                        if (settings.value("language") !== "ru_RU") {
+                            settings.setValue("language", "ru_RU");
+                            changeLanguageDialog.open();
+                        }
+                    }
+                }
                 MenuItem {
                     text: qsTr("Simplified Chinese")
                     checkable: true
diff --git a/resources.qrc b/resources.qrc
index d064a1c..8e26ef5 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>ts/2048-qt_zh_CN.qm</file>
+        <file>ts/2048-qt_ru_RU.qm</file>
         <file>qml/main.qml</file>
         <file>qml/2048.js</file>
         <file>qml/Tile.qml</file>
diff --git a/ts/2048-qt_ru_RU.qm b/ts/2048-qt_ru_RU.qm
new file mode 100644
index 0000000000000000000000000000000000000000..0c0a71c800045a6ec6aa2574b0062bea233f2d9e
GIT binary patch
literal 1969
zcmZ`)O>7%g5FXp(coUKef~i6Y?HW>A)U?^SPMaUwN$i-ECd5q)DmheQ-Ml#4uGhg{
z(^g0zqzd&=5C`B=gj9(e5(iKbQdM!`goLQXr9E(}gpfc&NN}vm_twsHb`xx^)^GRw
zzM1)E-gEl9wSgc1`s|aR5`*8rar4fvIU>4C^xAnMUZqIsGS>Kc;VMxmO#CzBex3O4
zLEOI~{?i}|muUXeAAnk=vsVRCv`m$ApA&WM3Ey=8!SfHo_lN!l?wv?80sYXu$a{DG
z1@1O~`TH%bk3=85Jx3IIKeiHo6S#Qn`jHCO$=DYUqTnCY!fRh4iKe#nHF%M8-L@%p
z?|1(({4V0m^)4Crp!0g~$G<dz8|u9sYC!*5-?ty$0RA@%pj#0zG)j^|DH_+Xpe|gT
zG*aU+`J-xDPDq0Kd4P}e3>&2HfOku{K5tfqpR<?ulg`s%Wm{ZM<2$CpL}$yjrt9at
zusf#{m5$Ofxk{tY)6iuGN0$Ryn$+^4wH7)E?B!?pc|OF4QRLG~nsbHHtN!fvaDsC@
zhMLAW!;1>qH76={5hy>-j{|g^r+Azvc$O#ST~T5Mr(#=;4S#?h?&k$Az_64;a^bSI
zqp~43AUf3ny=2*e`1?97gWe>r49|Os8;aH~yQUZ45_Nwbga6N^gktw7cEV4WKFPit
zoJ8PGI6fupO+WMk@8?lIjl5FuC&NXQ1&c8_^H|TqJ%fh5RSp%5@`5)~Sv=2sh#W7X
z$!RK679pkAIfTq_8<;eW$hX__9z9*N9Npazy3?$dMZKY$&YE5kuI|>n$LVs`n`sxO
zrbo)zKzThph<s(7&Ysa0&9bm9r{XV9;}JfImQE_u0CXx%vl8f5k`KtPdvjud0^3k&
z9_t)z%;250avaZ!Ex~QJKD8yOmxSvg2mO@g1V&~6la=+lpFuhk(2?!Ie5%CyUa@S;
zHS1UO71O!sFC)&+dKnm81arK#ofT7C5|@Je{}Db45IM7w_X~dHm3smy$VSTTfik^D
z%e^&&>m=Syw+)a@l_L>6OY*yn#thQKDTC4^3&WudlNK&`IvHroi1K8b@N7M%a-BP4
z3$r2gx@f=*j0DDHvtFyz&8i%as(Dd(&+K*^^+wxsSH2PJ>*Bn7%wMdA?Qn=g{G19B
zE#-?V1wX1E9tYA=c&**ohM#g6$5zXemw6c#Z?#q)HF9ir9y|RdtGa1h>y}v4^Ba~U
z8i6_7D^DPpCar4sS?(&8No=*&)X!RuKauS2EJ{G>fM;_GR!{K>)s!u5*`jHszE7%O
pvYdpTuQ{0HCcL-JD;VkNPQYvUKk9oT^zg;U9>v4_aJc8m{{Wl=J%s=O

literal 0
HcmV?d00001

diff --git a/ts/2048-qt_ru.ts b/ts/2048-qt_ru_RU.ts
similarity index 81%
rename from ts/2048-qt_ru.ts
rename to ts/2048-qt_ru_RU.ts
index 8c8e573..d4b6fa1 100644
--- a/ts/2048-qt_ru.ts
+++ b/ts/2048-qt_ru_RU.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>main</name>
     <message>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <location filename="../qml/main.qml" line="26"/>
-        <location filename="../qml/main.qml" line="264"/>
+        <location filename="../qml/main.qml" line="276"/>
         <source>New Game</source>
         <translation>Новая игра</translation>
     </message>
@@ -70,67 +70,72 @@
         <translation>Упрощённый китайский</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="121"/>
+        <location filename="../qml/main.qml" line="117"/>
+        <source>Russian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="133"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="123"/>
+        <location filename="../qml/main.qml" line="135"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="127"/>
+        <location filename="../qml/main.qml" line="139"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="185"/>
+        <location filename="../qml/main.qml" line="197"/>
         <source>SCORE</source>
         <translation>СЧЁТ</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="185"/>
+        <location filename="../qml/main.qml" line="197"/>
         <source>BEST</source>
         <translation>ЛУЧШИЙ</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="245"/>
+        <location filename="../qml/main.qml" line="257"/>
         <source>Join the numbers and get to the &lt;b&gt;2048 tile&lt;/b&gt;!</source>
         <translation>Объединяйте числа, чтобы получить &lt;b&gt;плитку 2048&lt;/b&gt;!</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="302"/>
+        <location filename="../qml/main.qml" line="314"/>
         <source>Language Setting Hint</source>
         <translation>Подсказка установки языка</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="303"/>
+        <location filename="../qml/main.qml" line="315"/>
         <source>Please restart the program to make the language setting take effect.</source>
         <translation>Пожалуйста, перезапустите программу, чтобы применить языковые настройки.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="309"/>
+        <location filename="../qml/main.qml" line="321"/>
         <source>About 2048-Qt</source>
         <translation>О программе 2048-Qt</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="328"/>
         <source>Game Over</source>
         <translation>Игра окончена</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="317"/>
+        <location filename="../qml/main.qml" line="329"/>
         <source>Game Over!</source>
         <translation>Игра окончена!</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="327"/>
+        <location filename="../qml/main.qml" line="339"/>
         <source>You Win</source>
         <translation>Вы выиграли</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="328"/>
+        <location filename="../qml/main.qml" line="340"/>
         <source>You win! Continue playing?</source>
         <translation>Вы выиграли! Продолжить играть?</translation>
     </message>
diff --git a/ts/2048-qt_zh_CN.qm b/ts/2048-qt_zh_CN.qm
index 308189d82977ad3ba68cc5f4721b9fedfa0c9060..d00e217926e8260fb720c3ea81c684ddff50c2d1 100644
GIT binary patch
delta 113
zcmdnV{giux2;+^3qIO&?JPhfv^B5Rd+9t-zGX_trbu>9OUyp%-`32`|oqC}78XiA`
z8w?DLGCWf*mjcCAcy==u1I6`txAo0tU|{-{3FLg<`06dQsQ;1fw;T*Wzy`$ZL8ZmT
MnTdImPq2Ih07L~Li2wiq

delta 64
zcmaFLy_0)_2;+r`qIO)&FBsBe=P@v_Bu$K!XVjlq>&X6Eryj`fn0Qv4kBfI(-)sg3
TreB#rk@Firy=9)v%=!obmT(n8

diff --git a/ts/2048-qt_zh_CN.ts b/ts/2048-qt_zh_CN.ts
index 3695eea..d305805 100644
--- a/ts/2048-qt_zh_CN.ts
+++ b/ts/2048-qt_zh_CN.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <location filename="../qml/main.qml" line="26"/>
-        <location filename="../qml/main.qml" line="264"/>
+        <location filename="../qml/main.qml" line="276"/>
         <source>New Game</source>
         <translation>新游戏</translation>
     </message>
@@ -70,67 +70,72 @@
         <translation>简体中文</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="121"/>
+        <location filename="../qml/main.qml" line="117"/>
+        <source>Russian</source>
+        <translation>俄语</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="133"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="123"/>
+        <location filename="../qml/main.qml" line="135"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="127"/>
+        <location filename="../qml/main.qml" line="139"/>
         <source>About Qt</source>
         <translation>关于Qt</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="185"/>
+        <location filename="../qml/main.qml" line="197"/>
         <source>SCORE</source>
         <translation>得分</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="185"/>
+        <location filename="../qml/main.qml" line="197"/>
         <source>BEST</source>
         <translation>最高分</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="245"/>
+        <location filename="../qml/main.qml" line="257"/>
         <source>Join the numbers and get to the &lt;b&gt;2048 tile&lt;/b&gt;!</source>
         <translation>把相同的数字相加，得到&lt;b&gt;2048&lt;/b&gt;！</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="302"/>
+        <location filename="../qml/main.qml" line="314"/>
         <source>Language Setting Hint</source>
         <translation>语言设置提示</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="303"/>
+        <location filename="../qml/main.qml" line="315"/>
         <source>Please restart the program to make the language setting take effect.</source>
         <translation>为了让语言设置生效，请重启程序。</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="309"/>
+        <location filename="../qml/main.qml" line="321"/>
         <source>About 2048-Qt</source>
         <translation>关于2048-Qt</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="328"/>
         <source>Game Over</source>
         <translation>游戏结束</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="317"/>
+        <location filename="../qml/main.qml" line="329"/>
         <source>Game Over!</source>
         <translation>游戏结束！</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="327"/>
+        <location filename="../qml/main.qml" line="339"/>
         <source>You Win</source>
         <translation>你赢了</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="328"/>
+        <location filename="../qml/main.qml" line="340"/>
         <source>You win! Continue playing?</source>
         <translation>你赢了！要继续玩吗？</translation>
     </message>