Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands
Proposed by
GunChleoc
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 7523 | ||||||||||||||||||||
Proposed branch: | lp:~widelands-dev/widelands/string-fixes | ||||||||||||||||||||
Merge into: | lp:widelands | ||||||||||||||||||||
Diff against target: |
285 lines (+53/-32) 12 files modified
campaigns/tutorial04_economy.wmf/scripting/texts.lua (+3/-3) maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua (+1/-1) src/editor/map_generator.cc (+1/-1) src/editor/ui_menus/editor_player_menu.cc (+29/-17) src/editor/ui_menus/editor_player_menu.h (+9/-1) src/logic/productionsite.cc (+1/-1) src/logic/ship.cc (+1/-1) src/ui_fsmenu/loadgame.cc (+3/-3) src/ui_fsmenu/options.cc (+2/-2) src/wui/building_statistics_menu.cc (+1/-0) tribes/atlanteans/horsebreeder/conf (+1/-1) utils/lua_xgettext.py (+1/-1) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/string-fixes | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Review via email: mp+270159@code.launchpad.net |
Description of the change
1. Made some untranslatable strings localizable.
2. Fixed xgettext for Lua. Comments in .pot files need to be introduced by "#." rather than "#:" - "#:" is for occurrences.
3. Small string fixes for Tutorial 4 and ships.
To post a comment you must log in.