Merge lp://staging/~widelands-dev/widelands/gci18nfixes into lp://staging/widelands
Proposed by
SirVer
Status: | Rejected |
---|---|
Rejected by: | SirVer |
Proposed branch: | lp://staging/~widelands-dev/widelands/gci18nfixes |
Merge into: | lp://staging/widelands |
Diff against target: |
87867 lines (+4315/-38793) 528 files modified
CMakeLists.txt (+1/-1) CREDITS (+1/-1) campaigns/atl01.wmf/elemental (+1/-1) campaigns/atl01.wmf/scripting/texts.lua (+380/-400) campaigns/cconfig (+12/-12) campaigns/emp01.wmf/elemental (+2/-2) campaigns/emp01.wmf/scripting/texts.lua (+168/-117) campaigns/emp02.wmf/elemental (+2/-2) campaigns/emp02.wmf/scripting/texts.lua (+161/-118) campaigns/t01.wmf/elemental (+2/-2) campaigns/t01.wmf/scripting/init.lua (+5/-1) campaigns/t01.wmf/scripting/initial_messages.lua (+20/-15) campaigns/t01.wmf/scripting/khantrukhs_talking.lua (+13/-11) campaigns/t01.wmf/scripting/texts.lua (+146/-110) campaigns/t02.wmf/elemental (+2/-2) campaigns/t02.wmf/scripting/mission_thread_texts.lua (+247/-268) campaigns/t03.wmf/elemental (+1/-1) campaigns/t03.wmf/scripting/texts.lua (+257/-230) campaigns/tutorial01.wmf/elemental (+2/-2) campaigns/tutorial01.wmf/scripting/texts.lua (+404/-436) global/militarysites/barracks.empire/conf (+6/-0) global/militarysites/barrier.barbarians/conf (+6/-0) global/militarysites/barrier.empire/conf (+6/-0) global/militarysites/castle.atlanteans/conf (+6/-0) global/militarysites/castle.empire/conf (+6/-0) global/militarysites/citadel.barbarians/conf (+6/-0) global/militarysites/donjon.barbarians/conf (+6/-0) global/militarysites/fortress.barbarians/conf (+6/-0) global/militarysites/fortress.empire/conf (+6/-0) global/militarysites/guardhall.atlanteans/conf (+6/-0) global/militarysites/guardhouse.atlanteans/conf (+6/-0) global/militarysites/high_tower.atlanteans/conf (+6/-0) global/militarysites/outpost.empire/conf (+6/-0) global/militarysites/sentry.barbarians/conf (+6/-0) global/militarysites/sentry.empire/conf (+6/-0) global/militarysites/small_tower.atlanteans/conf (+6/-0) global/militarysites/stronghold.barbarians/conf (+6/-0) global/militarysites/tower.atlanteans/conf (+6/-0) global/militarysites/tower.empire/conf (+6/-0) maps/Atoll.wmf/elemental (+2/-2) maps/Calvisson.wmf/elemental (+2/-2) maps/Checkmate.wmf/elemental (+1/-1) maps/Comet Island.wmf/elemental (+1/-1) maps/Crossing the horizon.wmf/elemental (+1/-1) maps/Desert Tournament.wmf/elemental (+2/-2) maps/Dry Riverbed.wmf/elemental (+1/-1) maps/Elven Forests.wmf/elemental (+2/-2) maps/Fellowships.wmf/elemental (+2/-2) maps/Finlakes.wmf/elemental (+1/-1) maps/Firegames.wmf/elemental (+1/-1) maps/Four Castles.wmf/elemental (+1/-1) maps/Four Mountains.wmf/elemental (+1/-1) maps/Glacier Lake.wmf/elemental (+1/-1) maps/Ice wars.wmf/elemental (+1/-1) maps/Islands at war.wmf/elemental (+2/-2) maps/Kings and Queens.wmf/elemental (+1/-1) maps/Lake of tranquility.wmf/elemental (+1/-1) maps/Last Bastion.wmf/elemental (+1/-1) maps/Long, long way.wmf/elemental (+2/-2) maps/MP Scenarios/Island Hopping.wmf/elemental (+1/-1) maps/MP Scenarios/Island Hopping.wmf/scripting/first_island.lua (+4/-4) maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua (+31/-1) maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua (+31/-24) maps/MP Scenarios/Smugglers.wmf/elemental (+1/-1) maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua (+2/-3) maps/MP Scenarios/Smugglers.wmf/scripting/smuggling.lua (+10/-8) maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua (+38/-33) maps/Mystical Maze.wmf/elemental (+1/-1) maps/Plateau.wmf/elemental (+2/-2) maps/Plateau.wmf/scripting/texts.lua (+39/-42) maps/Rendez-Vous.wmf/elemental (+1/-1) maps/River Explorers.wmf/elemental (+1/-1) maps/Sun of fire.wmf/elemental (+2/-2) maps/Swamp Island.wmf/elemental (+1/-1) maps/Swamp Monks.wmf/elemental (+2/-2) maps/The Nile.wmf/elemental (+2/-2) maps/The Oasis Triangle.wmf/elemental (+1/-1) maps/The Thaw.wmf/elemental (+1/-1) maps/The big lake.wmf/elemental (+2/-2) maps/The long way.wmf/elemental (+2/-2) maps/The pass through the mountains.wmf/elemental (+2/-2) maps/Together we're strong.wmf/elemental (+2/-2) maps/Trident of Fire.wmf/elemental (+2/-2) maps/Twin Lagoons.wmf/elemental (+1/-1) maps/Two frontiers.wmf/elemental (+1/-1) maps/Volcanic Winter.wmf/elemental (+1/-1) maps/War of the Valleys.wmf/elemental (+1/-1) maps/Wisent Valley.wmf/elemental (+1/-1) po/map_plateau.wmf/en_CA.po (+0/-184) po/maps/en_CA.po (+0/-792) po/mp_scenario_island_hopping.wmf/ar.po (+0/-164) po/mp_scenario_smugglers.wmf/ar.po (+0/-132) po/mp_scenario_smugglers.wmf/fi.po (+0/-125) po/mp_scenario_together_we_re_strong.wmf/ar.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/ca.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/cs.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/de.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/en_GB.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/eo.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/es.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/eu.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/fi.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/fr.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/gd.po (+0/-47) po/mp_scenario_together_we_re_strong.wmf/hr.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/hu.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/it.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/ja.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/la.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/mp_scenario_together_we_re_strong.wmf.pot (+0/-46) po/mp_scenario_together_we_re_strong.wmf/nb.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/nl.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/oc.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/pl.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/pt.po (+0/-74) po/mp_scenario_together_we_re_strong.wmf/pt_BR.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/ru.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/sk.po (+0/-43) po/mp_scenario_together_we_re_strong.wmf/sv.po (+0/-45) po/mp_scenario_together_we_re_strong.wmf/tr.po (+0/-44) po/mp_scenario_together_we_re_strong.wmf/zh_TW.po (+0/-43) po/texts/en_CA.po (+0/-968) po/widelands/en_CA.po (+0/-4978) scripting/format_help.lua (+24/-0) scripting/format_scenario.lua (+85/-0) scripting/formatting.lua (+0/-53) scripting/lunit.lua (+52/-0) scripting/win_condition_texts.lua (+1/-32) scripting/win_conditions/02_collectors.lua (+13/-9) scripting/win_conditions/03_territorial_lord.lua (+14/-7) scripting/win_conditions/03_territorial_time.lua (+47/-21) scripting/win_conditions/04_wood_gnome.lua (+15/-9) src/editor/editorinteractive.cc (+4/-4) src/editor/tools/editor_info_tool.cc (+3/-3) src/editor/ui_menus/editor_main_menu_save_map.cc (+6/-6) src/editor/ui_menus/editor_player_menu.cc (+2/-2) src/editor/ui_menus/editor_tool_change_height_options_menu.cc (+1/-1) src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+1/-1) src/editor/ui_menus/editor_toolsize_menu.cc (+1/-1) src/game_io/game_player_economies_data_packet.cc (+1/-1) src/game_io/game_player_info_data_packet.cc (+7/-7) src/graphic/animation.cc (+1/-1) src/logic/battle.cc (+1/-1) src/logic/bill_of_materials.h (+0/-50) src/logic/building.cc (+1/-1) src/logic/cmd_queue.cc (+1/-1) src/logic/game.cc (+2/-2) src/logic/immovable.cc (+12/-16) src/logic/instances.cc (+1/-1) src/logic/military_data.cc (+4/-4) src/logic/militarysite.cc (+8/-2) src/logic/playercommand.cc (+1/-1) src/logic/production_program.cc (+124/-97) src/logic/requirements.cc (+2/-2) src/logic/ship.cc (+5/-5) src/logic/soldier.cc (+4/-4) src/logic/tribe.cc (+1/-1) src/logic/ware_descr.cc (+0/-58) src/logic/ware_descr.h (+0/-98) src/logic/worker.cc (+6/-8) src/logic/worker_program.cc (+2/-2) src/logic/world.cc (+1/-1) src/map_io/widelands_map_buildingdata_data_packet.cc (+6/-6) src/map_io/widelands_map_flag_data_packet.cc (+1/-1) src/map_io/widelands_map_flagdata_data_packet.cc (+5/-5) src/map_io/widelands_map_loader.cc (+1/-1) src/map_io/widelands_map_objective_data_packet.cc (+1/-1) src/map_io/widelands_map_player_position_data_packet.cc (+1/-1) src/map_io/widelands_map_players_messages_data_packet.cc (+11/-11) src/map_io/widelands_map_roaddata_data_packet.cc (+1/-1) src/map_io/widelands_map_ware_data_packet.cc (+1/-1) src/map_io/widelands_map_waredata_data_packet.cc (+2/-2) src/network/internet_gaming.cc (+13/-4) src/network/internet_gaming_messages.cc (+6/-6) src/network/nethost.cc (+14/-9) src/network/network_gaming_messages.cc (+14/-13) src/s2map.cc (+8/-6) src/scripting/eris.h (+0/-29) src/scripting/eris/README.eris (+0/-11) src/scripting/eris/eris.c (+0/-2658) src/scripting/eris/eris.h (+0/-148) src/scripting/eris/lapi.c (+0/-1284) src/scripting/eris/lapi.h (+0/-24) src/scripting/eris/lauxlib.c (+0/-959) src/scripting/eris/lauxlib.h (+0/-212) src/scripting/eris/lbaselib.c (+0/-494) src/scripting/eris/lbitlib.c (+0/-212) src/scripting/eris/lcode.c (+0/-881) src/scripting/eris/lcode.h (+0/-83) src/scripting/eris/lcorolib.c (+0/-171) src/scripting/eris/lctype.c (+0/-52) src/scripting/eris/lctype.h (+0/-95) src/scripting/eris/ldblib.c (+0/-398) src/scripting/eris/ldebug.c (+0/-593) src/scripting/eris/ldebug.h (+0/-34) src/scripting/eris/ldo.c (+0/-681) src/scripting/eris/ldo.h (+0/-46) src/scripting/eris/ldump.c (+0/-173) src/scripting/eris/lfunc.c (+0/-161) src/scripting/eris/lfunc.h (+0/-33) src/scripting/eris/lgc.c (+0/-1220) src/scripting/eris/lgc.h (+0/-157) src/scripting/eris/linit.c (+0/-68) src/scripting/eris/liolib.c (+0/-682) src/scripting/eris/llex.c (+0/-530) src/scripting/eris/llex.h (+0/-78) src/scripting/eris/llimits.h (+0/-309) src/scripting/eris/lmathlib.c (+0/-279) src/scripting/eris/lmem.c (+0/-99) src/scripting/eris/lmem.h (+0/-57) src/scripting/eris/loadlib.c (+0/-759) src/scripting/eris/lobject.c (+0/-287) src/scripting/eris/lobject.h (+0/-607) src/scripting/eris/lopcodes.c (+0/-107) src/scripting/eris/lopcodes.h (+0/-288) src/scripting/eris/loslib.c (+0/-323) src/scripting/eris/lparser.c (+0/-1638) src/scripting/eris/lparser.h (+0/-119) src/scripting/eris/lstate.c (+0/-323) src/scripting/eris/lstate.h (+0/-228) src/scripting/eris/lstring.c (+0/-185) src/scripting/eris/lstring.h (+0/-46) src/scripting/eris/lstrlib.c (+0/-1035) src/scripting/eris/ltable.c (+0/-588) src/scripting/eris/ltable.h (+0/-45) src/scripting/eris/ltablib.c (+0/-283) src/scripting/eris/ltm.c (+0/-77) src/scripting/eris/ltm.h (+0/-57) src/scripting/eris/lua.c (+0/-497) src/scripting/eris/lua.h (+0/-444) src/scripting/eris/lua.hpp (+0/-9) src/scripting/eris/luac.c (+0/-432) src/scripting/eris/luaconf.h (+0/-551) src/scripting/eris/lualib.h (+0/-58) src/scripting/eris/lundump.c (+0/-258) src/scripting/eris/lundump.h (+0/-28) src/scripting/eris/lvm.c (+0/-867) src/scripting/eris/lvm.h (+0/-44) src/scripting/eris/lzio.c (+0/-76) src/scripting/eris/lzio.h (+0/-65) src/scripting/lua_globals.cc (+105/-2) src/scripting/lua_map.cc (+4/-0) src/scripting/luna_impl.h (+1/-1) src/scripting/persistence.cc (+1/-1) src/scripting/persistence.h (+1/-1) src/scripting/test/test_luna.cc (+1/-1) src/ui_basic/messagebox.cc (+4/-4) src/ui_fsmenu/campaign_select.cc (+4/-13) src/ui_fsmenu/campaign_select.h (+1/-1) src/ui_fsmenu/internet_lobby.cc (+2/-2) src/ui_fsmenu/launchMPG.cc (+40/-37) src/ui_fsmenu/launchSPG.cc (+19/-17) src/ui_fsmenu/loadgame.cc (+3/-1) src/ui_fsmenu/loadreplay.cc (+3/-1) src/ui_fsmenu/main.cc (+1/-1) src/ui_fsmenu/mapselect.cc (+2/-2) src/ui_fsmenu/options.cc (+11/-10) src/wlapplication.cc (+84/-103) src/wlapplication.h (+5/-0) src/wui/building_statistics_menu.cc (+9/-9) src/wui/buildingwindow.cc (+3/-3) src/wui/encyclopedia_window.cc (+6/-10) src/wui/fieldaction.cc (+6/-6) src/wui/game_debug_ui.cc (+1/-1) src/wui/game_main_menu_save_game.cc (+3/-6) src/wui/game_message_menu.cc (+12/-12) src/wui/game_options_menu.cc (+1/-2) src/wui/interactive_base.cc (+2/-2) src/wui/interactive_player.cc (+2/-2) src/wui/login_box.cc (+3/-3) src/wui/login_box.h (+2/-1) src/wui/multiplayersetupgroup.cc (+4/-5) src/wui/playerdescrgroup.cc (+8/-8) src/wui/productionsitewindow.cc (+6/-4) src/wui/shipwindow.cc (+2/-2) src/wui/soldierlist.cc (+2/-2) src/wui/story_message_box.cc (+1/-1) src/wui/watchwindow.cc (+1/-1) test/maps/expedition.wmf/scripting/init.lua (+6/-6) test/maps/expedition.wmf/scripting/test_cancel_started_expedition_on_ship_one_ship.lua (+0/-5) test/maps/expedition.wmf/scripting/test_cancel_started_expedition_on_ship_two_ships.lua (+0/-5) test/maps/expedition.wmf/scripting/test_cancel_started_expedition_underway_one_ship.lua (+0/-5) test/maps/expedition.wmf/scripting/test_cancel_started_expedition_underway_two_ships.lua (+0/-5) test/maps/expedition.wmf/scripting/test_cancel_when_port_space_was_reached_one_ship.lua (+0/-5) test/maps/expedition.wmf/scripting/test_cancel_when_port_space_was_reached_two_ships.lua (+0/-5) test/maps/expedition.wmf/scripting/test_check_transportation_works_one_ship.lua (+0/-5) test/maps/expedition.wmf/scripting/test_check_transportation_works_two_ships.lua (+0/-5) test/maps/expedition.wmf/scripting/test_starting_and_immediately_canceling.lua (+0/-15) test/maps/expedition.wmf/scripting/test_starting_wait_a_while_cancel.lua (+0/-18) test/maps/lua_persistence.wmf/scripting/test_persistence.lua (+0/-136) test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua (+0/-205) test/maps/lua_testsuite.wmf/scripting/cfield.lua (+0/-352) test/maps/lua_testsuite.wmf/scripting/constructionsite.lua (+0/-47) test/maps/lua_testsuite.wmf/scripting/cplayer.lua (+0/-195) test/maps/lua_testsuite.wmf/scripting/cplr_access.lua (+0/-13) test/maps/lua_testsuite.wmf/scripting/editor.lua (+0/-13) test/maps/lua_testsuite.wmf/scripting/editor_test_lua_in_editor.lua (+0/-1) test/maps/lua_testsuite.wmf/scripting/efield.lua (+0/-15) test/maps/lua_testsuite.wmf/scripting/egbase.lua (+0/-15) test/maps/lua_testsuite.wmf/scripting/eplr_access.lua (+0/-11) test/maps/lua_testsuite.wmf/scripting/flag.lua (+0/-142) test/maps/lua_testsuite.wmf/scripting/game.lua (+0/-13) test/maps/lua_testsuite.wmf/scripting/gfield.lua (+0/-14) test/maps/lua_testsuite.wmf/scripting/gplayer.lua (+0/-147) test/maps/lua_testsuite.wmf/scripting/gplr_access.lua (+0/-11) test/maps/lua_testsuite.wmf/scripting/immovables.lua (+0/-11) test/maps/lua_testsuite.wmf/scripting/map.lua (+0/-37) test/maps/lua_testsuite.wmf/scripting/math_random.lua (+0/-39) test/maps/lua_testsuite.wmf/scripting/messages.lua (+0/-71) test/maps/lua_testsuite.wmf/scripting/militarysite.lua (+0/-83) test/maps/lua_testsuite.wmf/scripting/objectives.lua (+0/-84) test/maps/lua_testsuite.wmf/scripting/productionsite.lua (+0/-239) test/maps/lua_testsuite.wmf/scripting/road.lua (+0/-107) test/maps/lua_testsuite.wmf/scripting/set.lua (+0/-114) test/maps/lua_testsuite.wmf/scripting/table.lua (+0/-18) test/maps/lua_testsuite.wmf/scripting/test_lua_in_game.lua (+0/-1) test/maps/lua_testsuite.wmf/scripting/trainingsite.lua (+0/-236) test/maps/lua_testsuite.wmf/scripting/ui.lua (+0/-192) test/maps/lua_testsuite.wmf/scripting/warehouse.lua (+0/-192) test/maps/ship_transportation.wmf/elemental (+0/-13) test/maps/ship_transportation.wmf/extra_data (+0/-4) test/maps/ship_transportation.wmf/objective (+0/-4) test/maps/ship_transportation.wmf/player_names (+0/-10) test/maps/ship_transportation.wmf/player_position (+0/-5) test/maps/ship_transportation.wmf/port_spaces (+0/-9) test/maps/ship_transportation.wmf/scripting/init.lua (+0/-62) test/maps/ship_transportation.wmf/scripting/test_rip_farm_with_ware_and_worker_in_transit.lua (+0/-33) test/maps/ship_transportation.wmf/scripting/test_rip_first_port_with_ware_in_portdock.lua (+0/-44) test/maps/ship_transportation.wmf/scripting/test_rip_first_port_with_worker_in_portdock.lua (+0/-39) test/maps/ship_transportation.wmf/scripting/test_rip_ports_with_ware_in_transit.lua (+0/-55) test/maps/ship_transportation.wmf/scripting/test_rip_ports_with_worker_in_transit.lua (+0/-55) test/maps/ship_transportation.wmf/scripting/test_rip_second_port_with_ware_in_portdock.lua (+0/-39) test/maps/ship_transportation.wmf/scripting/test_rip_second_port_with_worker_in_portdock.lua (+0/-39) test/maps/ship_transportation.wmf/scripting/test_rip_ship_before_picking_up_transporting_ware.lua (+0/-40) test/maps/ship_transportation.wmf/scripting/test_rip_ship_while_transporting_ware.lua (+0/-44) test/maps/ship_transportation.wmf/version (+0/-11) tribes/atlanteans/advanced_shield/conf (+1/-1) tribes/atlanteans/armoursmith/conf (+1/-1) tribes/atlanteans/bakingtray/conf (+1/-1) tribes/atlanteans/blackroot/conf (+1/-1) tribes/atlanteans/bucket/conf (+1/-1) tribes/atlanteans/builder/conf (+1/-1) tribes/atlanteans/castle/conf (+5/-0) tribes/atlanteans/coal/conf (+1/-1) tribes/atlanteans/conf (+36/-36) tribes/atlanteans/corn/conf (+1/-1) tribes/atlanteans/double_trident/conf (+1/-1) tribes/atlanteans/fish/conf (+1/-1) tribes/atlanteans/gold/conf (+1/-1) tribes/atlanteans/golden_tabard/conf (+1/-1) tribes/atlanteans/goldore/conf (+1/-1) tribes/atlanteans/guardhall/conf (+5/-0) tribes/atlanteans/guardhouse/conf (+5/-0) tribes/atlanteans/hammer/conf (+1/-1) tribes/atlanteans/heavy_double_trident/conf (+1/-1) tribes/atlanteans/high_tower/conf (+5/-0) tribes/atlanteans/hook_pole/conf (+1/-1) tribes/atlanteans/horse/conf (+1/-1) tribes/atlanteans/iron/conf (+1/-1) tribes/atlanteans/ironore/conf (+1/-1) tribes/atlanteans/labyrinth/conf (+2/-2) tribes/atlanteans/light_trident/conf (+1/-1) tribes/atlanteans/long_trident/conf (+1/-1) tribes/atlanteans/meat/conf (+1/-1) tribes/atlanteans/milking_tongs/conf (+1/-1) tribes/atlanteans/quartz/conf (+1/-1) tribes/atlanteans/sawyer/conf (+1/-1) tribes/atlanteans/scout/conf (+1/-1) tribes/atlanteans/scripting/sc01_castle_village.lua (+2/-2) tribes/atlanteans/shovel/conf (+1/-1) tribes/atlanteans/small_tower/conf (+5/-0) tribes/atlanteans/spideryarn/conf (+1/-1) tribes/atlanteans/steel_shield/conf (+1/-1) tribes/atlanteans/stone/conf (+1/-1) tribes/atlanteans/stonecutter/conf (+1/-1) tribes/atlanteans/toolsmithy/conf (+1/-1) tribes/atlanteans/tower/conf (+5/-0) tribes/atlanteans/water/conf (+1/-1) tribes/barbarians/axe/conf (+1/-1) tribes/barbarians/axefactory/conf (+3/-3) tribes/barbarians/axefactory/help.lua (+23/-23) tribes/barbarians/bakery/help.lua (+14/-14) tribes/barbarians/bakingtray/conf (+1/-1) tribes/barbarians/barrier/conf (+5/-0) tribes/barbarians/battlearena/help.lua (+14/-14) tribes/barbarians/battleaxe/conf (+1/-1) tribes/barbarians/broadaxe/conf (+1/-1) tribes/barbarians/bronzeaxe/conf (+1/-1) tribes/barbarians/builder/conf (+1/-1) tribes/barbarians/cattlebreeder/conf (+1/-1) tribes/barbarians/cattlefarm/help.lua (+9/-10) tribes/barbarians/citadel/conf (+6/-0) tribes/barbarians/coal/conf (+1/-1) tribes/barbarians/coalmine/help.lua (+10/-10) tribes/barbarians/conf (+43/-43) tribes/barbarians/deep_coalmine/help.lua (+11/-11) tribes/barbarians/deep_goldmine/help.lua (+11/-11) tribes/barbarians/deep_oremine/help.lua (+9/-9) tribes/barbarians/deeper_coalmine/help.lua (+10/-11) tribes/barbarians/deeper_goldmine/help.lua (+10/-11) tribes/barbarians/deeper_oremine/help.lua (+9/-10) tribes/barbarians/donjon/conf (+6/-0) tribes/barbarians/farm/help.lua (+9/-9) tribes/barbarians/felling_axe/conf (+1/-1) tribes/barbarians/fernery/help.lua (+9/-9) tribes/barbarians/fire_tongs/conf (+1/-1) tribes/barbarians/fish/conf (+1/-1) tribes/barbarians/fisher/conf (+1/-1) tribes/barbarians/fishers_hut/help.lua (+7/-7) tribes/barbarians/fishing_rod/conf (+1/-1) tribes/barbarians/fortress/conf (+5/-0) tribes/barbarians/gamekeepers_hut/help.lua (+7/-7) tribes/barbarians/gold/conf (+1/-1) tribes/barbarians/goldmine/help.lua (+9/-9) tribes/barbarians/goldstone/conf (+1/-1) tribes/barbarians/granitemine/help.lua (+9/-9) tribes/barbarians/hammer/conf (+1/-1) tribes/barbarians/helm/conf (+1/-1) tribes/barbarians/helmsmithy/conf (+1/-1) tribes/barbarians/hunters_hut/help.lua (+10/-10) tribes/barbarians/hunting_spear/conf (+1/-1) tribes/barbarians/iron/conf (+1/-1) tribes/barbarians/ironore/conf (+1/-1) tribes/barbarians/kitchen_tools/conf (+1/-1) tribes/barbarians/lime_kiln/help.lua (+16/-16) tribes/barbarians/lumberjacks_hut/help.lua (+9/-9) tribes/barbarians/mask/conf (+1/-1) tribes/barbarians/meal/conf (+1/-1) tribes/barbarians/meat/conf (+1/-1) tribes/barbarians/metalworks/conf (+2/-2) tribes/barbarians/metalworks/help.lua (+18/-18) tribes/barbarians/micro-brewery/help.lua (+10/-10) tribes/barbarians/oremine/help.lua (+8/-8) tribes/barbarians/ox/conf (+1/-1) tribes/barbarians/pick/conf (+1/-1) tribes/barbarians/pittabread/conf (+1/-1) tribes/barbarians/quarry/help.lua (+4/-4) tribes/barbarians/rangers_hut/help.lua (+6/-6) tribes/barbarians/scout/conf (+1/-1) tribes/barbarians/scripting/sc01_citadel_village.lua (+2/-2) tribes/barbarians/scythe/conf (+1/-1) tribes/barbarians/sentry/conf (+5/-0) tribes/barbarians/sharpaxe/conf (+1/-1) tribes/barbarians/shovel/conf (+1/-1) tribes/barbarians/stonemason/conf (+1/-1) tribes/barbarians/strongbeer/conf (+1/-1) tribes/barbarians/stronghold/conf (+6/-0) tribes/barbarians/trainingscamp/conf (+6/-6) tribes/barbarians/trainingscamp/help.lua (+25/-23) tribes/barbarians/trunk/conf (+1/-1) tribes/barbarians/warhelmet/conf (+1/-1) tribes/barbarians/warmill/conf (+6/-6) tribes/barbarians/warmill/help.lua (+22/-22) tribes/barbarians/warriorsaxe/conf (+1/-1) tribes/barbarians/water/conf (+1/-1) tribes/barbarians/well/help.lua (+6/-5) tribes/empire/advanced_lance/conf (+1/-1) tribes/empire/armour/conf (+1/-1) tribes/empire/armoursmith/conf (+1/-1) tribes/empire/armoursmithy/conf (+3/-3) tribes/empire/axe/conf (+1/-1) tribes/empire/bakingtray/conf (+1/-1) tribes/empire/barracks/conf (+6/-0) tribes/empire/barrier/conf (+6/-0) tribes/empire/bread/conf (+1/-1) tribes/empire/builder/conf (+1/-1) tribes/empire/castle/conf (+6/-0) tribes/empire/chain_armour/conf (+1/-1) tribes/empire/cloth/conf (+1/-1) tribes/empire/coal/conf (+1/-1) tribes/empire/conf (+41/-41) tribes/empire/donkey/conf (+1/-1) tribes/empire/fish/conf (+1/-1) tribes/empire/fisher/conf (+1/-1) tribes/empire/fortress/conf (+6/-0) tribes/empire/gold/conf (+1/-1) tribes/empire/goldstone/conf (+1/-1) tribes/empire/grape/conf (+1/-1) tribes/empire/hammer/conf (+1/-1) tribes/empire/heavy_lance/conf (+1/-1) tribes/empire/helm/conf (+1/-1) tribes/empire/hunting_spear/conf (+1/-1) tribes/empire/iron/conf (+1/-1) tribes/empire/ironore/conf (+1/-1) tribes/empire/lance/conf (+1/-1) tribes/empire/marble/conf (+1/-1) tribes/empire/marblecolumn/conf (+1/-1) tribes/empire/meat/conf (+1/-1) tribes/empire/outpost/conf (+6/-0) tribes/empire/plate_armour/conf (+1/-1) tribes/empire/scout/conf (+1/-1) tribes/empire/scripting/sc01_castle_village.lua (+2/-2) tribes/empire/scythe/conf (+1/-1) tribes/empire/sentry/conf (+6/-0) tribes/empire/shovel/conf (+1/-1) tribes/empire/stone/conf (+1/-1) tribes/empire/stonemason/conf (+1/-1) tribes/empire/toolsmithy/conf (+2/-2) tribes/empire/tower/conf (+6/-0) tribes/empire/trainingscamp/conf (+8/-8) tribes/empire/trunk/conf (+1/-1) tribes/empire/war_lance/conf (+1/-1) tribes/empire/water/conf (+1/-1) tribes/empire/wheat/conf (+1/-1) tribes/empire/wine/conf (+1/-1) tribes/empire/wood/conf (+1/-1) tribes/empire/wood_lance/conf (+1/-1) txts/README.lua (+18/-18) txts/editor_readme (+5/-5) txts/license (+3/-3) txts/tips/atlanteans.tip (+1/-1) txts/tips/barbarians.tip (+1/-1) txts/tips/editor.tip (+5/-5) txts/tips/empire.tip (+1/-1) txts/tips/general_game.tip (+9/-9) txts/tips/multiplayer.tip (+3/-3) utils/buildcat.py (+14/-11) utils/lua_xgettext.py (+291/-52) utils/test/test_lua-xgettext.py (+65/-6) utils/win32/innosetup/Widelands.iss (+2/-2) worlds/blackland/conf (+24/-24) worlds/blackland/terrainconf (+12/-12) worlds/desert/conf (+29/-29) worlds/desert/terrainconf (+11/-11) worlds/greenland/conf (+26/-26) worlds/greenland/terrainconf (+10/-10) worlds/winterland/conf (+24/-24) worlds/winterland/terrainconf (+9/-9) |
To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/gci18nfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Widelands Developers | Pending | ||
Review via email:
|
Description of the change
- Fixes a bunch of strings to in .cc and .lua files to be translatable in more languages.
- Adds support for ngettext into Lua, the lua xgettext extractor.
To be merged after b18.
To post a comment you must log in.
Hi, thanks for your work on this. :)
I haven't looked closely at this, but it seems to have fixed the VICTORY/NEW OBJECTIVES headlines in campaing texts. I think this branch perhaps should be linked up to bug 835559 (maybe it's even fixed most of the issues), could you take a look at that?
>- Adds support for ngettext into Lua, the lua xgettext extractor.
Does ngettext need to be added as a new build dependency, or is it already provided either by lua or gettext? If it needs to be added, we should probably look at that before this branch is merged so that CMake is able to tell whether all required dependencies are present or not.