Merge branch 'develop' into koishi-develop

locales/en-US/strings.conf

@@ -577,7 +577,7 @@
 !counter 0x4 Psychic Counter
 !counter 0x5 Shine Counter
 !counter 0x6 Gem Counter
-!counter 0x7 Counter(Colosseum Cage of the Gladiator Beasts)
+!counter 0x7 Counter(Colosseum - Cage of the Gladiator Beasts)
 !counter 0x8 D Counter
 !counter 0x1009 Venom Counter
 !counter 0xa Genex Counter
@@ -587,7 +587,7 @@
 !counter 0x100e A-Counter
 !counter 0xf Worm Counter
 !counter 0x10 Black Feather Counter
-!counter 0x11 Hyper Venom Counter
+!counter 0x11 Hyper-Venom Counter
 !counter 0x12 Karakuri Counter
 !counter 0x13 Chaos Counter
 !counter 0x14 Counter(Miracle Jurassic Egg)
@@ -610,7 +610,7 @@
 !counter 0x25 Chronicle Counter
 !counter 0x26 Counter(Metal Shooter)
 !counter 0x27 Counter(Des Mosquito)
-!counter 0x28 Counter (Dark Catapulter)
+!counter 0x28 Counter(Dark Catapulter)
 !counter 0x29 Counter(Balloon Lizard)
 !counter 0x102a Counter(Magic Reflector)
 !counter 0x2b Destiny Counter
@@ -618,7 +618,7 @@
 !counter 0x2d Counter(Kickfire)
 !counter 0x2e Shark Counter
 !counter 0x2f Pumpkin Counter
-!counter 0x30 Feel the Flow Counter
+!counter 0x30 Hi-Five the Sky Counter
 !counter 0x31 Rising Sun Counter
 !counter 0x32 Balloon Counter
 !counter 0x33 Yosen Counter
@@ -656,15 +656,15 @@
 !counter 0x59 Otoshidamashii Counters
 !counter 0x5a Counter(War Rock Ordeal)
 !counter 0x5b Counter(Ursarctic Big Dipper)
-!counter 0x105c Burning Counter
+!counter 0x105c Burnup Counter
 !counter 0x5d Counter(Gizmek Myth)
 !counter 0x5e Emperor's Key Counter
-!counter 0x5f Peace Counter
+!counter 0x5f Piece Counter
 !counter 0x60 Counter(Ursarctic Radiation)
 !counter 0x61 Counter(Prisoner of Destiny)
 !counter 0x62 Counter(Life Shaver)
 !counter 0x1063 Hallucination Counter
