widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

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

Commit message:
Fixed string issues in Dolomites and worker help.

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/291154

Some 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 'data/maps/Dolomites_v2.wmf/elemental'
--- data/maps/Dolomites_v2.wmf/elemental	2016-04-01 09:21:48 +0000
+++ data/maps/Dolomites_v2.wmf/elemental	2016-04-06 17:41:38 +0000
@@ -7,6 +7,6 @@
 nr_players="6"
 name=_"Dolomites"
 author="King of nowhere"
-descr=_"The jewel of the alps, the dolomites mountain range has been declared a world heritage site for its pristine beauty. This map is an as-faithful-as-reasonable reconstruction of the area delimited by Cortina d’Ampezzo in the north-east and Canazei in the south-west. If you have to be pitted in a duel to the death against your enemies, it may as well be in a beautiful place."
-hint=_"There is lot of flat ground on the mountains. Unfortunately, most of it is vertical. Use the little building space that you have wisely.  A fortress at the mouth of a narrow mountain pass can be a formidable obstacle to an enemy army. Use the terrain to your advantage."
+descr=_"The jewel of the Alps, the Dolomites mountain range has been declared a World Heritage Site for its pristine beauty. This map is an as-faithful-as-reasonable reconstruction of the area delimited by Cortina d’Ampezzo in the north-east and Canazei in the south-west. If you have to be pitted in a duel to the death against your enemies, it may as well be in a beautiful place."
+hint=_"There is lot of flat ground on the mountains. Unfortunately, most of it is vertical. Use the little building space that you have wisely. A fortress at the mouth of a narrow mountain pass can be a formidable obstacle to an enemy army. Use the terrain to your advantage."
 tags="1v1,2teams,3teams,official"

=== modified file 'data/tribes/scripting/help/worker_help.lua'
--- data/tribes/scripting/help/worker_help.lua	2016-04-02 11:32:32 +0000
+++ data/tribes/scripting/help/worker_help.lua	2016-04-06 17:41:38 +0000
@@ -199,7 +199,7 @@
          result = result .. rt(p(
             listitem_bullet(
                (_"Starts at %d%%."):bformat(worker_description.base_defense)) ..
-            listitem_bullet(_"This solder cannot be trained in defense")))
+            listitem_bullet(_"This soldier cannot be trained in defense.")))
       end
 
       result = result .. rt(h3(_"Evade"))