yanwah/cobblemon
1
0
Fork 0
forked from mirrors/cobblemon
Code Pull Requests Activity

Merge branch 'patch-3' into 'main'

Browse Source 
Fix incorrect spelling of "Pokémon" in some translation strings

See merge request cable-mc/cobblemon!2171
This commit is contained in:
Polymeta
2026-03-08 21:35:45 +00:00
parent a921d55812 547ceae9ed
commit f2d2ceb422
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/resources/assets/cobblemon/lang/en_us.json
+4 -4
View File
@@ -97,7 +97,7 @@
"item.cobblemon.npc_editor": "NPC's Trainer Card",
"item.cobblemon.link_cable": "Link Cable",
"item.cobblemon.link_cable.tooltip": "Evolves pokemon that require trading",
"item.cobblemon.link_cable.tooltip": "Evolves Pokémon that require trading",
"item.cobblemon.dragon_scale": "Dragon Scale",
"item.cobblemon.dragon_scale.tooltip": "Evolves Seadra into Kingdra when held while trading",
"item.cobblemon.kings_rock": "Kings Rock",
@@ -423,7 +423,7 @@
"item.cobblemon.razor_fang.tooltip_1": "When the holder successfully inflicts damage, the target may also flinch",
"item.cobblemon.razor_fang.tooltip_2": "Evolves Gligar into Gliscor when held while leveling up during the night",
"item.cobblemon.red_card": "Red Card",
"item.cobblemon.red_card.tooltip_1": "Pokemon that damage the holder are forced to switch out",
"item.cobblemon.red_card.tooltip_1": "Pokémon that damage the holder are forced to switch out",
"item.cobblemon.red_card.tooltip_2": "Consumed after use",
"item.cobblemon.ring_target": "Ring Target",
"item.cobblemon.ring_target.tooltip": "The holder's type immunities are removed",
@@ -489,7 +489,7 @@
"item.cobblemon.white_herb.tooltip_1": "Restores any lowered stat in battle",
"item.cobblemon.white_herb.tooltip_2": "Consumed after use",
"item.cobblemon.bright_powder": "Bright Powder",
"item.cobblemon.bright_powder.tooltip": "Reduces the accuracy of enemy pokemon's moves by 10%",
"item.cobblemon.bright_powder.tooltip": "Reduces the accuracy of enemy Pokémon's moves by 10%",
"item.cobblemon.metal_powder": "Metal Powder",
"item.cobblemon.metal_powder.tooltip": "Raises an untransformed Ditto's Defense and Sp. Def by 50%",
"item.cobblemon.quick_powder": "Quick Powder",
@@ -2604,7 +2604,7 @@
"cobblemon.config.ui.summary_profile_animations.always_animate.tooltip": "Entire party animates unless fainted",
"cobblemon.config.ui.third_person_view_bobbing": "Third Person View Bobbing",
"cobblemon.config.ui.third_person_view_bobbing.tooltip": "If true then use default Minecraft behavior to follow directly behind the player's head. If false then follow a fixed offset from the pokemon.",
"cobblemon.config.ui.third_person_view_bobbing.tooltip": "If true then use default Minecraft behavior to follow directly behind the player's head. If false then follow a fixed offset from the Pokémon.",
"cobblemon.config.ui.invert_pitch": "Invert Pitch",
"cobblemon.config.ui.invert_pitch.tooltip": "Invert the direction for pitch (up and down).",
"cobblemon.config.ui.invert_yaw": "Invert Yaw",