-!counter 0x64 G Golem Counter
+!counter 0x64 GG Counter
 !counter 0x1065 Bunny Ears Counter
 !counter 0x66 Counter(Gunkan Suship Chef's Choice)
 !counter 0x67 Counter(Combat Wheel)
@@ -673,7 +673,8 @@
 !counter 0x6a Resonance Counter
 !counter 0x106b Deranged Counter
 !counter 0x6c Access Counter
-!counter 0x6d Success Counter
+!counter 0x6d Schoolwork Counter
+!counter 0x6e Season Counter
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -691,7 +692,7 @@
 !setname 0x5008 Vision HERO
 !setname 0xa008 Masked HERO
 !setname 0x9 Neos
-!setname 0xa Lswarm
+!setname 0xa lswarm
 !setname 0x100a Steelswarm
 !setname 0xb Infernity
 !setname 0xc Alien
@@ -709,7 +710,7 @@
 !setname 0x5013 Meklord Astro
 !setname 0x6013 Meklord Army
 !setname 0x15 B.E.S.
-!setname 0x16 Roid
+!setname 0x16 roid
 !setname 0x1016 Vehicroid
 !setname 0x2016 Speedroid
 !setname 0x17 Synchro
@@ -739,7 +740,7 @@
 !setname 0x2b Ninja
 !setname 0x102b Armor Ninja
 !setname 0x2c Flamvell
-!setname 0x2e Gravekeeper
+!setname 0x2e Gravekeeper's
 !setname 0x2f Ice Barrier
 !setname 0x30 Vylon
 !setname 0x31 Fortune Lady
@@ -751,7 +752,7 @@
 !setname 0x2034 Ultimate Crystal
 !setname 0x5034 Advanced Crystal Beast
 !setname 0x35 Fabled
-!setname 0x1035 The Fabled
+!setname 0x1035 Fabled
 !setname 0x36 Machina
 !setname 0x37 Mist Valley
 !setname 0x38 Lightsworn
@@ -809,7 +810,7 @@
 !setname 0x59 Gogogo
 !setname 0x5a Penguin
 !setname 0x5b Inmato
-!setname 0x5c Sphinx
+!setname 0x5c sphinx
 !setname 0x60 Bamboo Sword
 !setname 0x61 Ninjitsu Art
 !setname 0x62 Toon
@@ -860,7 +861,7 @@
 !setname 0x7e ZEXAL
 !setname 0x107e ZW -
 !setname 0x207e ZS -
-!setname 0x7f Utopi
+!setname 0x7f Utopic
 !setname 0x107f Utopia
 !setname 0x207f Utopic Future
 !setname 0x80 Duston
@@ -914,7 +915,7 @@
 !setname 0xa4 Kuriboh
 !setname 0x10a4 Winged Kuriboh
 !setname 0xa5 Change
-!setname 0xa6 Sprout
+!setname 0xa6 sprout
 !setname 0xa7 Artorigus
 !setname 0xa8 Laundsallyn
 !setname 0xa9 Fluffal
@@ -986,8 +987,8 @@
 !setname 0xde Exodia
 !setname 0xdf Lunalight
 !setname 0xe0 Amorphage
-!setname 0xe1 Metalphosis
-!setname 0xe2 Tramid
+!setname 0xe1 Metalfoes
+!setname 0xe2 Triamid
 !setname 0xe3 Cubic
 !setname 0xe4 Celtic Guard
 !setname 0xe5 Cipher
@@ -998,7 +999,7 @@
 !setname 0xe9 Magna Warrior
 !setname 0xea Crystron
 !setname 0xeb Chemicritter
-!setname 0xec Abyss
+!setname 0xec Abyss-
 !setname 0x10ec Abyss Actor
 !setname 0x20ec Abyss Script
 !setname 0xed Subterror
@@ -1021,7 +1022,7 @@
 #setcode 0xf8 Supreme King
 !setname 0x10f8 Supreme King Gate
 !setname 0x20f8 Supreme King Dragon
-!setname 0xf9 True King
+!setname 0xf9 True Draco
 !setname 0xf9 True Draco
 !setname 0xfa Phantasm Spiral
 !setname 0xfb Trickstar
@@ -1031,7 +1032,7 @@
 !setname 0xff Clear Wing
 !setname 0x100 Bonding
 !setname 0x101 code Talker
-!setname 0x102 rokket
+!setname 0x102 Rokket
 !setname 0x103 Altergeist
 !setname 0x104 Krawler
 !setname 0x105 Metaphys
@@ -1090,7 +1091,7 @@
 !setname 0x136 A.I.
 !setname 0x137 Ancient Warriors
 !setname 0x138 Megalith
-!setname 0x139 Palladium Oracle
+!setname 0x139 Palladium
 !setname 0x13a Onomat
 !setname 0x13b Rebellion
 !setname 0x13c Codebreaker
@@ -1133,7 +1134,7 @@
 !setname 0x155 Springans
 !setname 0x156 S-Force
 !setname 0x157 Myutant
-#setname 0x158 サン
+#setname 0x158 Sun
 !setname 0x1158 Sunvine
 !setname 0x2158 Sunavalon
 !setname 0x159 Starry Knight
@@ -1260,3 +1261,6 @@
 !setname 0x1c9 Dragon Tail
 !setname 0x1ca Yummy
 !setname 0x1cb K9
+!setname 0x1cc Teleport
+!setname 0x1cd Artmage
+!setname 0x1ce Imprisoned Deity
\ No newline at end of file

locales/es-ES/strings.conf

@@ -217,25 +217,25 @@
 !system 1100 Destruir M/T
 !system 1101 Destruir Monstruo
 !system 1102 Desterrar
-!system 1103 Cementerio
+!system 1103 Enviar al Cementerio
 !system 1104 Devolver a la Mano
 !system 1105 Devolver al Deck
 !system 1106 Destruir Mano
 !system 1107 Destruir Deck
 !system 1108 Robar
-!system 1109 Buscar
-!system 1110 Recuperar
-!system 1111 Posición
-!system 1112 Control
+!system 1109 Añadir a la Mano
+!system 1110 Reciclar
+!system 1111 Cambiar Posición de Batalla
+!system 1112 Tomar el Control
 !system 1113 Cambiar ATK/DEF
-!system 1114 Penetración
+!system 1114 Daño por Penetración
 !system 1115 Repetir Ataque
 !system 1116 Limitar Ataque
 !system 1117 Ataque Directo
 !system 1118 Invocar de Modo Especial
 !system 1119 Ficha
 !system 1120 Relacionado al Tipo
-!system 1121 Relacionado a Propiedad
+!system 1121 Relacionado al Atributo
 !system 1122 Daño LP
 !system 1123 Recuperar LP
 !system 1124 Destruir
@@ -243,7 +243,7 @@
 !system 1126 Contador
 !system 1127 Lanzar Moneda/Dado
 !system 1128 Relacionado a Fusión
-!system 1129 Relacionado a Cantante
+!system 1129 Relacionado a Sincronía
 !system 1130 Relacionado a XYZ
 !system 1131 Negar Efecto
 #actions
@@ -303,10 +303,10 @@
 !system 1233 Cartas por Robo:
 !system 1234 HostName:
 !system 1235 Contraseña:
-!system 1236 Elegir Regla a Usar:
+!system 1236 Regla:
 !system 1237 Tiempo Límite:
 !system 1238 Devuelve las cartas a la parte superior del Deck antes de barajar.
-!system 1244 Duelo Simple
+!system 1244 Single
 !system 1245 Match
 !system 1246 Tag
 !system 1247 Duelo Estandar
@@ -315,13 +315,13 @@
 !system 1251 →Jugador
 !system 1252 →Espectador
 !system 1253 Espectadores:
-!system 1254 Seleccionar Deck
+!system 1254 Elegir Deck
 !system 1255 ¡Listo!
-!system 1260 Master Rules
-!system 1261 Master Rules 2
-!system 1262 Master Rules 3
-!system 1263 New Master Rules (2017)
-!system 1264 New Master Rules (2020)
+!system 1260 MR 1
+!system 1261 MR 2
+!system 1262 MR 3
+!system 1263 MR 4 (2017)
+!system 1264 MR 5 (2020)
 !system 1267 Lenguaje (Reiniciar*)
 !system 1268 Comprueba antes de colocar monstruos.
 !system 1269 Imagen de Escala de Péndulo
@@ -378,7 +378,7 @@
 !system 1321 Tipo:
 !system 1322 ATK:
 !system 1323 DEF:
-!system 1324 NV/RG/LK:
+!system 1324 LV/RK/LK:
 !system 1325 Buscar:
 !system 1326 Efecto
 !system 1327 Buscar
@@ -428,7 +428,7 @@
 !system 1371 ATK↑
 !system 1372 DEF↑
 !system 1373 Nombre↓
-!system 1374 Marcadores de Enlace
+!system 1374 ◀F.Enlace▶
 !system 1378 Búsqueda de Palabras Clave Múltiples
 !system 1379 Priorizar Uso de Expansiones
 !system 1380 Modo IA(Sin Banlist)
@@ -447,7 +447,7 @@
 !system 1403 Error al Unirse a la partida.
 !system 1404 Sala Incorrecta.
 !system 1405 El host rechaza la conexión.
-!system 1406 Deck Inválido
+!system 1406 Deck Ilegal
 !system 1407 [%ls] no permitido. Consulta la lista de cartas TCG/OCG y comprueba la Lista de Cartas Prohibidas.
 !system 1408 Error de Side Deck (Número distinto de cartas en el main, extra o side deck)
 !system 1409 Cambiando cartas con el Side Deck...
@@ -670,6 +670,7 @@
 !counter 0x106b Contador Demente
 !counter 0x6c Contador de Acceso
 !counter 0x6d Contador de Deberes
+!counter 0x6e Contador de Temporada
 #setnames, using tab for comment
 !setname 0x1 Aliado de la Justicia
 !setname 0x2 Genex
@@ -1253,7 +1254,7 @@
 !setname 0x1c1 Argostars
 !setname 0x1c2 Aqua Jet
 !setname 0x1c3 Mitsurugi
-!setname 0x1c4 Señor Dragón
+!setname 0x1c4 Señor Dragón de los/las
 !setname 0x1c5 Regénesis
 !setname 0x1c6 Dominus
 !setname 0x1c7 Serket
@@ -1261,3 +1262,6 @@
 !setname 0x1c9 Coladragón
 !setname 0x1ca Delicioso/a
 !setname 0x1cb K9
+!setname 0x1cc Teleport
+!setname 0x1cd Artmegia
+!setname 0x1ce Deidad Encarcelada

locales/ja-JP/strings.conf

@@ -663,6 +663,7 @@
 !counter 0x106b 狂愛カウンター
 !counter 0x6c アクセスカウンター
 !counter 0x6d 祝台カウンター
+!counter 0x6e シキカウンター
 #setnames, using tab for comment
 !setname 0x1 Ａ・Ｏ・Ｊ
 !setname 0x2 ジェネクス
@@ -1257,4 +1258,7 @@
 !setname 0x1c8 アポピス
 !setname 0x1c9 星辰（ドラゴンテイル）
 !setname 0x1ca ヤミー
-!setname 0x1cb Ｋ9
\ No newline at end of file
+!setname 0x1cb Ｋ9
+!setname 0x1cc テレポート
+!setname 0x1cd 神芸（アルトメギア）
+!setname 0x1ce 獄神
\ No newline at end of file

locales/ko-KR/strings.conf

@@ -115,7 +115,7 @@
 !system 531 어드밴스 소환을 위해 릴리스할 카드를 선택하세요.
 !system 532 엑시즈 소재를 제거할 몬스터를 선택하세요.
 !system 533 링크 소재를 선택하세요.
-!system 534 필드에 유지할 카드를 선택하세요.
+!system 534 필드에 남길 카드를 선택하세요.
 !system 549 공격 대상을 선택하세요.
 !system 550 발동할 효과를 선택하세요.
 !system 551 효과 대상을 선택하세요.
@@ -666,9 +666,11 @@
 !counter 0x68 카운터(토템폴)
 !counter 0x69 카운터(베다=우파니샤드)
 !counter 0x6a 향명 카운터
+!counter 0x106b 광애 카운터
 !counter 0x6b 광애 카운터
 !counter 0x6c 액세스 카운터
 !counter 0x6d 숙제 카운터
+!counter 0x6e 시키 카운터
 #setnames, using tab for comment
 !setname 0x1 A·O·J
 !setname 0x2 제넥스
@@ -1250,3 +1252,15 @@
 !setname 0x1c0 룡화
 !setname 0x1c1 ARG☆S(아르고스타즈)
 !setname 0x1c2 아쿠아 제트
+!setname 0x1c3 미츠루기
+!setname 0x1c4 정룡
+!setname 0x1c5 리제네시스
+!setname 0x1c6 도미나스
+!setname 0x1c7 셀케트
+!setname 0x1c8 아포피스
+!setname 0x1c9 드래곤테일
+!setname 0x1ca 야미
+!setname 0x1cb K9
+!setname 0x1cc 텔레포트
+!setname 0x1cd 아르토메기아
+!setname 0x1ce 옥신
\ No newline at end of file

locales/pt-PT/strings.conf

@@ -663,6 +663,7 @@
 !counter 0x106b Marcador de Perturbação
 !counter 0x6c Marcador de Acesso
 !counter 0x6d Marcador de Sucesso
+!counter 0x6e Marcador Estação
 #setnames, using tab for comment
 !setname 0x1 Aliado da Justiça
 !setname 0x2 Genex
@@ -705,7 +706,8 @@
 !setname 0x1017 Sincron
 !setname 0x2017 Dragão Sincro
 !setname 0x18 Nuviano
-!setname 0x19 Besta Gladiadora
+!setname 0x19 Gladiador
+!setname 0x1019 Besta Gladiadora
 !setname 0x1a Escorpião das Trevas
 !setname 0x1b Besta Fantasma
 !setname 0x101b Besta Fantasma Mecha
@@ -1195,7 +1197,8 @@
 !setname 0x198 Visas
 !setname 0x199 Contra
 !setname 0x19a Veda
-!setname 0x19b Diabellstar
+!setname 0x19b Diabell
+!setname 0x119b Diabellstar
 !setname 0x19c Olho de Cobra
 !setname 0x19d Horus
 !setname 0x119d Horus, o Dragão da Chama Negra
@@ -1236,3 +1239,17 @@
 !setname 0x1be Ryzeal
 !setname 0x1bf Maliss
 !setname 0x1c0 Ryu-Ge
+!setname 0x1c1 Argostars
+!setname 0x1c2 Jato d'Água
+!setname 0x1c3 Mitsurugi
+!setname 0x1c4 Dragão Soberano
+!setname 0x1c5 Regenesis
+!setname 0x1c6 Dominus
+!setname 0x1c7 Serket
+!setname 0x1c8 Apophis
+!setname 0x1c9 Cauda de Dragão
+!setname 0x1ca Yummy
+!setname 0x1cb K9
+!setname 0x1cc Teleporte
+!setname 0x1cd Artmage
+!setname 0x1ce Divindade Aprisionada
\ No newline at end of file

locales/zh-CN/strings.conf

@@ -671,6 +671,7 @@
 !counter 0x106b 狂爱指示物
 !counter 0x6c 访问指示物
 !counter 0x6d 祝台指示物
+!counter 0x6e 四季指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1253,7 +1254,7 @@
 !setname 0x1c0 龙华	竜華
 !setname 0x1c1 阿尔戈☆群星	ARG☆S
 !setname 0x1c2 喷水引擎	アクア・ジェット
-!setname 0x1c3 御剑	Mitsurugi
+!setname 0x1c3 巳剑	Mitsurugi
 !setname 0x1c4 征龙	征竜
 !setname 0x1c5 再世	再世
 !setname 0x1c6 统王	ドミナス
@@ -1261,4 +1262,7 @@
 !setname 0x1c8 阿匹卜	Apophis
 !setname 0x1c9 星辰	ドラゴンテイル
 !setname 0x1ca 味美喵	ヤミー
-!setname 0x1cb K9	K9
\ No newline at end of file
+!setname 0x1cb K9	K9
+!setname 0x1cc 瞬间移动
+!setname 0x1cd 神艺
+!setname 0x1ce 狱神
\ No newline at end of file