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

locales/en-US/strings.conf

@@ -9,26 +9,26 @@
 !system 5 Special Summoned
 !system 6 Flip Summoned
 !system 7 Activate
-!system 10 Remove the Counter(s)
+!system 10 Remove Counter(s)
 !system 11 Pay LP
-!system 12 Remove the Material(s)
-!system 20 Draw Phase
-!system 21 Standby Phase
-!system 22 Main Phase
-!system 23 End of Main Phase
-!system 24 Battle Phase
-!system 25 End of Battle Phase
-!system 26 End Phase
-!system 27 Before the Draw
-!system 28 Start Step of Battle Phase
-!system 29 End Step of Battle Phase
-!system 30 Replay, do you want to continue the Battle?
-!system 31 Do you want to Attack Directly?
-!system 40 Damage Step
-!system 41 Before Damage Calculation
-!system 42 During Damage Calculation
-!system 43 After Damage Calculation
-!system 44 At the end of Damage Step
+!system 12 Remove Material(s)
+!system 20 During the Draw Phase.
+!system 21 During the Standby Phase.
+!system 22 Main Phase.
+!system 23 Your opponent is about to move to the next Phase.
+!system 24 Battle Step of the Battle Phase.
+!system 25 End Step of the Battle Phase.
+!system 26 During the End Phase.
+!system 27 At the start of the Draw Phase, before the Draw.
+!system 28 Start Step of the Battle Phase.
+!system 29 End Step of the Battle Phase.
+!system 30 Replay rules apply. Continue this attack?
+!system 31 Attack directly with this monster?
+!system 40 Start of the Damage Step.
+!system 41 Before Damage Calculation.
+!system 42 During Damage Calculation.
+!system 43 After Damage Calculation.
+!system 44 End of the Damage Step.
 !system 60 Heads
 !system 61 Tails
 !system 62 Heads effect
@@ -40,105 +40,105 @@
 !system 70 Monster Cards
 !system 71 Spell Cards
 !system 72 Trap Cards
-!system 80 Entering the Battle Phase
-!system 81 Entering of the End Phase
-!system 90 Normal Summon without tribute(s)?
-!system 91 Use your additional Special Summon?
-!system 92 Use opponent monster?
-!system 93 Choose material?
-!system 94 Do you want to activate this card's effect now?
-!system 95 Do you want to use the effect of [%ls] ?
+!system 80 Start Step of the Battle Phase.
+!system 81 During the End Phase.
+!system 90 Conduct this Normal Summon without Tributing?
+!system 91 Use additional Summon?
+!system 92 Tribute your opponent's monster?
+!system 93 Continue selecting Materials?
+!system 94 Activate this card's effect now?
+!system 95 Use the effect of [%ls]?
 !system 96 Use the effect of [%ls] to avoid destruction?
-!system 97 Place [%ls] in Spell & Trap Zone?
-!system 98 Tribute monsters your opponent controls through "Lair of Darkness"?
-!system 100 First to go
-!system 101 Second to go
+!system 97 Place [%ls] to a Spell & Trap Zone?
+!system 98 Tribute a monster(s) your opponent controls?
+!system 100 First
+!system 101 Second
 !system 102 Self
 !system 103 Opponent
-!system 200 Do you wish to use from [%ls] [%ls]'s effect?
-!system 201 No effect can be activated at this moment
-!system 202 Do you want to check the field?
+!system 200 From [%ls], activate [%ls]?
+!system 201 No card or effect can be activated at this time.
+!system 202 Check the field?
 !system 203 Chain another card or effect?
 !system 204 Remove %d [%ls]
-!system 205 Please select a sort order
-!system 206 Please select the chain sequence
+!system 205 Rearrange the order of cards on top/bottom of the Deck.
+!system 206 Select the chain sequence.
 !system 207 Revealing %d card(s):
 !system 208 Confirm %d card(s):
-!system 209 The card has met the requisites
-!system 210 Select if you want to continue:
-!system 211 Round count:
+!system 209 This card has met its requirements.
+!system 210 Continue selecting?
+!system 211 Turn counter:
 !system 212 Declared card:
 !system 213 Declared type:
 !system 214 Declared attribute:
 !system 215 Declared number:
-!system 216 Activated in chain %d
+!system 216 Activated in chain link %d
 !system 217 Target of (chain %d) [%ls]
 !system 218 Pay LP by Effect of [%ls], instead?
-!system 219 Detach XYZ material by Effect of [%ls], instead?
+!system 219 Detach Xyz material by Effect of [%ls], instead?
 !system 220 Remove Counter(s) by Effect of [%ls], instead?
-!system 221 on [%ls], Activate Trigger Effect of [%ls]?
+!system 221 On [%ls], Activate Trigger Effect of [%ls]?
 !system 222 Activate Trigger Effect?
