widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #01723
[Merge] lp:~hjd/widelands/minifixes into lp:widelands
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/minifixes into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/minifixes/+merge/207803
Various minor fixes, now that code freeze is over. :)
See the commit messages for details.
--
https://code.launchpad.net/~hjd/widelands/minifixes/+merge/207803
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/minifixes into lp:widelands.
=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua 2013-09-08 08:45:52 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua 2014-02-22 19:20:39 +0000
@@ -26,7 +26,7 @@
))
smuggling_route_established_other_team = rt(p(_
-[[A new smuggling route from %s to %s has been established!. Every ware smuggled here
+[[A new smuggling route from %s to %s has been established! Every ware smuggled here
is worth %i points.]]
))
smuggling_route_established_sender = rt(p(_
=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc 2013-07-27 15:09:18 +0000
+++ src/wui/game_message_menu.cc 2014-02-22 19:20:39 +0000
@@ -56,7 +56,7 @@
list->add_column (50, _("Select"), UI::Align_HCenter, true);
list->add_column (50, _("Status"), UI::Align_HCenter);
list->add_column(136, _("Title"));
- list->add_column(100, _("Time sent"));
+ list->add_column(100, _("Received"));
UI::Button * clearselectionbtn =
new UI::Button
=== modified file 'tribes/atlanteans/shovel/conf'
--- tribes/atlanteans/shovel/conf 2010-08-01 14:35:38 +0000
+++ tribes/atlanteans/shovel/conf 2014-02-22 19:20:39 +0000
@@ -1,4 +1,4 @@
-help=_Shovels are needed for proper handling of plants. Therefore the forester and the blackroot farmer are using them. They are produced by the toolsmith.
+help=_The shovel is needed for proper handling of plants. Therefore the forester and the blackroot farmer are using them. They are produced by the toolsmith.
default_target_quantity=2
[idle]
=== modified file 'tribes/barbarians/axefactory/help.lua'
--- tribes/barbarians/axefactory/help.lua 2012-03-17 21:45:46 +0000
+++ tribes/barbarians/axefactory/help.lua 2014-02-22 19:20:39 +0000
@@ -21,7 +21,7 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/axefactory/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
+ dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/axefactory/menu.png"},p(_"%s from a Smelting Works":format(_"Iron"))) ..
dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}) ..
rt(p(_"%s from the Coal mine or the Charcoal Burner's House":format(_"Coal"))) ..
rt(h3(_"Outgoing:")) ..
@@ -31,7 +31,7 @@
rt(h2(_"Building")) ..
text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
text_line(_"Upgraded from:", _"Metalwork Shop","tribes/barbarians/metalworks/menu.png") ..
- rt(h3(_"Upgrade Cost:")) ..
+ rt(h3(_"Upgrade cost:")) ..
image_line("tribes/barbarians/blackwood/menu.png",1,p("1 " .. _"Blackwood")) ..
image_line("tribes/barbarians/thatchreed/menu.png",1,p("1 " .. _"Thatch Reed")) ..
image_line("tribes/barbarians/raw_stone/menu.png",2,p("2 " .. _"Raw Stone")) ..
=== modified file 'tribes/barbarians/bakery/help.lua'
--- tribes/barbarians/bakery/help.lua 2012-03-19 13:12:49 +0000
+++ tribes/barbarians/bakery/help.lua 2014-02-22 19:20:39 +0000
@@ -20,8 +20,8 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/bakery/menu.png"},p(_"Wheat from the Farm")) ..
- dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/bakery/menu.png"},p(_"Water from the Well")) ..
+ dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/bakery/menu.png"},p(_"Wheat from a Farm")) ..
+ dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/bakery/menu.png"},p(_"Water from a Well")) ..
rt(h3(_"Outgoing:")) ..
dependencies({"tribes/barbarians/bakery/menu.png","tribes/barbarians/pittabread/menu.png"},p(_"Pitta Bread")) ..
dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/tavern/menu.png"},p(_"Tavern")) ..
@@ -53,4 +53,4 @@
--Production Section
rt(h2(_"Production")) ..
text_line(_"Performance:", _"If all needed wares are delivered in time, this building can produce %s in %s on average.":format(_"Pitta Bread","30s"))
-}
\ No newline at end of file
+}
=== modified file 'tribes/barbarians/cattlefarm/help.lua'
--- tribes/barbarians/cattlefarm/help.lua 2012-03-19 13:12:49 +0000
+++ tribes/barbarians/cattlefarm/help.lua 2014-02-22 19:20:39 +0000
@@ -20,8 +20,8 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/cattlefarm/menu.png"},p(_"Wheat from the Farm")) ..
- dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/cattlefarm/menu.png"},p(_"Water from the Well")) ..
+ dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/cattlefarm/menu.png"},p(_"Wheat from a Farm")) ..
+ dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/cattlefarm/menu.png"},p(_"Water from a Well")) ..
rt(h3(_"Outgoing:")) ..
dependencies({"tribes/barbarians/cattlefarm/menu.png","tribes/barbarians/ox/menu.png"},p(_"Ox")) ..
--Building Section
@@ -46,4 +46,4 @@
--Production Section
rt(h2(_"Production")) ..
text_line(_"Performance:", _"If all needed wares are delivered in time, this building can produce %s in %s on average.":format(_"Ox","30s"))
-}
\ No newline at end of file
+}
=== modified file 'tribes/barbarians/lime_kiln/help.lua'
--- tribes/barbarians/lime_kiln/help.lua 2012-03-17 21:45:46 +0000
+++ tribes/barbarians/lime_kiln/help.lua 2014-02-22 19:20:39 +0000
@@ -21,9 +21,9 @@
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
dependencies({"tribes/barbarians/granitemine/menu.png;tribes/barbarians/quarry/menu.png","tribes/barbarians/raw_stone/menu.png","tribes/barbarians/lime_kiln/menu.png"}) ..
- rt(p(_"Raw Stone from the Granite Mine or Quarry")) ..
+ rt(p(_"Raw Stone from a Granite Mine or Quarry")) ..
dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}) ..
- rt(p(_"%s from the Coal mine or the Charcoal Burner's House":format(_"Coal"))) ..
+ rt(p(_"%s from a Coal mine or a Charcoal Burner's House":format(_"Coal"))) ..
dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/lime_kiln/menu.png"},p(_"Water from a Well")) ..
--rt() ..
rt(h3(_"Outgoing:")) ..
@@ -52,4 +52,4 @@
--Production Section
rt(h2(_"Production")) ..
text_line(_"Performance:", _"If all needed wares are delivered in time, this building can produce %s in about %s on average.":format(_"Grout","41s"))
-}
\ No newline at end of file
+}
=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua 2012-03-17 21:45:46 +0000
+++ tribes/barbarians/metalworks/help.lua 2014-02-22 19:20:39 +0000
@@ -22,8 +22,8 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
- dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/trunk/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from the Lumberjack's hut":format(_"Trunk"))) ..
+ dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from a Smelting Works":format(_"Iron"))) ..
+ dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/trunk/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from a Lumberjack's hut":format(_"Trunk"))) ..
rt(h3(_"Outgoing:")) ..
dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/bakingtray/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/baker/menu.png" },p(_"Baker")) ..
dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/felling_axe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/lumberjack/menu.png" },p(_"Lumberjack")) ..
=== modified file 'tribes/barbarians/micro-brewery/help.lua'
--- tribes/barbarians/micro-brewery/help.lua 2012-03-17 21:45:46 +0000
+++ tribes/barbarians/micro-brewery/help.lua 2014-02-22 19:20:39 +0000
@@ -20,8 +20,8 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/micro-brewery/menu.png"},p(_"Water from the Well")) ..
- dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/micro-brewery/menu.png"},p(_"Wheat from the Farm")) ..
+ dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/micro-brewery/menu.png"},p(_"Water from a Well")) ..
+ dependencies({"tribes/barbarians/farm/menu.png","tribes/barbarians/wheat/menu.png","tribes/barbarians/micro-brewery/menu.png"},p(_"Wheat from a Farm")) ..
rt(h3(_"Outgoing:")) ..
dependencies({"tribes/barbarians/micro-brewery/menu.png","tribes/barbarians/beer/menu.png"},p(_"Beer")) ..
dependencies({"tribes/barbarians/beer/menu.png","tribes/barbarians/inn/menu.png"},p(_"Inn")) ..
=== modified file 'tribes/barbarians/trunk/conf'
--- tribes/barbarians/trunk/conf 2010-11-09 14:14:57 +0000
+++ tribes/barbarians/trunk/conf 2014-02-22 19:20:39 +0000
@@ -4,7 +4,7 @@
preciousness=14
default_target_quantity=40
-# Barbarian trunks are made of black wood from the black forrests
+# Barbarian trunks are made of black wood from the black forests
# they come from.
[idle]
=== modified file 'tribes/barbarians/warmill/help.lua'
--- tribes/barbarians/warmill/help.lua 2012-03-17 21:45:46 +0000
+++ tribes/barbarians/warmill/help.lua 2014-02-22 19:20:39 +0000
@@ -21,10 +21,10 @@
--Dependencies
rt(h2(_"Dependencies")) ..
rt(h3(_"Incoming:")) ..
- dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/warmill/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
- dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/gold/menu.png","tribes/barbarians/warmill/menu.png"},p(_"%s from the Smelting Works":format(_"Gold"))) ..
+ dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/warmill/menu.png"},p(_"%s from a Smelting Works":format(_"Iron"))) ..
+ dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/gold/menu.png","tribes/barbarians/warmill/menu.png"},p(_"%s from a Smelting Works":format(_"Gold"))) ..
dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/warmill/menu.png"}) ..
- rt(p(_"Coal from the Coal mine or the Charcoal Burner's House")) ..
+ rt(p(_"Coal from a Coal mine or a Charcoal Burner's House")) ..
rt(h3(_"Outgoing:")) ..
dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/axe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/soldier/menu.png"},p(_"Soldier")) ..
dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png;tribes/barbarians/bronzeaxe/menu.png;tribes/barbarians/battleaxe/menu.png;tribes/barbarians/warriorsaxe/menu.png","tribes/barbarians/trainingscamp/menu.png"}) ..
@@ -33,7 +33,7 @@
rt(h2(_"Building")) ..
text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
text_line(_"Upgraded from:", _"Axefactory","tribes/barbarians/axefactory/menu.png") ..
- rt(h3(_"Upgrade Cost:")) ..
+ rt(h3(_"Upgrade cost:")) ..
image_line("tribes/barbarians/blackwood/menu.png",1,p("1 " .. _"Blackwood")) ..
image_line("tribes/barbarians/thatchreed/menu.png",1,p("1 " .. _"Thatch Reed")) ..
image_line("tribes/barbarians/raw_stone/menu.png",2,p("2 " .. _"Raw Stone")) ..
