Merge lp://staging/~gunchleoc/widelands/gci18nfixes into lp://staging/widelands

Proposed by GunChleoc
Status: Rejected
Rejected by: SirVer
Proposed branch: lp://staging/~gunchleoc/widelands/gci18nfixes
Merge into: lp://staging/widelands
Diff against target: 11991 lines (+4194/-4216)
79 files modified
compile.sh (+31/-27)
po/map_plateau.wmf/map_plateau.wmf.pot (+1/-1)
po/maps/maps.pot (+1/-1)
po/mp_scenario_island_hopping.wmf/mp_scenario_island_hopping.wmf.pot (+1/-1)
po/mp_scenario_smugglers.wmf/mp_scenario_smugglers.wmf.pot (+1/-1)
po/scenario_atl01.wmf/scenario_atl01.wmf.pot (+1/-1)
po/scenario_dummy.wmf/scenario_dummy.wmf.pot (+1/-1)
po/scenario_emp01.wmf/scenario_emp01.wmf.pot (+1/-1)
po/scenario_emp02.wmf/scenario_emp02.wmf.pot (+1/-1)
po/scenario_t01.wmf/scenario_t01.wmf.pot (+1/-1)
po/scenario_t02.wmf/scenario_t02.wmf.pot (+1/-1)
po/scenario_t03.wmf/scenario_t03.wmf.pot (+1/-1)
po/scenario_tutorial01.wmf/scenario_tutorial01.wmf.pot (+1/-1)
po/texts/texts.pot (+1/-1)
po/tribe_atlanteans/tribe_atlanteans.pot (+1/-1)
po/tribe_barbarians/tribe_barbarians.pot (+16/-11)
po/tribe_empire/tribe_empire.pot (+1/-1)
po/widelands/gd.po (+56/-11)
po/widelands/widelands.pot (+3443/-3607)
po/win_conditions/gd.po (+11/-4)
po/win_conditions/win_conditions.pot (+67/-43)
po/world_blackland/world_blackland.pot (+1/-1)
po/world_desert/world_desert.pot (+1/-1)
po/world_greenland/world_greenland.pot (+1/-1)
po/world_winterland/world_winterland.pot (+1/-1)
scripting/win_condition_texts.lua (+0/-31)
scripting/win_conditions/02_collectors.lua (+9/-6)
scripting/win_conditions/03_territorial_lord.lua (+9/-6)
scripting/win_conditions/03_territorial_time.lua (+33/-18)
scripting/win_conditions/04_wood_gnome.lua (+13/-7)
src/editor/tools/editor_info_tool.cc (+3/-3)
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 (+3/-3)
src/logic/building.cc (+11/-11)
src/logic/cmd_queue.cc (+1/-1)
src/logic/constructionsite.cc (+3/-1)
src/logic/immovable.cc (+16/-16)
src/logic/instances.cc (+4/-4)
src/logic/military_data.cc (+4/-4)
src/logic/militarysite.cc (+1/-1)
src/logic/playercommand.cc (+27/-27)
src/logic/production_program.cc (+123/-96)
src/logic/requirements.cc (+2/-2)
src/logic/soldier.cc (+18/-18)
src/logic/tribe.cc (+17/-16)
src/logic/worker.cc (+3/-1)
src/map_io/widelands_map_bobdata_data_packet.cc (+11/-11)
src/map_io/widelands_map_buildingdata_data_packet.cc (+37/-37)
src/map_io/widelands_map_flag_data_packet.cc (+4/-2)
src/map_io/widelands_map_flagdata_data_packet.cc (+9/-9)
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 (+25/-25)
src/map_io/widelands_map_roaddata_data_packet.cc (+5/-5)
src/map_io/widelands_map_ware_data_packet.cc (+1/-1)
src/map_io/widelands_map_waredata_data_packet.cc (+6/-6)
src/network/internet_gaming.cc (+11/-2)
src/network/nethost.cc (+24/-16)
src/network/network_gaming_messages.cc (+8/-7)
src/sound/sound_handler.cc (+3/-3)
src/ui_basic/messagebox.cc (+4/-4)
src/ui_fsmenu/launchMPG.cc (+16/-14)
src/ui_fsmenu/launchSPG.cc (+14/-12)
src/ui_fsmenu/loadgame.cc (+3/-1)
src/ui_fsmenu/loadreplay.cc (+3/-1)
src/ui_fsmenu/mapselect.cc (+1/-1)
src/ui_fsmenu/options.cc (+3/-3)
src/wui/building_statistics_menu.cc (+8/-8)
src/wui/game_debug_ui.cc (+9/-9)
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/login_box.cc (+3/-3)
src/wui/login_box.h (+2/-1)
src/wui/multiplayersetupgroup.cc (+2/-2)
src/wui/playerdescrgroup.cc (+9/-8)
src/wui/story_message_box.cc (+1/-1)
tribes/barbarians/trainingscamp/help.lua (+4/-4)
To merge this branch: bzr merge lp://staging/~gunchleoc/widelands/gci18nfixes
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+191497@code.staging.launchpad.net

Description of the change

i18n string fixes

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

This is superseeded by work on lp:~widelands-dev/widelands/gci18nfixes which is currently in_progress.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: