Commit 2eb3303a authored by nanahira's avatar nanahira

Merge branch 'master' of https://github.com/moecube/srvpro

parents fa7ed0ab 80225bce
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
"retry_too_much_part2": " times.", "retry_too_much_part2": " times.",
"retry_too_much_room_part1": " was kicked from the room for performing an illegal operation ", "retry_too_much_room_part1": " was kicked from the room for performing an illegal operation ",
"retry_too_much_room_part2": " times.", "retry_too_much_room_part2": " times.",
"pre_reconnecting_to_room": "You will be reconnected to your previous game. Please pick your Previous deck.", "pre_reconnecting_to_room": "You will be reconnected to your previous game. Please pick your previous deck.",
"deck_incorrect_reconnect": "Please pick your Previous deck.", "deck_incorrect_reconnect": "Please pick your previous deck.",
"reconnect_failed": "Reconnect failed.", "reconnect_failed": "Reconnect failed.",
"reconnecting_to_room": "Reconnecting to server...", "reconnecting_to_room": "Reconnecting to server...",
"athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender." "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender."
...@@ -268,6 +268,10 @@ ...@@ -268,6 +268,10 @@
"retry_too_much_part2": " vez.", "retry_too_much_part2": " vez.",
"retry_too_much_room_part1": " fue expulsado de la sala por hacer operaciones ilegales por la ", "retry_too_much_room_part1": " fue expulsado de la sala por hacer operaciones ilegales por la ",
"retry_too_much_room_part2": " vez.", "retry_too_much_room_part2": " vez.",
"pre_reconnecting_to_room": "Vas a ser reconectado a tu juego anterior. Por favor, escoja tu Deck anterior.",
"deck_incorrect_reconnect": "Por favor, escoja tu Deck anterior.",
"reconnect_failed": "Fallo al reconectar.",
"reconnecting_to_room": "Reconectando al servidor...",
"athletic_arena_tip": "Durante una Partdida deportiva, un comportamiento de abandono se considera una rendición." "athletic_arena_tip": "Durante una Partdida deportiva, un comportamiento de abandono se considera una rendición."
}, },
"zh-cn": { "zh-cn": {
...@@ -630,6 +634,10 @@ ...@@ -630,6 +634,10 @@
"retry_too_much_part2": " 回行った為、部屋からキックされています。", "retry_too_much_part2": " 回行った為、部屋からキックされています。",
"retry_too_much_room_part1": " は不正行為を ", "retry_too_much_room_part1": " は不正行為を ",
"retry_too_much_room_part2": " 回行った為、部屋からキックされました。", "retry_too_much_room_part2": " 回行った為、部屋からキックされました。",
"pre_reconnecting_to_room": "これから先程のゲームに再接続します。 前回のデッキを選択して下さい。",
"deck_incorrect_reconnect": "前回のデッキを選択して下さい。",
"reconnect_failed": "再接続が失敗しました。",
"reconnecting_to_room": "サーバーに再接続中・・・",
"athletic_arena_tip": "アスレチック戦では、ゲーム終了行為はサレンダーと見なされます。" "athletic_arena_tip": "アスレチック戦では、ゲーム終了行為はサレンダーと見なされます。"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment