widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347

Removing an unnecessary space I spotted when translating for the one world + a couple of string fixes/improvements I've had on my todo-list.
-- 
https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands.

=== modified file 'campaigns/t01.wmf/scripting/texts.lua'
--- campaigns/t01.wmf/scripting/texts.lua	2014-04-03 12:46:12 +0000
+++ campaigns/t01.wmf/scripting/texts.lua	2014-07-10 17:21:34 +0000
@@ -104,7 +104,7 @@
 _[[Hail, chieftain. I am Khantrukh and have seen many winters pass. Please allow me to aid you with my counsel through these darkened days.]])
 
 khantrukh_2= khantrukh(_"Khantrukh continues...",
-_[[None but the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...]] .. paragraphdivider() ..
+_[[Only the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...]] .. paragraphdivider() ..
 _[[We should prepare, in case we have to face the winter in these harsh lands. I believe to the east of our campsite are a few places where we could raise a lumberjack’s hut.]])
 .. new_objectives(start_lumberjack_01_01)
 

=== modified file 'tribes/empire/hammer/conf'
--- tribes/empire/hammer/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/hammer/conf	2014-07-10 17:21:34 +0000
@@ -1,4 +1,4 @@
-help=_The hammer is an essential tool. It is needed by the geologist, the builder, the armor and the weapon smith. Make sure you always have some in reserve! It is produced by the toolsmith.
+help=_The hammer is an essential tool. It is needed by geologists, builders, weaponsmiths and armorsmiths. Make sure you always got some in reserve! It is produced by the toolsmith.
 default_target_quantity=2
 preciousness=1
 

=== modified file 'world/immovables/trees/cirrus/init.lua'
--- world/immovables/trees/cirrus/init.lua	2014-07-05 14:09:47 +0000
+++ world/immovables/trees/cirrus/init.lua	2014-07-10 17:21:34 +0000
@@ -9,7 +9,7 @@
 
 world:new_immovable_type{
    name = "cirrus_wasteland_sapling",
-   descname = _ " Cirrus Tree (Sapling)",
+   descname = _ "Cirrus Tree (Sapling)",
    editor_category = "trees_wasteland",
    size = "small",
    attributes = { "tree_sapling" },