Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands
Proposed by
GunChleoc
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 8683 | ||||||||||||||||||||
Proposed branch: | lp:~widelands-dev/widelands/string-fixes | ||||||||||||||||||||
Merge into: | lp:widelands | ||||||||||||||||||||
Diff against target: |
291 lines (+40/-34) 17 files modified
data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua (+2/-2) data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua (+8/-5) data/tribes/buildings/productionsites/frisians/reed_farm/init.lua (+1/-1) data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua (+7/-4) data/tribes/buildings/productionsites/frisians/tavern/helptexts.lua (+1/-1) data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua (+1/-1) data/tribes/immovables/berry_bushes/strawberry/init.lua (+4/-4) data/tribes/wares/fur/helptexts.lua (+1/-1) data/tribes/wares/granite/helptexts.lua (+1/-1) data/tribes/wares/kitchen_tools/helptexts.lua (+5/-5) data/tribes/wares/ration/helptexts.lua (+1/-1) data/tribes/wares/shovel/helptexts.lua (+1/-1) data/tribes/wares/smoked_fish/helptexts.lua (+1/-1) data/tribes/wares/smoked_meat/helptexts.lua (+1/-1) data/tribes/workers/barbarians/baker/helptexts.lua (+1/-1) data/tribes/workers/frisians/landlady/helptexts.lua (+1/-1) data/txts/developers.json (+3/-3) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/string-fixes | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hessenfarmer | Approve | ||
Review via email: mp+345000@code.launchpad.net |
Commit message
Various string fixes for tribes
To post a comment you must log in.
1. see inline comment
2. I did a spotcheck of the helptexts and found multiple issues with the # sign in TRANSLATORS remarks not correctly implemented. Just checked a couple of frisian buildings where the ' is used in defined performance helptexts and not used in other buildings where undefined messages are in place. Found issues in the barbarians helptexts as well