Merge branch 'beta' into Chapybara-jp-patch-1

* [Localization] [DE] DisguiseChange

* Update src/locales/de/pokemon-form-battle.json

src/locales/de/pokemon-form-battle.json

@@ -10,5 +10,5 @@
   "eternamaxChange": "{{preName}} hat sich zu {{pokemonName}} unendynamaximiert!",
   "revertChange": "{{pokemonName}} hat seine ursprüngliche Form zurückerlangt!",
   "formChange": "{{preName}} hat seine Form geändert!",
-  "disguiseChange": "Its disguise served it as a decoy!"
+  "disguiseChange": "Sein Kostüm hat die Attacke absorbiert!"
 }

src/locales/en/achv-female.json

@@ -1,268 +0,0 @@
-{
-  "Achievements": {
-    "name": "Achievements"
-  },
-  "Locked": {
-    "name": "Locked"
-  },
-  "MoneyAchv": {
-    "description": "Accumulate a total of ₽{{moneyAmount}}"
-  },
-  "10K_MONEY": {
-    "name": "Money Haver"
-  },
-  "100K_MONEY": {
-    "name": "Rich"
-  },
-  "1M_MONEY": {
-    "name": "Millionaire"
-  },
-  "10M_MONEY": {
-    "name": "One Percenter"
-  },
-  "DamageAchv": {
-    "description": "Inflict {{damageAmount}} damage in one hit"
-  },
-  "250_DMG": {
-    "name": "Hard Hitter"
-  },
-  "1000_DMG": {
-    "name": "Harder Hitter"
-  },
-  "2500_DMG": {
-    "name": "That's a Lotta Damage!"
-  },
-  "10000_DMG": {
-    "name": "One Punch Man"
-  },
-  "HealAchv": {
-    "description": "Heal {{healAmount}} {{HP}} at once with a move, ability, or held item"
-  },
-  "250_HEAL": {
-    "name": "Novice Healer"
-  },
-  "1000_HEAL": {
-    "name": "Big Healer"
-  },
-  "2500_HEAL": {
-    "name": "Cleric"
-  },
-  "10000_HEAL": {
-    "name": "Recovery Master"
-  },
-  "LevelAchv": {
-    "description": "Level up a Pokémon to Lv{{level}}"
-  },
-  "LV_100": {
-    "name": "But Wait, There's More!"
-  },
-  "LV_250": {
-    "name": "Elite"
-  },
-  "LV_1000": {
-    "name": "To Go Even Further Beyond"
-  },
-  "RibbonAchv": {
-    "description": "Accumulate a total of {{ribbonAmount}} Ribbons"
-  },
-  "10_RIBBONS": {
-    "name": "Pokémon League Champion"
-  },
-  "25_RIBBONS": {
-    "name": "Great League Champion"
-  },
-  "50_RIBBONS": {
-    "name": "Ultra League Champion"
-  },
-  "75_RIBBONS": {
-    "name": "Rogue League Champion"
-  },
-  "100_RIBBONS": {
-    "name": "Master League Champion"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Teamwork",
-    "description": "Baton pass to another party member with at least one stat maxed out"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Friendmaxxing",
-    "description": "Reach max friendship on a Pokémon"
-  },
-  "MEGA_EVOLVE": {
-    "name": "Megamorph",
-    "description": "Mega evolve a Pokémon"
-  },
-  "GIGANTAMAX": {
-    "name": "Absolute Unit",
-    "description": "Gigantamax a Pokémon"
-  },
-  "TERASTALLIZE": {
-    "name": "STAB Enthusiast",
-    "description": "Terastallize a Pokémon"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "The Hidden Type",
-    "description": "Stellar Terastallize a Pokémon"
-  },
-  "SPLICE": {
-    "name": "Infinite Fusion",
-    "description": "Splice two Pokémon together with DNA Splicers"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "A Hole Lot of Items",
-    "description": "Acquire a Mini Black Hole"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Mythical",
-    "description": "Catch a mythical Pokémon"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "(Sub-)Legendary",
-    "description": "Catch a sub-legendary Pokémon"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Legendary",
-    "description": "Catch a legendary Pokémon"
-  },
-  "SEE_SHINY": {
-    "name": "Shiny",
-    "description": "Find a shiny Pokémon in the wild"
-  },
-  "SHINY_PARTY": {
-    "name": "That's Dedication",
-    "description": "Have a full party of shiny Pokémon"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Mythical Egg",
-    "description": "Hatch a mythical Pokémon from an egg"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Sub-Legendary Egg",
-    "description": "Hatch a sub-legendary Pokémon from an egg"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Legendary Egg",
-    "description": "Hatch a legendary Pokémon from an egg"
-  },
-  "HATCH_SHINY": {
-    "name": "Shiny Egg",
-    "description": "Hatch a shiny Pokémon from an egg"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Hidden Potential",
-    "description": "Catch a Pokémon with a hidden ability"
-  },
-  "PERFECT_IVS": {
-    "name": "Certificate of Authenticity",
-    "description": "Get perfect IVs on a Pokémon"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Undefeated",
-    "description": "Beat the game in classic mode"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Bring Your Child To Work Day",
-    "description": "Beat the game in Classic Mode with at least one unevolved party member."
-  },
-  "MONO_GEN_ONE": {
-    "name": "The Original Rival",
-    "description": "Complete the generation one only challenge."
-  },
-  "MONO_GEN_TWO": {
-    "name": "Generation 1.5",
-    "description": "Complete the generation two only challenge."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Too much water?",
-    "description": "Complete the generation three only challenge."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "Is she really the hardest?",
-    "description": "Complete the generation four only challenge."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "All Original",
-    "description": "Complete the generation five only challenge."
-  },
-  "MONO_GEN_SIX": {
-    "name": "Almost Royalty",
-    "description": "Complete the generation six only challenge."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "Only Technically",
-    "description": "Complete the generation seven only challenge."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "A Champion Time!",
-    "description": "Complete the generation eight only challenge."
-  },
-  "MONO_GEN_NINE": {
-    "name": "She was going easy on you",
-    "description": "Complete the generation nine only challenge."
-  },
-  "MonoType": {
-    "description": "Complete the {{type}} monotype challenge."
-  },
-  "MONO_NORMAL": {
-    "name": "Extra Ordinary"
-  },
-  "MONO_FIGHTING": {
-    "name": "I Know Kung Fu"
-  },
-  "MONO_FLYING": {
-    "name": "Angry Birds"
-  },
-  "MONO_POISON": {
-    "name": "Kanto's Favourite"
-  },
-  "MONO_GROUND": {
-    "name": "Forecast: Earthquakes"
-  },
-  "MONO_ROCK": {
-    "name": "Brock Hard"
-  },
-  "MONO_BUG": {
-    "name": "You Like Jazz?"
-  },
-  "MONO_GHOST": {
-    "name": "Who You Gonna Call?"
-  },
-  "MONO_STEEL": {
-    "name": "Iron Giant"
-  },
-  "MONO_FIRE": {
-    "name": "I Cast Fireball!"
-  },
-  "MONO_WATER": {
-    "name": "When It Rains, It Pours"
-  },
-  "MONO_GRASS": {
-    "name": "Can't Touch This"
-  },
-  "MONO_ELECTRIC": {
-    "name": "Aim For The Horn!"
-  },
-  "MONO_PSYCHIC": {
-    "name": "Big Brain Energy"
-  },
-  "MONO_ICE": {
-    "name": "Walking On Thin Ice"
-  },
-  "MONO_DRAGON": {
-    "name": "Pseudo-Legend Club"
-  },
-  "MONO_DARK": {
-    "name": "It's Just A Phase"
-  },
-  "MONO_FAIRY": {
-    "name": "Hey! Listen!"
-  },
-  "FRESH_START": {
-    "name": "First Try!",
-    "description": "Complete the Fresh Start challenge."
-  },
-  "INVERSE_BATTLE": {
-    "name": "Mirror rorriM",
-    "description": "Complete the Inverse Battle challenge.\n.egnellahc elttaB esrevnI eht etelpmoC"
-  }
-}

