Merge branch 'master' into tcg_random

config_build/config.json

@@ -284,7 +284,7 @@
     "http": {
       "port": 7211,
       "password": "Nanahira",
-      "websocket_roomlist": true,
+      "websocket_roomlist": false,
       "public_roomlist": false,
       "show_ip": true,
       "show_info": true,

config_tourney/config.json

@@ -283,7 +283,7 @@
     "http": {
       "port": 1263,
       "password": "Nanahira",
-      "websocket_roomlist": true,
+      "websocket_roomlist": false,
       "public_roomlist": true,
       "show_ip": true,
       "show_info": true,

data/default_config.json

@@ -21,6 +21,7 @@
     "stop": false,
     "side_timeout": false,
     "tag_duel_surrender": true,
+    "replay_delay": false,
     "i18n": {
       "auto_pick": false,
       "default": "zh-cn",

data/i18n.json

@@ -38,7 +38,7 @@
     "invalid_password_existed": "Password invalid (Already Existed)",
     "invalid_password_not_found": "Password invalid (Not Found)",
     "invalid_password_action": "Password invalid (Invalid Action)",
-    "invalid_password_checksum": "Password incorrect (Checksum Failed)",
+    "invalid_password_checksum": "Password incorrect (Checksum Failed) (Please re-login your account.)",
     "bad_user_name": "Please enter the correct ID",
     "server_full": "Server is full, please try again later.",
     "too_much_connection": "Too many clients running at the moment! ",
@@ -186,6 +186,8 @@
     "vip_set_victory": "Your victory word have been set.",
     "vip_password_changed": "Password changed.",
     "vip_player_name_too_long": "Your username or password is too long to log in. Please change your username and try again.",
+    "replay_hint_part1": "Sending the replay of the duel number ",
+    "replay_hint_part2": ".",
     "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender."
   },
   "es-es": {
@@ -371,7 +373,7 @@
     "invalid_password_existed": "主机密码不正确 (Already Existed)",
     "invalid_password_not_found": "主机密码不正确 (Not Found)",
     "invalid_password_action": "主机密码不正确 (Invalid Action)",
-    "invalid_password_checksum": "主机密码不正确 (Checksum Failed)",
+    "invalid_password_checksum": "主机密码不正确 (Checksum Failed) (请退出并重新登录你的账号)",
     "bad_user_name": "请输入正确的用户名",
     "server_full": "服务器已经爆满，请稍候再试",
     "too_much_connection": "同时开启的客户端数量过多 ",
@@ -519,6 +521,8 @@
     "vip_set_victory": "已设置胜利台词。",
     "vip_password_changed": "密码修改成功。",
     "vip_player_name_too_long": "你的用户名或设置的密码太长，使用此用户名可能会无法登陆。请更换用户名重试。",
+    "replay_hint_part1": "正在发送第",
+    "replay_hint_part2": "局决斗的录像。",
     "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。"
   },
  "ko-kr": {