From 1cca51687829914abbcf3310edef66de4ec3a9b1 Mon Sep 17 00:00:00 2001
From: 0312birdzhang <0312birdzhang@gmail.com>
Date: Wed, 10 Jun 2015 19:48:40 +0800
Subject: modify Simple Chinese translation

---
 app/translations/pebble-zh_CN.ts | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/translations/pebble-zh_CN.ts b/app/translations/pebble-zh_CN.ts
index 537adfe..43cdcd7 100644
--- a/app/translations/pebble-zh_CN.ts
+++ b/app/translations/pebble-zh_CN.ts
@@ -21,7 +21,7 @@
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="81"/>
         <source>Your donations help justify development time.</source>
-        <translation>你的捐款帮助证明了开发时间.</translation>
+        <translation>你的捐款帮助合理开发时间.</translation>
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="94"/>
@@ -31,7 +31,7 @@
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="97"/>
         <source>PayPal Donate</source>
-        <translation>贝宝捐助</translation>
+        <translation>Paypal捐助</translation>
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="107"/>
@@ -107,7 +107,7 @@
     <message>
         <location filename="../qml/pages/AppStorePage.qml" line="86"/>
         <source>Faces</source>
-        <translation>表情</translation>
+        <translation>表盘</translation>
     </message>
     <message>
         <location filename="../qml/pages/AppStorePage.qml" line="109"/>
@@ -153,7 +153,7 @@
     <message>
         <location filename="../qml/pages/Disclaimer.qml" line="58"/>
         <source>Send me my code!</source>
-        <translation>发送给我的代码！</translation>
+        <translation>发送给我代码！</translation>
     </message>
     <message>
         <location filename="../qml/pages/Disclaimer.qml" line="68"/>
@@ -169,14 +169,12 @@
 <context>
     <name>FirmwareUpgrade</name>
     <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
         <source>Firmware upgrade</source>
-        <translation>固件升级</translation>
+        <translation type="vanished">固件升级</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
         <source>Begin upgrade</source>
-        <translation>开始升级</translation>
+        <translation type="vanished">开始升级</translation>
     </message>
 </context>
 <context>
@@ -228,8 +226,8 @@
         <location filename="../qml/pages/ManagerPage.qml" line="78"/>
         <source>Waiting for watch...
 If it can&apos;t be found please check it&apos;s available and paired in Bluetooth settings.</source>
-        <translation>等待观看...
-        如果无法找到，请检查它的提供配对的蓝牙设置。</translation>
+        <translation>正在等待手表连接...
+        如果还是无法连接，请检查手表跟手机的蓝牙设置。</translation>
     </message>
     <message>
         <location filename="../qml/pages/ManagerPage.qml" line="99"/>
@@ -319,12 +317,12 @@ If it can&apos;t be found please check it&apos;s available and paired in Bluetoo
     <message>
         <location filename="../qml/pages/ManagerPage.qml" line="158"/>
         <source>Transliterate messages</source>
-        <translation>音译消息</translation>
+        <translation>转译消息</translation>
     </message>
     <message>
         <location filename="../qml/pages/ManagerPage.qml" line="159"/>
         <source>Messages are transliterated to ASCII before sending to Pebble</source>
-        <translation>在发送到Pebble之前消息已转换成ASCII码</translation>
+        <translation>在发送到Pebble之前消息转换成ASCII码</translation>
     </message>
     <message>
         <location filename="../qml/pages/ManagerPage.qml" line="168"/>
-- 
cgit v1.2.3


From d305fcd028172b7413d5abe4e05a7f140538d437 Mon Sep 17 00:00:00 2001
From: 0312birdzhang <0312birdzhang@gmail.com>
Date: Thu, 11 Jun 2015 09:30:30 +0800
Subject: rebase

---
 app/translations/pebble-es.ts | 13 -------------
 app/translations/pebble-pl.ts |  6 ++----
 app/translations/pebble.ts    | 13 -------------
 3 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'app')

diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index d6241c8..6b667e4 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -174,19 +174,6 @@
         <translation type="obsolete">¿Errores?</translation>
     </message>
 </context>
-<context>
-    <name>FirmwareUpgrade</name>
-    <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
-        <source>Firmware upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
-        <source>Begin upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>InstallAppDialog</name>
     <message>
diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts
index 8cbe25c..12970b3 100644
--- a/app/translations/pebble-pl.ts
+++ b/app/translations/pebble-pl.ts
@@ -201,14 +201,12 @@
 <context>
     <name>FirmwareUpgrade</name>
     <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
         <source>Firmware upgrade</source>
-        <translation>Aktualizacja firmware</translation>
+        <translation type="vanished">Aktualizacja firmware</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
         <source>Begin upgrade</source>
-        <translation>Rozpocznij aktualizację</translation>
+        <translation type="vanished">Rozpocznij aktualizację</translation>
     </message>
 </context>
 <context>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index a8f9927..e6ae583 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -166,19 +166,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FirmwareUpgrade</name>
-    <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
-        <source>Firmware upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
-        <source>Begin upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>InstallAppDialog</name>
     <message>
-- 
cgit v1.2.3