src/locales/ja/trainer-classes.json

@@ -16,7 +16,7 @@
   "black_belt": "カラテ王",
   "breeder": "ポケモンブリーダー",
   "breeder_female": "ポケモンブリーダー",
-  "breeders": "ポケモンブリーダー",
+  "breeders": "ブリーダーコンビ",
   "clerk": "ビジネスマン",
   "clerk_female": "ＯＬ",
   "colleagues": "ビジネスパートナー",
@@ -72,9 +72,9 @@
   "rich_female": "お金持ち",
   "rich_boy": "お坊っちゃま",
   "rich_couple": "お二人さま",
-  "rich_kid": "ブルジョワの男子",
+  "rich_kid": "ブルジョワ男子",
-  "rich_kid_female": "ブルジョワの女子",
+  "rich_kid_female": "ブルジョワ女子",
-  "rich_kids": "ブルジョワの子達",
+  "rich_kids": "ブルジョワ子達",
   "roughneck": "スキンヘッズ",
   "sailor": "船乗り",
   "scientist": "研究員",
@@ -84,8 +84,8 @@
   "snow_worker": "冷凍作業員",
   "snow_worker_female": "冷凍作業員",
   "striker": "サッカー選手",
-  "school_kid": "塾がえり",
+  "school_kid": "塾帰り",
-  "school_kid_female": "塾がえり",
+  "school_kid_female": "塾帰り",
   "school_kids": "塾生たち",
   "swimmer": "海パンやろう",
   "swimmer_female": "ビキニのおねえさん",

