Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bloated comments from translation files, part 2 #75253

Merged
merged 1 commit into from
Jul 28, 2024

Conversation

Uwuewsky
Copy link
Contributor

Summary

None

Purpose of change

Another cleanup of bloated comments, possibly the last one.

Details

#. ~ Monster attack "feral_weapon_pipe" message
#. ~ Monster attack "feral_weapon_crowbar" message
#. ~ Monster attack "feral_weapon_PR24" message
#. ~ Monster attack "feral_weapon_stick" message
#. ~ Monster attack "feral_weapon_axe" message
#. ~ Monster attack "feral_weapon_shotgun_melee" message
#. ~ Monster attack "feral_weapon_broom" message
#. ~ Monster attack "feral_weapon_knife_chef" message
#. ~ Monster attack "feral_weapon_candlestick" message
#. ~ Monster attack "feral_weapon_rapier" message
#. ~ Monster attack "feral_weapon_rapier_fake" message
#. ~ Monster attack "feral_weapon_battleaxe" message
#. ~ Monster attack "feral_weapon_mace" message
#. ~ Monster attack "feral_weapon_wrench_large" message
#. ~ Monster attack "feral_weapon_lug_wrench" message
#. ~ Monster attack "feral_weapon_mop_folded" message
#. ~ Monster attack "feral_weapon_crash_axe" message
#. ~ Monster attack "feral_weapon_knife_combat" message
#. ~ Monster attack "feral_weapon_knife_combat_low_skill" message
#. ~ Monster attack "feral_weapon_hammer" message
#. ~ Monster attack "feral_weapon_shovel" message
#. ~ Monster attack "feral_weapon_makeshift_machete" message
#. ~ Monster attack "feral_weapon_scalpel" message
#. ~ Monster attack "feral_weapon_feral_m9" message
#. ~ Monster attack "feral_weapon_heavy_flashlight" message
#. ~ Monster attack "feral_weapon_m18" message
#. ~ Monster attack "feral_weapon_feral_militia_gun" message
#. ~ Monster attack "feral_weapon_baton-extended" message
#. ~ Monster attack "feral_weapon_mace_pipe" message
#. ~ Monster attack "party_rocker_pipe" message
#. ~ Monster attack "party_rocker_bottle" message
#. ~ Monster attack "goblin_cudgel_attack" message
#. ~ Monster attack "goblin_boss_attack" message
#. ~ Monster attack "bugbear_combat_machete" message
#. ~ Monster attack "bugbear_combat_machete_rapid_strike" message
#. ~ Monster attack "bugbear_stalker_attack" message
#. ~ Monster attack "ogre_weapon_club" message
#. ~ Monster attack "orc_combat_machete" message
#. ~ Monster attack "orc_combat_machete_rapid_strike" message
#. ~ Monster attack "orc_blood_pipe_attack" message
#: data/json/monster_special_attacks/feral_weapon_attacks.json
#: data/mods/CrazyCataclysm/crazy_attacks.json
#: data/mods/Magiclysm/monsters/goblin.json
#: data/mods/Magiclysm/monsters/ogre.json
#: data/mods/Magiclysm/monsters/orcs.json
#, c-format
msgid "%1$s tries to hit you, but you dodge!"
msgstr ""

#. ~ Damage adjective of material Aluminum
#. ~ Damage adjective of material Brass
#. ~ Damage adjective of material Bronze
#. ~ Damage adjective of material Thessalonian Bronze
#. ~ Damage adjective of material Budget Steel
#. ~ Damage adjective of material Copper
#. ~ Damage adjective of material Egg
#. ~ Damage adjective of material Gold
#. ~ Damage adjective of material Cast iron
#. ~ Bash damage verb of material Junk Food
#. ~ Bash damage verb of material Bread
#. ~ Damage adjective of material Lead
#. ~ Damage adjective of material Silver
#. ~ Damage adjective of material Platinum
#. ~ Damage adjective of material Low Carbon Steel
#. ~ Damage adjective of material Medium Carbon Steel
#. ~ Damage adjective of material High Carbon Steel
#. ~ Damage adjective of material Case Hardened Carbon Steel
#. ~ Damage adjective of material Tempered Carbon Steel
#. ~ Damage adjective of material Budget Steel Chain
#. ~ Damage adjective of material Low Carbon Steel Chain
#. ~ Damage adjective of material Medium Carbon Steel Chain
#. ~ Damage adjective of material High Carbon Steel Chain
#. ~ Damage adjective of material Case Hardened Carbon Steel Chain
#. ~ Damage adjective of material Tempered Carbon Steel Chain
#. ~ Damage adjective of material Steel
#. ~ Damage adjective of material Energetic Nanocompound
#. ~ Damage adjective of material Uranium cell
#. ~ Damage adjective of material Pressurized Hydrogen
#. ~ Damage adjective of material Superalloy
#. ~ Damage adjective of material Layered Carbide
#. ~ Damage adjective of material Strange Metal
#. ~ Damage adjective of material Tin
#. ~ Bash damage verb of material Processed Food
#. ~ Bash damage verb of material Cheese
#. ~ Bash damage verb of material Ice Cream
#. ~ Damage adjective of material Zinc
#. ~ Damage adjective of material Carbon Lattice
#. ~ Damage adjective of material Titanium
#. ~ Damage adjective of material Vacuum-cast Carbide
#. ~ Damage adjective of material Carbide ThermoWeave(c)
#. ~ Damage adjective of material Orichalcum
#. ~ Damage adjective of material Mithril
#. ~ Damage adjective of material Moon Tears
#. ~ Damage adjective of material Moon Tears Fine Chain
#. ~ Damage adjective of material Dreamdross
#. ~ Damage adjective of material Forged Dreams
#. ~ Damage adjective of material Flesh Roots
#: data/json/materials.json data/mods/Aftershock/items/materials.json
#: data/mods/BlazeIndustries/items/materials.json
#: data/mods/Magiclysm/materials.json data/mods/Xedra_Evolved/material.json
msgid "smashed"
msgstr ""

Describe the solution

Merge comments into a single one for sounds, for damage to materials and for monster attacks.

#. ~ Monster attack message
#: data/json/monster_special_attacks/feral_weapon_attacks.json
#: data/mods/CrazyCataclysm/crazy_attacks.json
#, c-format
msgid "%1$s hits your %2$s with a pipe!"
msgstr ""

#. ~ Bash damage verb of material
#. ~ Cut damage verb of material
#. ~ Damage adjective of material
#: data/json/materials.json data/mods/Magiclysm/materials.json
#: data/mods/MindOverMatter/materials.json
#: data/mods/My_Sweet_Cataclysm/sweet_materials.json
msgid "damaged"
msgstr ""

#. ~ Bashing sound
#. ~ Bashing failed sound
#: data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json
....blah blah blah
msgid "crunch!"
msgstr ""

Describe alternatives you've considered

Testing

Translations are extracted without errors.

Additional context

Some strings are used as verbs and as adjectives. I think it's not enough to just specify the context in the parser, you need to change the material.cpp. Which I don't really want to do, especially considering that adjectives are not used by default.

@github-actions github-actions bot added Translation I18n Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [Python] Code made in Python json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 26, 2024
@Maleclypse Maleclypse merged commit 25c1e3b into CleverRaven:master Jul 28, 2024
19 of 23 checks passed
@Uwuewsky Uwuewsky deleted the remove-comment-po branch September 9, 2024 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. json-styled JSON lint passed, label assigned by github actions Monsters Monsters both friendly and unfriendly. [Python] Code made in Python Translation I18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants