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

Assets/Resources/UI/language.json

@@ -352,7 +352,7 @@
     "Customize": "自定义",
     "Rowing Machine": "划船机",
     "row distance": "里程",
-    "ROWER": "划船",
+    "ROWER": "划船记录",
     "Rowing time": "划船时间",
     "Rowing equipment": "划船设备",
     "Re-Rowing": "重新划船",