src/locales/ja/trainer-names.json

@@ -1 +1,164 @@
-{}
+{
+  "brock": "タケシ",
+  "misty": "カスミ",
+  "lt_surge": "マチス",
+  "erika": "エリカ",
+  "janine": "アンズ",
+  "sabrina": "ナツメ",
+  "blaine": "カツラ",
+  "giovanni": "サカキ",
+  "falkner": "ハヤト",
+  "bugsy": "ツクシ",
+  "whitney": "アカネ",
+  "morty": "マツバ",
+  "chuck": "シジマ",
+  "jasmine": "ミカン",
+  "pryce": "ヤナギ",
+  "clair": "イブキ",
+  "roxanne": "ツツジ",
+  "brawly": "トウキ",
+  "wattson": "テッセン",
+  "flannery": "アスナ",
+  "norman": "センリ",
+  "winona": "ナギ",
+  "tate": "フウ",
+  "liza": "ラン",
+  "juan": "アダン",
+  "roark": "ヒョウタ",
+  "gardenia": "ナタネ",
+  "maylene": "スモモ",
+  "crasher_wake": "マキシ",
+  "fantina": "メリッサ",
+  "byron": "トウガン",
+  "candice": "スズナ",
+  "volkner": "デンジ",
+  "cilan": "デント",
+  "chili": "ポッド",
+  "cress": "コーン",
+  "cheren": "チェレン",
+  "lenora": "アロエ",
+  "roxie": "ホミカ",
+  "burgh": "アーティ",
+  "elesa": "カミツレ",
+  "clay": "ヤーコン",
+  "skyla": "フウロ",
+  "brycen": "ハチク",
+  "drayden": "シャガ",
+  "marlon": "シズイ",
+  "viola": "ビオラ",
+  "grant": "ザクロ",
+  "korrina": "コルニ",
+  "ramos": "フクジ",
+  "clemont": "シトロン",
+  "valerie": "マーシュ",
+  "olympia": "ゴジカ",
+  "wulfric": "ウルップ",
+  "milo": "ヤロー",
+  "nessa": "ルリナ",
+  "kabu": "カブ",
+  "bea": "サイトウ",
+  "allister": "オニオン",
+  "opal": "ポプラ",
+  "bede": "ビート",
+  "gordie": "マクワ",
+  "melony": "メロン",
+  "piers": "ネズ",
+  "marnie": "マリィ",
+  "raihan": "キバナ",
+  "katy": "カエデ",
+  "brassius": "コルサ",
+  "iono": " ナンジャモ",
+  "kofu": "ハイダイ",
+  "larry": "アオキ",
+  "ryme": "ライム",
+  "tulip": "リップ",
+  "grusha": "グルーシャ",
+  "lorelei": "カンナ",
+  "bruno": "シバ",
+  "agatha": "キクコ",
+  "lance": "ワタル",
+  "will": "イツキ",
+  "koga": "キョウ",
+  "karen": "カリン",
+  "sidney": "カゲツ",
+  "phoebe": "フヨウ",
+  "glacia": "プリム",
+  "drake": "ゲンジ",
+  "aaron": "リョウ",
+  "bertha": "キクノ",
+  "flint": "オーバ",
+  "lucian": "ゴヨウ",
+  "shauntal": "シキミ",
+  "marshal": "レンブ",
+  "grimsley": "ギーマ",
+  "caitlin": "カトレア",
+  "malva": "パキラ",
+  "siebold": "ズミ",
+  "wikstrom": "ガンピ",
+  "drasna": "ドラセナ",
+  "hala": "ハラ",
+  "molayne": "マーレイン",
+  "olivia": "ライチ",
+  "acerola": "アセロラ",
+  "kahili": "カヒリ",
+  "rika": "チリ",
+  "poppy": "ポピー",
+  "hassel": "ハッサク",
+  "crispin": "アカマツ",
+  "amarys": "ネリネ",
+  "lacey": "タロ",
+  "drayton": "カキツバタ",
+  "blue": "グリーン",
+  "red": "レッド",
+  "steven": "ダイゴ",
+  "wallace": "ミクリ",
+  "cynthia": "シロナ",
+  "alder": "アデク",
+  "iris": "アイリス",
+  "diantha": "カルネ",
+  "hau": "ハウ",
+  "geeta": "オモダカ",
+  "nemona": "ネモ",
+  "kieran": "スグリ",
+  "leon": "ダンデ",
+  "rival": "フィン",
+  "rival_female": "アイヴィー",
+  "archer": "アポロ",
+  "ariana": "アテナ",
+  "proton": "ランス",
+  "petrel": "ラムダ",
+  "tabitha": "ホムラ",
+  "courtney": "カガリ",
+  "shelly": "イズミ",
+  "matt": "ウシオ",
+  "mars": "マーズ",
+  "jupiter": "ジュピター",
+  "saturn": "サターン",
+  "zinzolin": "ヴィオ",
+  "rood": "ロット",
+  "xerosic": "クセロシキ",
+  "bryony": "バラ",
+  "faba": "ザオボー",
+  "plumeria": "プルメリ",
+  "oleana": "オリーヴ",
+
+  "maxie": "マツブサ",
+  "archie": "アオギリ",
+  "cyrus": "アカギ",
+  "ghetsis": "ゲーチス",
+  "lysandre": "フラダリ",
+  "lusamine": "ルザミーネ",
+  "guzma": "グズマ",
+  "rose": "ローズ",
+
+  "blue_red_double": "グリーンとレッド",
+  "red_blue_double": "レッドとグリーン",
+  "tate_liza_double": "フウとラン",
+  "liza_tate_double": "ランとフウ",
+  "steven_wallace_double": "ダイゴとミクリ",
+  "wallace_steven_double": "ミクリとダイゴ",
+  "alder_iris_double": "アデクとアイリス",
+  "iris_alder_double": "アイリスとアデク",
+  "marnie_piers_double": "マリィとネズ",
+  "piers_marnie_double": "ネズとマリィ"
+}

src/locales/ja/trainer-titles.json

@@ -1 +1,38 @@
-{}
+{
+  "elite_four": "四天王",
+  "elite_four_female": "四天王",
+  "gym_leader": "ジムリーダー",
+  "gym_leader_female": "ジムリーダー",
+  "gym_leader_double": "ジムリーダーコンビ",
+  "champion": "チャンピオン",
+  "champion_female": "チャンピオン",
+  "champion_double": "チャンピオンコンビ",
+  "rival": "ライバル",
+  "professor": "ポケモン博士",
+  "frontier_brain": "フロンティアブレーン",
+  "rocket_boss": "ロケット団ボス",
+  "magma_boss": "マグマ団リーダー",
+  "aqua_boss": "アクア団リーダー",
+  "galactic_boss": "ギンガ団ボス",
+  "plasma_boss": "プラズマ団ボス",
+  "flare_boss": "フレア団ボス",
+  "aether_boss": "エーテル代表",
+  "skull_boss": "スカル団ボス",
+  "macro_boss": "マクロコスモス社長",
+
+  "rocket_admin": "ロケット団幹部",
+  "rocket_admin_female": "ロケット団幹部",
+  "magma_admin": "マグマ団幹部",
+  "magma_admin_female": "マグマロケット団幹部",
+  "aqua_admin": "アクア団幹部",
+  "aqua_admin_female": "アクア団幹部",
+  "galactic_commander": "ギンガ団幹部",
+  "galactic_commander_female": "ギンガ団幹部",
+  "plasma_sage": "プラズマ団賢人",
+  "plasma_admin": "プラズマ団賢人",
+  "flare_admin": "フレア団幹部",
+  "flare_admin_female": "フレア団幹部",
+  "aether_admin": "エーテル支部長",
+  "skull_admin": "スカル団幹部",
+  "macro_admin": "マクロコスモス"
+}