From 3a7e565ff4f6b9466e6bcd40bce826a1ff765997 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Tue, 26 Feb 2019 13:13:14 +0900
Subject: merge with master

---
 app/Dashboard.qml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'app/Dashboard.qml')

diff --git a/app/Dashboard.qml b/app/Dashboard.qml
index 33db7f2..9e7d1ea 100644
--- a/app/Dashboard.qml
+++ b/app/Dashboard.qml
@@ -104,20 +104,20 @@ ApplicationWindow {
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.margins: 20
-        text: speed_val.toFixed(0)         /* KPH */
+        text: speed_val.toFixed(0)         /* MPH */
         font.pixelSize: 256
     }
     Label {
         id: unit
         anchors.left: speed.right
         anchors.baseline: speed.baseline
-        text: 'mph' //'Km/h'
+        text: 'MPH'
         font.pixelSize: 64
     }
     Label {
         anchors.left: unit.left
         anchors.top: unit.bottom
-        text: '100,000.5 miles'
+        text: '10,000.5 miles'
         font.pixelSize: 32
         opacity: 0.5
     }
@@ -281,7 +281,6 @@ ApplicationWindow {
     }
 
     RowLayout {
-//        visible: false
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
         Repeater {
@@ -292,7 +291,7 @@ ApplicationWindow {
                 }
                 ListElement {
                     code: 'fr_FR'
-                    language: QT_TR_NOOP('French')
+                    language: QT_TR_NOOP('Français')
                 }
                 ListElement {
                     code: 'ja_JP'
-- 
cgit 1.2.3-korg