GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
2 small string fixes.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'src/logic/soldier.cc'
--- src/logic/soldier.cc 2015-12-03 08:45:37 +0000
+++ src/logic/soldier.cc 2015-12-04 19:21:30 +0000
@@ -1501,7 +1501,7 @@
*new Message
(Message::Type::kGameLogic,
game.get_gametime(),
- _("Soldier"),
+ descr().descname(),
"pics/menu_help.png",
_("Logic error"),
messagetext,
@@ -1512,7 +1512,7 @@
*new Message
(Message::Type::kGameLogic,
game.get_gametime(),
- _("Soldier"),
+ descr().descname(),
"pics/menu_help.png",
_("Logic error"),
messagetext,
=== modified file 'tribes/scripting/starting_conditions/atlanteans/fortified_village.lua'
--- tribes/scripting/starting_conditions/atlanteans/fortified_village.lua 2015-12-03 09:56:01 +0000
+++ tribes/scripting/starting_conditions/atlanteans/fortified_village.lua 2015-12-04 19:21:30 +0000
@@ -100,7 +100,7 @@
end) then
plr:send_message(
-- TRANSLATORS: Short for "Not enough space"
- _"Space",
+ _"No Space",
rt(p(_([[Some of your starting buildings didn’t have enough room and weren’t built. You are at a disadvantage with this; consider restarting this map with a fair starting condition.]]))),
{popup=true, heading=_"Not enough space"}
)
=== modified file 'tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2015-12-03 09:56:01 +0000
+++ tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2015-12-04 19:21:30 +0000
@@ -93,7 +93,7 @@
end) then
plr:send_message(
-- TRANSLATORS: Short for "Not enough space"
- _"Space",
+ _"No Space",
rt(p(_([[Some of your starting buildings didn’t have enough room and weren’t built. You are at a disadvantage with this; consider restarting this map with a fair starting condition.]]))),
{popup=true, heading=_"Not enough space"}
)
=== modified file 'tribes/scripting/starting_conditions/empire/fortified_village.lua'
--- tribes/scripting/starting_conditions/empire/fortified_village.lua 2015-12-03 09:56:01 +0000
+++ tribes/scripting/starting_conditions/empire/fortified_village.lua 2015-12-04 19:21:30 +0000
@@ -118,7 +118,7 @@
end) then
plr:send_message(
-- TRANSLATORS: Short for "Not enough space"
- _"Space",
+ _"No Space",
rt(p(_([[Some of your starting buildings didn’t have enough room and weren’t built. You are at a disadvantage with this; consider restarting this map with a fair starting condition.]]))),
{popup=true, heading=_"Not enough space"}
)
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
