widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands.

Commit message:
Small string fixes for issues reported on Transifex.

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
  Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the battle ax"
  https://bugs.launchpad.net/widelands/+bug/1530240
  Bug #1530398 in widelands: "Wrong text above marble mine"
  https://bugs.launchpad.net/widelands/+bug/1530398
  Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
  https://bugs.launchpad.net/widelands/+bug/1547909

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands.

=== modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
--- data/campaigns/atl01.wmf/scripting/texts.lua	2017-02-15 19:32:31 +0000
+++ data/campaigns/atl01.wmf/scripting/texts.lua	2017-03-04 13:46:04 +0000
@@ -314,7 +314,7 @@
 
 barracks_story = {
    {
-      title = _"Jundlina Writes a Letter",
+      title = _"Jundlina Received a Letter",
       body = jundlina(_"Jundlina",
          -- TRANSLATORS: Jundlina
          _([[I have received word that our mining industry started working. Now that we are forging weapons, I will send a letter to Sidolus informing him that it’s time to build a barracks and start recruiting soldiers.]]))

=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2016-12-06 18:41:32 +0000
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2017-03-04 13:46:04 +0000
@@ -166,7 +166,7 @@
 }
 
 lumberjack_message_07 = {
-   title = _"Lumberjack is Done",
+   title = _"The Lumberjack’s Hut is Done",
    position = "topright",
    body = rt(
       p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the granite.]])

=== modified file 'data/txts/tips/barbarians.lua'
--- data/txts/tips/barbarians.lua	2017-03-02 11:09:27 +0000
+++ data/txts/tips/barbarians.lua	2017-03-04 13:46:04 +0000
@@ -9,7 +9,7 @@
       seconds = 5
    },
    {
-      text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+      text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
       seconds = 7
    },
 }

=== modified file 'data/txts/tips/editor.lua'
--- data/txts/tips/editor.lua	2017-03-02 11:09:27 +0000
+++ data/txts/tips/editor.lua	2017-03-04 13:46:04 +0000
@@ -41,7 +41,7 @@
       seconds = 7
    },
    {
-      text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or unbuildable terrain towards the west, northwest and northeast.",
+      text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
       seconds = 7
    },
 }

=== modified file 'data/txts/tips/empire.lua'
--- data/txts/tips/empire.lua	2017-03-02 11:09:27 +0000
+++ data/txts/tips/empire.lua	2017-03-04 13:46:04 +0000
@@ -9,7 +9,7 @@
       seconds = 5
    },
    {
-      text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+      text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
       seconds = 7
    },
    {