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

---
 .gitignore                          |  4 +++-
 app/Dashboard.qml                   |  9 ++++-----
 app/translations/dashboard_fr_FR.ts | 10 +++++-----
 app/translations/dashboard_ja_JP.ts | 10 +++++-----
 app/translations/dashboard_zh_CN.ts | 10 +++++-----
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 567609b..684dcbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-build/
+build
+*.pro.user
+app/config.tests
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'
diff --git a/app/translations/dashboard_fr_FR.ts b/app/translations/dashboard_fr_FR.ts
index c7c7fa7..7699dae 100644
--- a/app/translations/dashboard_fr_FR.ts
+++ b/app/translations/dashboard_fr_FR.ts
@@ -72,22 +72,22 @@
         <translation>Carburant</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="291"/>
+        <location filename="../Dashboard.qml" line="290"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="295"/>
-        <source>French</source>
+        <location filename="../Dashboard.qml" line="294"/>
+        <source>Français</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="299"/>
+        <location filename="../Dashboard.qml" line="298"/>
         <source>日本語</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="303"/>
+        <location filename="../Dashboard.qml" line="302"/>
         <source>中文简体</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/translations/dashboard_ja_JP.ts b/app/translations/dashboard_ja_JP.ts
index 8bb6bf7..5dd6e5f 100644
--- a/app/translations/dashboard_ja_JP.ts
+++ b/app/translations/dashboard_ja_JP.ts
@@ -72,22 +72,22 @@
         <translation>燃料</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="291"/>
+        <location filename="../Dashboard.qml" line="290"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="295"/>
-        <source>French</source>
+        <location filename="../Dashboard.qml" line="294"/>
+        <source>Français</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="299"/>
+        <location filename="../Dashboard.qml" line="298"/>
         <source>日本語</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="303"/>
+        <location filename="../Dashboard.qml" line="302"/>
         <source>中文简体</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/translations/dashboard_zh_CN.ts b/app/translations/dashboard_zh_CN.ts
index aa81e28..a37155a 100644
--- a/app/translations/dashboard_zh_CN.ts
+++ b/app/translations/dashboard_zh_CN.ts
@@ -72,22 +72,22 @@
         <translation>燃油</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="291"/>
+        <location filename="../Dashboard.qml" line="290"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="295"/>
-        <source>French</source>
+        <location filename="../Dashboard.qml" line="294"/>
+        <source>Français</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="299"/>
+        <location filename="../Dashboard.qml" line="298"/>
         <source>日本語</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="303"/>
+        <location filename="../Dashboard.qml" line="302"/>
         <source>中文简体</source>
         <translation type="unfinished"></translation>
     </message>
-- 
cgit 1.2.3-korg