widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

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

Commit message:
Various 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/288491

Various string fixes for issues reported on Transifex.
-- 
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	2016-02-18 16:23:31 +0000
+++ data/campaigns/atl01.wmf/scripting/texts.lua	2016-03-09 09:08:54 +0000
@@ -197,7 +197,7 @@
       title = _"Sidolus Speaks",
       body = sidolus(
          -- TRANSLATORS: Sidolus
-         _([[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need a good supply of building materials for we have to expand our territory swiftly. I will not feel safe on this island as long as we have not seen all its shores it. I brought plenty of good men from Atlantis. The military might is available. We only need some housing to live in.]]))
+         _([[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need a good supply of building materials for we have to expand our territory swiftly. I will not feel safe on this island as long as we have not seen all its shores. I brought plenty of good men from Atlantis. The military might is available. We only need some housing to live in.]]))
          ..  new_objectives(obj_expand)
    }
 }
@@ -297,7 +297,7 @@
       title = _"Jundlina Replies",
       body = jundlina(_"Jundlina Nods",
          -- TRANSLATORS: Jundlina
-         _([[I have considered this, Sidolus. I think  it is about time. We will make this a priority for now. You shall get your industry soon!]]))
+         _([[I have considered this, Sidolus. I think it is about time. We will make this a priority for now. You shall get your industry soon!]]))
          .. new_objectives(obj_make_heavy_industry_and_mining)
    },
 }

=== modified file 'data/scripting/widelands/multiplayer_help.lua'
--- data/scripting/widelands/multiplayer_help.lua	2016-01-28 06:12:20 +0000
+++ data/scripting/widelands/multiplayer_help.lua	2016-03-09 09:08:54 +0000
@@ -23,7 +23,7 @@
       result = result .. picture_li("images/ui_fsmenu/shared_in.png", _"Set as shared in starting position for another player.")
       result = result .. picture_li("images/ui_basic/stop.png", _"Closed.")
       result = result .. rt(p(_"The latter three can only be set by the hosting client by left-clicking the ‘type’ button of a player. Hosting players can also set the initialization of each player (the set of buildings, wares and workers the player starts with) and the tribe and team for computer players"))
-      result = result .. rt(p(_"Every client connected to a player (the set ‘role’ player) can set the tribe and the team for that player"))
+      result = result .. rt(p(_"Every client connected to a player (who isn’t a spectator) can set the tribe and the team for that player"))
 
       result = result .. rt(h2(_"Map details"))
       result = result .. rt(p(_"You can see information about the selected map or savegame on the right-hand side. A button next to the map name allows the host to change to a different map. Furthermore, the host is able to set a specific win condition, and finally can start the game as soon as all players are set up."))

=== modified file 'src/wlapplication_messages.cc'
--- src/wlapplication_messages.cc	2016-02-14 21:18:03 +0000
+++ src/wlapplication_messages.cc	2016-03-09 09:08:54 +0000
@@ -62,9 +62,11 @@
 		<< _(" --language=[de_DE|sv_SE|...]\n"
 			  "                      The locale to use.") << endl
 			/** TRANSLATORS: You may translate true/false, also as on/off or yes/no, but */
-			/** TRANSLATORS: it HAS TO BE CONSISTENT with the translation in the widelands textdomain */
+			/** TRANSLATORS: it HAS TO BE CONSISTENT with the translation in the widelands textdomain. */
+			/** TRANSLATORS: A syncstream is a synchronization stream. Syncstreams are used in multiplayer */
+			/** TRANSLATORS: games to make sure that there is no mismatch between the players. */
 		<< _(" --write_syncstreams=[true|false]\n"
-			  "                      Create syncstreams to help debug network games.") << endl
+			  "                      Create syncstream dump files to help debug network games.") << endl
 		<< _(" --autosave=[...]     Automatically save each n minutes") << endl
 		<< _(" --rolling_autosave=[...]\n"
 			  "                      Use this many files for rolling autosaves") << endl << endl

=== modified file 'utils/buildcat.py'
--- utils/buildcat.py	2016-03-04 16:44:40 +0000
+++ utils/buildcat.py	2016-03-09 09:08:54 +0000
@@ -53,6 +53,7 @@
                     "../../data/scripting/*.lua",
                     "../../data/scripting/editor/*.lua",
                     "../../data/scripting/widelands/*.lua",
+                    "../../data/scripting/editor/*.lua",
     ] ),
     ( "widelands_console/widelands_console", [
                     "../../src/wlapplication_messages.cc",