Merge branch 'master' of git.mycard.moe:mycard/ygopro-database

locales/en-US/strings.conf

@@ -80,6 +80,7 @@
 !system 222 Activate Trigger Effect?
 !system 223 and Ask other Trigger Effect activate later
 !system 224 First Special Summoned by own Condition
+!system 225 Overlayed under [%ls](%d)
 !system 500 Select a monster to tribute
 !system 501 Select a card to discard
 !system 502 Select a card to destroy
@@ -137,7 +138,7 @@
 !system 571 Select the zone to move to
 !system 572 Select a card to place counter
 !system 573 Select a card to negate
-!system 573 Select a card for operation
+!system 574 Select a card for operation
 !system 1000 Deck
 !system 1001 Hand
 !system 1002 Monster Zone
@@ -335,6 +336,7 @@
 !system 1285 Large
 !system 1286 Extra large
 !system 1287 Show Chain 1
+!system 1288 Ban List
 !system 1290 Disable Chatting
 !system 1291 Mute spectators
 !system 1292 Ignore chain
@@ -345,7 +347,7 @@
 !system 1297 Shuffle Hand
 !system 1298 Helper
 !system 1299 Quick Animation
-!system 1300 Ban List:
+!system 1300 Category:
 !system 1301 Deck:
 !system 1302 Save
 !system 1303 Save as
@@ -372,6 +374,7 @@
 !system 1325 Search:
 !system 1326 Effect
 !system 1327 Search
+!system 1328 Manage
 !system 1329 Series：
 !system 1330 Deck:
 !system 1331 Extra:
@@ -456,12 +459,37 @@
 !system 1429 Ineligible Place.
 !system 1430 Ineligible Position.
 !system 1431 Ineligible Counter.
+!system 1440 Close picture
+!system 1441 Zoom in
+!system 1442 Zoom out
+!system 1443 Restore size
+!system 1450 Packs list
+!system 1451 Bot deck
+!system 1452 Uncategorized
+!system 1453 --------
+!system 1460 Deck Manage
+!system 1461 New Category
+!system 1462 Rename Category
+!system 1463 Delete Category
+!system 1464 New Deck
+!system 1465 Rename Deck
+!system 1466 Delete Deck
+!system 1467 Move to Category
+!system 1468 Copy to Category
+!system 1469 Category Name:
+!system 1470 Are you sure to delete this category and ALL DECKS under it?
+!system 1471 Deck name:
+!system 1472 Please select category to move to:
+!system 1473 Please select category to copy to:
+!system 1474 There is already a category with this name.
+!system 1475 There is already a deck with this name.
+!system 1476 Delete failed.
 !system 1500 The duel ended.
 !system 1501 Replay ended.
 !system 1502 Connection has been lost.
-!system 1510 Your choice:[%ls]
-!system 1511 Opponent declared:[%ls]
-!system 1512 Choice of opponent:[%d]
+!system 1510 Your choice: [%ls]
+!system 1511 Player declared: [%ls]
+!system 1512 Choice of player: [%d]
 !system 1600 Card position changed
 !system 1601 Set a card
 !system 1602 Change a card
@@ -595,6 +623,12 @@
 !counter 0x55 Counter(Cauldron of the Old Man)
 !counter 0x56 Fire Fist Counter
 !counter 0x57 Phantasm Counter
+!counter 0x58 Counter(Nezumihanabi)
+!counter 0x59 Otoshidamashii Counters
+!counter 0x5a Counter(War Rock Ordeal)
+!counter 0x5b Counter(Ursarctic Big Dipper)
+!counter 0x105c Burning Counter
+!counter 0x5d Counter(Suship Galley "Kaisen")
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -626,7 +660,7 @@
 !setname 0x12 Frog
 !setname 0x13 Meklord
 !setname 0x3013 Meklord Emperor
-!setname 0x5013 Meklord Emperor
+!setname 0x5013 Meklord Astro
 !setname 0x6013 Meklord Army
 !setname 0x15 B.E.S.
 !setname 0x16 Roid
@@ -766,7 +800,9 @@
 !setname 0x7c Fire Formation
 !setname 0x7d Hazy
 !setname 0x107d Hazy Flame
