Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp

Assets/Resources/UI/language.json

@@ -205,7 +205,8 @@
     "Cadence Sensor": "踏频",
     "Speed Meter": "速度计",
     "Heart Rate Monitor": "心率带",
-    "NO DEVICE": "尚未连接设备",
+    "NO DEVICE": "无可用设备",
+    "CHOOSE DEVICE": "查看可用设备",
     "Edit": "编辑",
     "Record": "记录",
     "More": "更多",
@@ -363,7 +364,8 @@
     "Minimum time is 20s.": "最低时间是20s！",
     "Please enter an integer between 0-59.": "请输入一个0-59的整数！",
     "Please check the network status!": "请检查网络连接是否正常!",
-    "FINISH": "终点"
+    "FINISH": "终点",
+    "Continue the game?": "有中断的划船记录，是否继续?"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -450,6 +452,7 @@
     "Cancel  Reserve": "Cancel  Reserve",
     "Smart Trainer": "Smart Trainer",
     "NO DEVICE": "NO DEVICE",
+    "CHOOSE DEVICE": "CHOOSE DEVICE",
     "CONNECT": "CONNECT",
     "CLOSE": "CLOSE",
     "PAIR": "PAIR",
@@ -721,6 +724,7 @@
     "Minimum time is 20s.": "Minimum time is 20s.",
     "Please enter an integer between 0-59.": "Please enter an integer between 0-59.",
     "Please check the network status!": "Please check if the network connection is normal!",
-    "FINISH": "FINISH"
+    "FINISH": "FINISH",
+    "Continue the game?": "Continue the game?"
   }
 }