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/translations/dashboard_ja_JP.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/translations/dashboard_ja_JP.ts')

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>
-- 
cgit 1.2.3-korg