-!setname 0x7e ZW
+!setname 0x7e ZEXAL
+!setname 0x107e ZW
+!setname 0x207e ZS
 !setname 0x7f Utopi
 !setname 0x107f Utopia
 !setname 0x207f Utopic Future
@@ -838,7 +874,7 @@
 !setname 0xb5 Ritual Beast
 !setname 0x10b5 Ritual Beast Tamer
 !setname 0x20b5 Spiritual Beast
-!setname 0x40b5 Ritual Beast Ulti-
+!setname 0x40b5 Ritual Beast Ulti
 !setname 0xb6 Outer Entity
 !setname 0xb7 Elder Entity
 !setname 0xb8 Old Entity
@@ -849,7 +885,8 @@
 !setname 0xbd Gaia The Fierce Knight
 !setname 0xbe Monarch
 !setname 0xbf Charmer
-!setname 0xc0 Familiar-Possessed
+!setname 0xc0 Possessed
+!setname 0x10c0 Familiar-Possessed
 !setname 0xc1 PSY-Frame
 !setname 0x10c1 PSY-Framegear
 !setname 0xc2 Power Tool
@@ -893,6 +930,7 @@
 !setname 0xe3 Cubic
 !setname 0xe4 Celtic Guard
 !setname 0xe5 Cipher
+!setname 0x10e5 Cipher Dragon
 !setname 0xe6 Flower Cardian
 !setname 0xe7 Silent Swordsman
 !setname 0xe8 Silent Magician
@@ -945,7 +983,8 @@
 !setname 0x10d Mythical Beast
 !setname 0x10e Evolution Pill
 !setname 0x10f Borrel
-!setname 0x110 Eyes Restrict
+!setname 0x110 Relinquished
+!setname 0x1110 Eyes Restrict
 !setname 0x111 Armed Dragon
 !setname 0x112 Knightmare
 !setname 0x113 Elemental Lord
@@ -990,7 +1029,7 @@
 !setname 0x137 Ancient Warriors
 !setname 0x138 Megalith
 !setname 0x139 Palladium Oracle
-!setname 0x13a Onomato
+!setname 0x13a Onomat
 !setname 0x13b Rebellion
 !setname 0x13c Codebreaker
 !setname 0x13d Nemesis
@@ -1003,7 +1042,51 @@
 !setname 0x2142 Eldlixir
 !setname 0x143 Golden Land
 !setname 0x144 Phantasm
-!setname 0x145 Dragma
-!setname 0x146 Märfae
+!setname 0x145 Dogmatika
+!setname 0x146 Melffy
 !setname 0x147 Potan
 !setname 0x148 Roland
+!setname 0x149 Fossil
+!setname 0x14a Numeron
+!setname 0x114a Numeron Gate
+!setname 0x14b Appliancer
+#setname 0x14c Spiritual Art
+!setname 0x314c Spiritual Earth Art
+!setname 0x514c Spiritual Water Art
+!setname 0x614c Spiritual Fire Art
+!setname 0x914c Spiritual Wind Art
+#setname 0xa14c Spiritual Light Art
+#setname 0xc14c Dark Spirit Art
+!setname 0x14d Tri-Brigade
+!setname 0x14e Virtual World
+!setname 0x114e Virtual World Gate
+!setname 0x14f Dual Avatar
+!setname 0x150 Magistus
+#setname 0x151 Twin
+!setname 0x1151 Live☆Twin
+!setname 0x2151 Evil★Twin
+!setname 0x152 Ki-sikil
+!setname 0x153 Lil-la
+!setname 0x154 Drytron
+!setname 0x155 Springans
+!setname 0x156 S-Force
+!setname 0x157 Myutant
+#setname 0x158 サン
+!setname 0x1158 Sunvine
+!setname 0x2158 Sunavalon
+!setname 0x159 Starry Knight
+!setname 0x15a Doll Monster
+!setname 0x15b Amazement
+!setname 0x15c ∀ttraction
+!setname 0x15d Stigmata
+!setname 0x15e RDM
+!setname 0x15f War Rock
+!setname 0x160 Materiactor
+!setname 0x161 Abhyss
+!setname 0x162 Doremichord
+!setname 0x163 Ursarctic
+!setname 0x164 Despia
+!setname 0x165 Magikey
+!setname 0x166 Suship
+!setname 0x1167 Mystical Beast of the Forest
+!setname 0x2167 Mystical Spirit of the Forest