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

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Resources/UI/language.json

@@ -289,7 +289,16 @@
     "Reconnect": "重新连接",
     "Did you want to reconnect the trip that was interrupted abnormally?": "你有异常中断的骑行,是否重新连接开始骑行?",
     "LIST MODE": "线路模式",
-    "Get The First Place. Close Gate": "第一名已产生，倒计时:",
+    "User refusal of authorisation": "用户拒绝授权",
+    "User deauthorisation": "用户取消授权",
+    "COLLECTIONS": "集合",
+    "CONTINUOUS": "累计骑行",
+    "DISTANCE": "距离",
+    "CARLORIES": "卡路里",
+    "DAY": "天",
+    "DAYS": "天",
+    "VIEW1": "查看",
+    "Get The First Place. Time Limit": "第一名已产生，倒计时:",
     "Competition Time": "比赛时间",
     "View All": "查看全部"
   },
@@ -574,8 +583,17 @@
     "Reconnect": "Reconnect",
     "Did you want to reconnect the trip that was interrupted abnormally?": "Did you want to reconnect the trip that was interrupted abnormally?",
     "LIST MODE": "LIST MODE",
-    "Get The First Place. Close Gate": "Get The First Place. Close Gate",
+    "User refusal of authorisation": "User refusal of authorisation",
+    "User deauthorisation": "User deauthorisation",
+    "COLLECTIONS": "COLLECTIONS",
+    "CONTINUOUS": "CONTINUOUS",
+    "DISTANCE": "DISTANCE",
+    "CARLORIES": "CARLORIES",
+    "DAY": "DAY",
+    "DAYS": "DAYS",
+    "VIEW1": "VIEW",
+    "Get The First Place. Time Limit": "Get The First Place. Time Limit",
     "Competition Time": "Competition Time",
     "View All": "View All"
   }
-}
+}