-!system 223 and Ask other Trigger Effect activate later
+!system 223 Other Trigger Effects will be asked 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
-!system 503 Select a card to banish
-!system 504 Select a card to send to Graveyard
-!system 505 Select a card to return to hand
-!system 506 Select the card to add to your hand
-!system 507 Select the card(s) to return to Deck
-!system 508 Select the card to Summon
-!system 509 Select a Monster to Special Summon
-!system 510 Select a card to flip-up
-!system 511 Select materials for Fusion Summon
-!system 512 Select materials for Synchro Summon
-!system 513 Select materials for Xyz Summon
-!system 514 Select a face-up card on the field
-!system 515 Select a face-down card on the field
-!system 516 Select a monster in attack position
-!system 517 Select a monster in defense position
-!system 518 Select a card to equip
-!system 519 Select Xyz material to detach
-!system 520 Select monster to change control
-!system 521 Select card to replace
-!system 522 Select monsters in face-up attack position
-!system 523 Select monsters in face-up defense position
-!system 524 Select attack monster
-!system 525 Select defense monster
+!system 500 Select a monster to Tribute.
+!system 501 Select a card to discard.
+!system 502 Select a card to destroy.
+!system 503 Select a card to banish.
+!system 504 Select a card to send to the Graveyard.
+!system 505 Select a card to return to the hand.
+!system 506 Select a card to add to your hand.
+!system 507 Select a card(s) to return to Deck.
+!system 508 Select a card(s) to Summon.
+!system 509 Select a monster to Special Summon.
+!system 510 Select a card to set.
+!system 511 Select Materials for a Fusion Summon.
+!system 512 Select Materials for a Synchro Summon.
+!system 513 Select Materials to overlay.
+!system 514 Select a face-up card on the field.
+!system 515 Select a face-down card on the field.
+!system 516 Select an Attack Position monster.
+!system 517 Select a Defense Position monster.
+!system 518 Select a card to equip.
+!system 519 Select a Xyz Material to detach.
+!system 520 Select the monster whose control will be changed.
+!system 521 Select a card to destroy instead.
+!system 522 Select a face-up Attack Position monster.
+!system 523 Select a face-up Defense Position monster.
+!system 524 Select a face-down Attack Position monster.
+!system 525 Select a face-down Defense Position monster.
 !system 526 Reveal a card
-!system 527 Select the card to place on the field
-!system 528 Select a monster to change
-!system 529 Select your card
-!system 530 Select opponent card
-!system 531 Select monsters for Tribute Summon
-!system 532 Select monster to remove Xyz material
-!system 533 Select materials for Link Summon
-!system 534 Select a card to keep on field
-!system 549 Select target of the attack
-!system 550 Select the effect to activate
-!system 551 Select target of the effect
-!system 552 Select head or tails
+!system 527 Select the card to place on the field.
+!system 528 Select a monster to change its Battle Position.
+!system 529 Select card(s) you possess.
+!system 530 Select card(s) your opponent's possess.
+!system 531 Select monster(s) to Tribute for this Tribute Summon.
+!system 532 Select monster to detach Xyz Material(s)
+!system 533 Select Material(s) for this Link Summon.
+!system 534 Select a card to keep on field.
+!system 549 Select a monster to target for this attack.
+!system 550 Select an effect to activate.
+!system 551 Select a card as target to activate this effect.
+!system 552 Call Heads or Tails.
 !system 553 Select dice results
-!system 554 Select a category
-!system 555 Select an option
-!system 556 Select an effect to activate or resolve
+!system 554 Select Type.
+!system 555 Select an option.
+!system 556 Select an effect to activate or resolve.
 !system 560 Select
-!system 561 Select battle position
-!system 562 Select Attribute
-!system 563 Declare a type
-!system 564 Declare a card name
-!system 565 Select a number
-!system 566 Select effect to activate
-!system 567 Select a Level/Rank
-!system 568 Select a card to resolve
-!system 569 Select the zone of [%ls]
-!system 570 Select the zone that cannot be used
-!system 571 Select the zone to move to
-!system 572 Select a card to place counter
-!system 573 Select a card to negate
-!system 574 Select a card for operation
+!system 561 Select a Battle Position.
+!system 562 Select an Attribute.
+!system 563 Declare a Monster Type.
+!system 564 Declare a card name.
+!system 565 Select a number.
+!system 566 Select an effect to activate.
+!system 567 Select a Level/Rank.
+!system 568 Select a card to resolve.
+!system 569 Select a zone to place [%ls] in.
+!system 570 Which zone cannot be used?
+!system 571 Which zone will you move the card to?
+!system 572 On which card(s) will you place a Counter(s)?
+!system 573 Select a card to negate.
+!system 574 Select a card as target for this effect.
 !system 1000 Deck
 !system 1001 Hand
 !system 1002 Monster Zone
@@ -503,9 +503,9 @@
 !system 1510 Your choice: [%ls]
 !system 1511 Player declared: [%ls]
 !system 1512 Choice of player: [%d]
-!system 1600 Card position changed
+!system 1600 Card's position changed
 !system 1601 Set a card
-!system 1602 Change a card
+!system 1602 Possession of a card changed.
 !system 1603 [%ls]Normal Summon...
 !system 1604 Normal Summon success
 !system 1605 [%ls]Special Summon...
@@ -641,7 +641,8 @@
 !counter 0x5a Counter(War Rock Ordeal)
 !counter 0x5b Counter(Ursarctic Big Dipper)
 !counter 0x105c Burning Counter
-!counter 0x5d Counter(Suship Galley "Kaisen")
+!counter 0x5d Counter(Gizmek Myth)
+!counter 0x5e Emperor's Key Counter
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -1103,3 +1104,5 @@
 !setname 0x166 Suship
 !setname 0x1167 Mystical Beast of the Forest
 !setname 0x2167 Mystical Spirit of the Forest
+!setname 0x168 Kragen
+!setname 0x169 Numeronius

locales/zh-CN/strings.conf

@@ -639,6 +639,7 @@
 !counter 0x5b 指示物（北极天熊北斗星）
 !counter 0x105c 燃烧指示物
 !counter 0x5d 指示物（机巧传-神使记纪图）
+!counter 0x5e 皇之键指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1107,3 +1108,5 @@
 !setname 0x166 军贯	軍貫
 !setname 0x1167 森之圣兽	森の聖獣
 !setname 0x2167 森之圣灵	森の聖霊
+!setname 0x168 隐形水母怪	ステルス・クラーゲン
+!setname 0x169 原数天灵	ヌメロニアス