Merge pull request #1 from smokku/master

Pull

9 files changed, 510 insertions, 18 deletions

diff --git a/app/app.pro b/app/app.pro
index 2872cf7..5d13720 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -39,4 +39,4 @@ OTHER_FILES += \
     pebble.png
 
 CONFIG += sailfishapp_i18n
-TRANSLATIONS += translations/pebble-es.ts translations/pebble-pl.ts
+TRANSLATIONS += translations/pebble-es.ts translations/pebble-pl.ts translations/pebble-zh_CN.ts
diff --git a/app/pebblefirmware.cpp b/app/pebblefirmware.cpp
index f42c29b..33460e5 100644
--- a/app/pebblefirmware.cpp
+++ b/app/pebblefirmware.cpp
@@ -16,8 +16,9 @@ PebbleFirmware::PebbleFirmware(QObject *parent) :
 void PebbleFirmware::updateLatest(QString hw)
 {
     QNetworkRequest req;
-    req.setUrl(firmwareURL.arg(hw).arg("release-v2"));
+    req.setUrl(firmwareURL.arg(hw).arg(hw.startsWith("snowy_") ? "release-v3" : "release-v2"));
     req.setRawHeader("Cache-Control", "no-cache");
+    qDebug() << "Getting latest firmware" << req.url();
     nm->get(req);
 }
 
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index b989c64..a69bc89 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -12,17 +12,17 @@ Page {
         path: "/org/pebbled/settings"
         property string profileWhenConnected: ""
         property string profileWhenDisconnected: ""
-        property bool transliterateMessage: false
-        property bool useSystemVolume: true
-        property bool incomingCallNotification: true
-        property bool notificationsCommhistoryd: true
-        property bool notificationsMissedCall: true
-        property bool notificationsEmails: false
-        property bool notificationsMitakuuluu: true
-        property bool notificationsTwitter: true
-        property bool notificationsFacebook: true
-        property bool notificationsOther: true
-        property bool notificationsAll: false
+        property bool transliterateMessage
+        property bool useSystemVolume
+        property bool incomingCallNotification
+        property bool notificationsCommhistoryd
+        property bool notificationsMissedCall
+        property bool notificationsEmails
+        property bool notificationsMitakuuluu
+        property bool notificationsTwitter
+        property bool notificationsFacebook
+        property bool notificationsOther
+        property bool notificationsAll
     }
 
     DBusInterface {
diff --git a/app/qml/pages/WatchInfo.qml b/app/qml/pages/WatchInfo.qml
index af4a740..a1c421c 100644
--- a/app/qml/pages/WatchInfo.qml
+++ b/app/qml/pages/WatchInfo.qml
@@ -28,7 +28,7 @@ Page {
                 text: qsTr("Address")
             }
             Label {
-                text: pebbled.info.address
+                text: pebbled.info.address || ""
             }
 
             Label {
@@ -36,7 +36,7 @@ Page {
                 text: qsTr("Serial Number")
             }
             Label {
-                text: pebbled.info.serial
+                text: pebbled.info.serial || ""
             }
 
             Label {
@@ -69,7 +69,7 @@ Page {
                 text: qsTr("Recovery")
             }
             Label {
-                text: app.recoveryVersion
+                text: app.recoveryVersion || qsTr("unknown")
             }
 
             Label {
@@ -77,7 +77,7 @@ Page {
                 text: qsTr("Running")
             }
             Label {
-                text: app.firmwareVersion
+                text: app.firmwareVersion || qsTr("unknown")
             }
 
             Label {
@@ -89,7 +89,7 @@ Page {
             }
         }
         Button {
-            visible: app.firmwareLatest && app.firmwareVersion && app.firmwareVersion !== app.firmwareLatest
+            visible: app.firmwareLatest && app.firmwareVersion !== app.firmwareLatest
             text: qsTr("Upgrade Firmware")
             anchors {
                 left: parent.left
diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml
index 380ff7e..0643f79 100644
--- a/app/qml/pebble.qml
+++ b/app/qml/pebble.qml
@@ -22,6 +22,8 @@ ApplicationWindow
                     recoveryVersion = firmware.version
                 } else {
                     firmwareVersion = firmware.version
+                }
+                if (firmware.hardware) {
                     hardwareVersion = firmware.hardware
                 }
             })
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 28ddd18..8ca8b7f 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -425,6 +425,8 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts
index 4e11b08..8d431d8 100644
--- a/app/translations/pebble-pl.ts
+++ b/app/translations/pebble-pl.ts
@@ -453,6 +453,8 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany
         <translation>Najnowszy</translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation>nie wiadomo</translation>
diff --git a/app/translations/pebble-zh_CN.ts b/app/translations/pebble-zh_CN.ts
new file mode 100644
index 0000000..655d162
--- /dev/null
+++ b/app/translations/pebble-zh_CN.ts
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>AboutPage</name>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="24"/>
+        <source>Version</source>
+        <translation>版本</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="36"/>
+        <source>All Rights Reserved.</source>
+        <translation>版权所有.</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="60"/>
+        <source>Support</source>
+        <translation>支持</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="74"/>
+        <source>Your donations help justify development time.</source>
+        <translation>你的捐款帮助证明了开发时间.</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="87"/>
+        <source>Thank you for your support!!!</source>
+        <translation>感谢你的支持!!!</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="90"/>
+        <source>PayPal Donate</source>
+        <translation>贝宝捐助</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="100"/>
+        <source>Bugs?</source>
+        <translation>Bugs?</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="107"/>
+        <source>Open Bug Tracker</source>
+        <translation>打开的Bug追踪器</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="116"/>
+        <source>Forum Thread</source>
+        <translation>论坛主题</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="125"/>
+        <source>Send issue e-mail to developer</source>
+        <translation>给开发者发送问题邮件</translation>
+    </message>
+</context>
+<context>
+    <name>AppConfigDialog</name>
+    <message>
+        <location filename="../qml/pages/AppConfigDialog.qml" line="75"/>
+        <source>No configuration settings available</source>
+        <translation>没有可用的配置设置</translation>
+    </message>
+</context>
+<context>
+    <name>AppStorePage</name>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="27"/>
+        <source>Logout</source>
+        <translation>退出</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="29"/>
+        <source>Logging out...</source>
+        <translation>退出中...</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="36"/>
+        <source>Hide search</source>
+        <translation>隐藏搜索框</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="36"/>
+        <source>Show search</source>
+        <translation>显示搜索框</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="49"/>
+        <source>Pebble Appstore</source>
+        <translation>Pebble 应用商店</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="78"/>
+        <source>Apps</source>
+        <translation>应用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="86"/>
+        <source>Faces</source>
+        <translation>表情</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="109"/>
+        <source>Downloading...</source>
+        <translation>下载中...</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AppStorePage.qml" line="141"/>
+        <source>Downloading %1...</source>
+        <translation>下载 %1...</translation>
+    </message>
+</context>
+<context>
+    <name>CoverPage</name>
+    <message>
+        <location filename="../qml/cover/CoverPage.qml" line="56"/>
+        <source>connected</source>
+        <translation>已连接</translation>
+    </message>
+    <message>
+        <location filename="../qml/cover/CoverPage.qml" line="56"/>
+        <source>disconnected</source>
+        <translation>已断开</translation>
+    </message>
+</context>
+<context>
+    <name>Disclaimer</name>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="28"/>
+        <source>Feature unavailable</source>
+        <translation>功能不可用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="38"/>
+        <source>This feature is available for supporters only.</source>
+        <translation>此功能适用于仅支持者.</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="51"/>
+        <source>Supporter?</source>
+        <translation>支持者?</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="58"/>
+        <source>Send me my code!</source>
+        <translation>发送给我的代码！</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="68"/>
+        <source>Activation code</source>
+        <translation>激活码</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Disclaimer.qml" line="41"/>
+        <source>PayPal Donate</source>
+        <translation>Paypal捐助</translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpgrade</name>
+    <message>
+        <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
+        <source>Firmware upgrade</source>
+        <translation>固件升级</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
+        <source>Begin upgrade</source>
+        <translation>开始升级</translation>
+    </message>
+</context>
+<context>
+    <name>InstallAppDialog</name>
+    <message>
+        <location filename="../qml/pages/InstallAppDialog.qml" line="18"/>
+        <source>Select App files</source>
+        <translation>选择应用文件</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/InstallAppDialog.qml" line="65"/>
+        <source>Install App</source>
+        <translation>安装应用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/InstallAppDialog.qml" line="66"/>
+        <source>Install</source>
+        <translation>安装</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/InstallAppDialog.qml" line="73"/>
+        <source>Add App file</source>
+        <translation>添加应用文件</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/InstallAppDialog.qml" line="143"/>
+        <source>Delete App file</source>
+        <translation>删除应用文件</translation>
+    </message>
+</context>
+<context>
+    <name>ManagerPage</name>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="56"/>
+        <source>Pebble Appstore</source>
+        <translation>Pebble 应用商店</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="60"/>
+        <source>About</source>
+        <translation>关于</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="71"/>
+        <source>Pebble Manager</source>
+        <translation>Pebble管理</translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="99"/>
+        <source>Service</source>
+        <translation>服务</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="106"/>
+        <source>Enabled</source>
+        <translation>已启用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="107"/>
+        <source>Automatic startup</source>
+        <translation>自动启动</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="107"/>
+        <source>Manual startup</source>
+        <translation>手动启动</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="113"/>
+        <source>Active</source>
+        <translation>激活</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="114"/>
+        <source>Running</source>
+        <translation>运行中</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="114"/>
+        <source>Dead</source>
+        <translation>挂了</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="120"/>
+        <source>Connection</source>
+        <translation>连接</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="121"/>
+        <location filename="../qml/pages/ManagerPage.qml" line="259"/>
+        <source>Connected</source>
+        <translation>已连接</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="121"/>
+        <location filename="../qml/pages/ManagerPage.qml" line="280"/>
+        <source>Disconnected</source>
+        <translation>已断开</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="134"/>
+        <source>Settings</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="141"/>
+        <source>Forward phone calls</source>
+        <translation>前置通话</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="251"/>
+        <source>Profiles</source>
+        <translation>个性化</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="262"/>
+        <location filename="../qml/pages/ManagerPage.qml" line="273"/>
+        <location filename="../qml/pages/ManagerPage.qml" line="283"/>
+        <location filename="../qml/pages/ManagerPage.qml" line="294"/>
+        <source>no change</source>
+        <translation>未改变</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="149"/>
+        <source>Control main volume</source>
+        <translation>控制主音量</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="150"/>
+        <source>Pebble music volume buttons change the main phone volume directly instead of through the music player.</source>
+        <translation>Pebble音量键直接改变手机主音量，而不是通过音乐播放器</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="158"/>
+        <source>Transliterate messages</source>
+        <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>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="168"/>
+        <source>Notifications</source>
+        <translation>通知</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="176"/>
+        <source>Messaging</source>
+        <translation>消息</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="177"/>
+        <source>SMS and IM</source>
+        <translation>短信和即时消息</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="186"/>
+        <source>Missed call</source>
+        <translation>漏接电话</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="195"/>
+        <source>Emails</source>
+        <translation>邮件</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="204"/>
+        <source>Mitakuuluu</source>
+        <translation>Mitakuuluu</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="213"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="223"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="232"/>
+        <source>Other notifications</source>
+        <translation>其他通知</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ManagerPage.qml" line="241"/>
+        <source>All notifications</source>
+        <translation>所有通知</translation>
+    </message>
+</context>
+<context>
+    <name>WatchInfo</name>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="28"/>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="36"/>
+        <source>Serial Number</source>
+        <translation>序列号</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="44"/>
+        <source>BootLoader</source>
+        <translation>BootLoader</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="52"/>
+        <source>Firmware</source>
+        <translation>固件</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="69"/>
+        <source>Recovery</source>
+        <translation>恢复模式</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="77"/>
+        <source>Running</source>
+        <translation>运行中</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="85"/>
+        <source>Latest</source>
+        <translation>最新</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="88"/>
+        <source>unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="93"/>
+        <source>Upgrade Firmware</source>
+        <translation>升级固件</translation>
+    </message>
+</context>
+<context>
+    <name>WatchPage</name>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="34"/>
+        <source>Info</source>
+        <translation>信息</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="40"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="46"/>
+        <source>Sync Time</source>
+        <translation>同步时间</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="78"/>
+        <source>Installed applications</source>
+        <translation>已安装应用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="188"/>
+        <source>(slot in use by unknown app)</source>
+        <translation>(插槽在被不明应用程序使用中)</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="68"/>
+        <source>Your firmware is too old to support SDKv2 applications</source>
+        <translation>你的固件太老不支持SDK v2版本的应用</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="116"/>
+        <source>Uninstalling</source>
+        <translation>卸载中...</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="188"/>
+        <source>(empty slot)</source>
+        <translation>(空槽)</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="197"/>
+        <source>Install app...</source>
+        <translation>安装应用...</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="202"/>
+        <source>Companion app missing</source>
+        <translation>配套应用缺失</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="215"/>
+        <source>Configure...</source>
+        <translation>配置...</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/WatchPage.qml" line="220"/>
+        <source>Uninstall</source>
+        <translation>卸载</translation>
+    </message>
+</context>
+</TS>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index 843ceef..0479dc1 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -404,6 +404,8 @@ If it can&apos;t be found please check it&apos;s available and paired in Bluetoo
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>