widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1342563 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1342563 in widelands: "When choosing random tribe and castle village, the tribe can be guessed"
  https://bugs.launchpad.net/widelands/+bug/1342563

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1342563/+merge/226981

Renamed a few strings for starting conditions
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1342563/+merge/226981
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1342563 into lp:widelands.

=== modified file 'tribes/atlanteans/scripting/sc00_headquarters_medium.lua'
--- tribes/atlanteans/scripting/sc00_headquarters_medium.lua	2014-03-25 06:18:48 +0000
+++ tribes/atlanteans/scripting/sc00_headquarters_medium.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_atlanteans")
 
 init = {
-   name = _ "Headquarters medium",
+   name = _ "Headquarters",
    func =  function(plr, shared_in_start)
 
    local sf = wl.Game().map.player_slots[plr.number].starting_field

=== modified file 'tribes/atlanteans/scripting/sc01_castle_village.lua'
--- tribes/atlanteans/scripting/sc01_castle_village.lua	2014-03-25 06:18:48 +0000
+++ tribes/atlanteans/scripting/sc01_castle_village.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_atlanteans")
 
 return {
-   name = _ "Castle village",
+   name = _ "Fortified Village",
    func =  function(plr, shared_in_start)
 
    local sf = wl.Game().map.player_slots[plr.number].starting_field

=== modified file 'tribes/barbarians/scripting/sc00_headquarters_medium.lua'
--- tribes/barbarians/scripting/sc00_headquarters_medium.lua	2014-03-25 06:18:48 +0000
+++ tribes/barbarians/scripting/sc00_headquarters_medium.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_barbarians")
 
 init = {
-   name = _ "Headquarters medium",
+   name = _ "Headquarters",
    func = function(player, shared_in_start)
 
    local sf = wl.Game().map.player_slots[player.number].starting_field

=== modified file 'tribes/barbarians/scripting/sc01_citadel_village.lua'
--- tribes/barbarians/scripting/sc01_citadel_village.lua	2014-03-25 06:18:48 +0000
+++ tribes/barbarians/scripting/sc01_citadel_village.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_barbarians")
 
 return {
-   name = _ "Citadel village",
+   name = _ "Fortified Village",
    func =  function(plr, shared_in_start)
 
    local sf = wl.Game().map.player_slots[plr.number].starting_field

=== modified file 'tribes/empire/scripting/sc00_headquarters_medium.lua'
--- tribes/empire/scripting/sc00_headquarters_medium.lua	2014-03-25 06:18:48 +0000
+++ tribes/empire/scripting/sc00_headquarters_medium.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_empire")
 
 return {
-   name = _ "Headquarters medium",
+   name = _ "Headquarters",
    func =  function(p, shared_in_start)
 
    local sf = wl.Game().map.player_slots[p.number].starting_field

=== modified file 'tribes/empire/scripting/sc01_castle_village.lua'
--- tribes/empire/scripting/sc01_castle_village.lua	2014-03-25 06:18:48 +0000
+++ tribes/empire/scripting/sc01_castle_village.lua	2014-07-16 09:20:42 +0000
@@ -7,7 +7,7 @@
 set_textdomain("tribe_empire")
 
 return {
-   name = _ "Castle village",
+   name = _ "Fortified Village",
    func =  function(plr, shared_in_start)
 
    local sf = wl.Game().map.player_slots[plr.number].starting_field