widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands.

Commit message:
Unify german spelled terrains to english spelling.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1570086 in widelands: "Unify terrain names; put animated terrains in subfolders"
  https://bugs.launchpad.net/widelands/+bug/1570086

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572

Unify german spelled terrains to english spelling.

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands.

=== modified file 'data/world/terrains/init.lua'
--- data/world/terrains/init.lua	2016-03-01 06:50:23 +0000
+++ data/world/terrains/init.lua	2016-06-28 20:15:55 +0000
@@ -1,6 +1,6 @@
 -- Categories for the editor.
 world:new_editor_terrain_category{
-   name = "green",
+   name = "summer",
    descname = _ "Summer",
    picture = "world/pics/editor_terrain_category_green.png",
 }
@@ -27,13 +27,13 @@
 pics_dir = path.dirname(__file__) .. "pics/"
 world:new_terrain_type{
    -- The internal name of this terrain.
-   name = "wiese1",
+   name = "summer_meadow1",
 
    -- The name that will be used in UI and translated.
    descname = _ "Meadow 1",
 
    -- The category for sorting this into menus in the editor.
-   editor_category = "green",
+   editor_category = "summer",
 
    -- Type of terrain. Describes if the terrain is walkable, swimmable, if
    -- mines or buildings can be build on it, if flags can be build on it and so
@@ -63,7 +63,7 @@
    default_resource_amount = 10,
 
    -- The images used for this terrain.
-   textures = { pics_dir .. "green/wiese1_00.png" },
+   textures = { pics_dir .. "summer/meadow1_00.png" },
 
    -- This describes the z layer of the terrain when rendered next to another
    -- one and blending slightly over it to hide the triangles.
@@ -82,9 +82,9 @@
 
 
 world:new_terrain_type{
-   name = "wiese2",
+   name = "summer_meadow2",
    descname = _ "Meadow 2",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    tooltips = {
       -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -93,7 +93,7 @@
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
-   textures = { pics_dir .. "green/wiese2_00.png" },
+   textures = { pics_dir .. "summer/meadow2_00.png" },
    dither_layer = 350,
    temperature = 100,
    humidity = 0.6,
@@ -103,9 +103,9 @@
 
 
 world:new_terrain_type{
-   name = "wiese3",
+   name = "summer_meadow3",
    descname = _ "Meadow 3",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    tooltips = {
       -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -114,7 +114,7 @@
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
-   textures = { pics_dir .. "green/wiese3_00.png" },
+   textures = { pics_dir .. "summer/meadow3_00.png" },
    dither_layer = 350,
    temperature = 105,
    humidity = 0.55,
@@ -123,9 +123,9 @@
 
 
 world:new_terrain_type{
-   name = "wiese4",
+   name = "summer_meadow4",
    descname = _ "Meadow 4",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    tooltips = {
       -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -134,7 +134,7 @@
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
-   textures = { pics_dir .. "green/wiese4_00.png" },
+   textures = { pics_dir .. "summer/meadow4_00.png" },
    dither_layer = 350,
    temperature = 110,
    humidity = 0.65,
@@ -143,14 +143,14 @@
 
 
 world:new_terrain_type{
-   name = "steppe",
+   name = "summer_steppe",
    descname = _ "Steppe",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 5,
-   textures = { pics_dir .. "green/steppe_00.png" },
+   textures = { pics_dir .. "summer/steppe_00.png" },
    dither_layer = 330,
    temperature = 100,
    humidity = 0.4,
@@ -159,14 +159,14 @@
 
 
 world:new_terrain_type{
-   name = "steppe_kahl",
+   name = "summer_steppe_barren",
    descname = _ "Barren Steppe",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 4,
-   textures = { pics_dir .. "green/steppe_kahl_00.png" },
+   textures = { pics_dir .. "summer/steppe_barren_00.png" },
    dither_layer = 320,
    temperature = 100,
    humidity = 0.15,
@@ -175,14 +175,14 @@
 
 
 world:new_terrain_type{
-   name = "bergwiese",
+   name = "summer_mountain_meadow",
    descname = _ "Mountain Meadow",
-   editor_category = "green",
+   editor_category = "summer",
    is = "arable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/bergwiese_00.png" },
+   textures = { pics_dir .. "summer/mountain_maedow_00.png" },
    dither_layer = 160,
    temperature = 75,
    humidity = 0.8,
@@ -191,14 +191,14 @@
 
 
 world:new_terrain_type{
-   name = "berg1",
+   name = "summer_mountain1",
    descname = _ "Mountain 1",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/berg1_00.png" },
+   textures = { pics_dir .. "summer/mountain1_00.png" },
    dither_layer = 70,
    temperature = 80,
    humidity = 0.1,
@@ -207,14 +207,14 @@
 
 
 world:new_terrain_type{
-   name = "berg2",
+   name = "summer_mountain2",
    descname = _ "Mountain 2",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/berg2_00.png" },
+   textures = { pics_dir .. "summer/mountain2_00.png" },
    dither_layer = 70,
    temperature = 80,
    humidity = 0.1,
@@ -223,14 +223,14 @@
 
 
 world:new_terrain_type{
-   name = "berg3",
+   name = "summer_mountain3",
    descname = _ "Mountain 3",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/berg3_00.png" },
+   textures = { pics_dir .. "summer/mountain3_00.png" },
    dither_layer = 70,
    temperature = 80,
    humidity = 0.1,
@@ -239,14 +239,14 @@
 
 
 world:new_terrain_type{
-   name = "berg4",
+   name = "summer_mountain4",
    descname = _ "Mountain 4",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/berg4_00.png" },
+   textures = { pics_dir .. "summer/mountain4_00.png" },
    dither_layer = 70,
    temperature = 80,
    humidity = 0.1,
@@ -257,7 +257,7 @@
 world:new_terrain_type{
    name = "summer_forested_mountain1",
    descname = _ "Forested Mountain 1",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    -- You can add custom additional tooltip entries here.
    tooltips = {
@@ -267,7 +267,7 @@
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/forested_mountain1_00.png" },
+   textures = { pics_dir .. "summer/forested_mountain1_00.png" },
    dither_layer = 71,
    temperature = 50,
    humidity = 0.75,
@@ -277,7 +277,7 @@
 world:new_terrain_type{
    name = "summer_forested_mountain2",
    descname = _ "Forested Mountain 2",
-   editor_category = "green",
+   editor_category = "summer",
    is = "mineable",
    -- You can add custom additional tooltip entries here.
    tooltips = {
@@ -287,7 +287,7 @@
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/forested_mountain2_00.png" },
+   textures = { pics_dir .. "summer/forested_mountain2_00.png" },
    dither_layer = 71,
    temperature = 50,
    humidity = 0.75,
@@ -295,14 +295,14 @@
 }
 
 world:new_terrain_type{
-   name = "sumpf",
+   name = "summer_swamp",
    descname = _ "Swamp",
-   editor_category = "green",
+   editor_category = "summer",
    is = "unwalkable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 20,
-   textures = path.list_files(pics_dir .. "green/sumpf_??.png"),
+   textures = path.list_files(pics_dir .. "summer/swamp/swamp_??.png"),
    dither_layer = 370,
    fps = 14,
    temperature = 105,
@@ -311,28 +311,28 @@
 }
 
 world:new_terrain_type{
-   name = "strand",
+   name = "summer_beach",
    descname = _ "Beach",
-   editor_category = "green",
+   editor_category = "summer",
    is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/strand_00.png" },
+   textures = { pics_dir .. "summer/beach_00.png" },
    dither_layer = 60,
    temperature = 120,
    humidity = 0.6,
    fertility = 0.2,
 }
 world:new_terrain_type{
-   name = "schnee",
+   name = "summer_snow",
    descname = _ "Snow",
-   editor_category = "green",
+   editor_category = "summer",
    is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "green/schnee_00.png" },
+   textures = { pics_dir .. "summer/snow_00.png" },
    dither_layer = 220,
    temperature = 50,
    humidity = 0.999,
@@ -343,12 +343,12 @@
 world:new_terrain_type{
    name = "lava",
    descname = _ "Lava",
-   editor_category = "green",
+   editor_category = "summer",
    is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = path.list_files(pics_dir .. "green/lava_??.png"),
+   textures = path.list_files(pics_dir .. "summer/lava/lava_??.png"),
    dither_layer = 30,
    fps = 4,
    temperature = 1273.0,
@@ -358,14 +358,14 @@
 
 
 world:new_terrain_type{
-   name = "wasser",
+   name = "summer_water",
    descname = _ "Water",
-   editor_category = "green",
+   editor_category = "summer",
    is = "water",
    valid_resources = {"fish"},
    default_resource = "fish",
    default_resource_amount = 4,
-   textures = path.list_files(pics_dir .. "green/wasser_??.png"),
+   textures = path.list_files(pics_dir .. "summer/water/water_??.png"),
    dither_layer = 180,
    fps = 14,
    temperature = 100,
@@ -623,7 +623,7 @@
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "wasteland/strand_00.png" },
+   textures = { pics_dir .. "wasteland/beach_00.png" },
    dither_layer = 50,
    temperature = 60,
    humidity = 0.4,
@@ -639,7 +639,7 @@
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = path.list_files(pics_dir .. "wasteland/lava-stone1_??.png"),
+   textures = path.list_files(pics_dir .. "wasteland/lava_stone1/lava-stone1_??.png"),
    dither_layer = 20,
    fps = 7,
    temperature = 1273.0,
@@ -656,7 +656,7 @@
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = path.list_files(pics_dir .. "wasteland/lava-stone2_??.png"),
+   textures = path.list_files(pics_dir .. "wasteland/lava_stone2/lava-stone2_??.png"),
    dither_layer = 10,
    fps = 7,
    temperature = 1273.0,
@@ -673,7 +673,7 @@
    valid_resources = { "fish" },
    default_resource = "fish",
    default_resource_amount = 4,
-   textures = path.list_files(pics_dir .. "wasteland/water_??.png"),
+   textures = path.list_files(pics_dir .. "wasteland/water/water_??.png"),
    dither_layer = 170,
    fps = 14,
    temperature = 100,
@@ -920,7 +920,7 @@
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
-   textures = { pics_dir .. "winter/strand_00.png" },
+   textures = { pics_dir .. "winter/beach_00.png" },
    dither_layer = 40,
    temperature = 60,
    humidity = 0.5,
@@ -936,7 +936,7 @@
    valid_resources = {"fish"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = path.list_files(pics_dir .. "winter/ice_flows_??.png"),
+   textures = path.list_files(pics_dir .. "winter/ice_flows1/ice_flows_??.png"),
    dither_layer = 210,
    fps = 5,
    temperature = 50,
@@ -953,7 +953,7 @@
    valid_resources = {"fish"},
    default_resource = "",
    default_resource_amount = 0,
-   textures = path.list_files(pics_dir .. "winter/ice_flows2_??.png"),
+   textures = path.list_files(pics_dir .. "winter/ice_flows2/ice_flows2_??.png"),
    dither_layer = 210,
    fps = 5,
    temperature = 50,
@@ -970,7 +970,7 @@
    valid_resources = {"fish"},
    default_resource = "fish",
    default_resource_amount = 4,
-   textures = path.list_files(pics_dir .. "winter/water_??.png"),
+   textures = path.list_files(pics_dir .. "winter/water/water_??.png"),
    dither_layer = 190,
    fps = 8,
    temperature = 50,
@@ -1266,7 +1266,7 @@
    valid_resources = {"fish"},
    default_resource = "fish",
    default_resource_amount = 4,
-   textures = path.list_files(pics_dir .. "desert/wasser_??.png"),
+   textures = path.list_files(pics_dir .. "desert/water/water_??.png"),
    dither_layer = 200,
    fps = 5,
    temperature = 150,

=== added directory 'data/world/terrains/pics/desert/water'
=== renamed file 'data/world/terrains/pics/desert/wasser_00.png' => 'data/world/terrains/pics/desert/water/water_00.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_01.png' => 'data/world/terrains/pics/desert/water/water_01.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_02.png' => 'data/world/terrains/pics/desert/water/water_02.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_03.png' => 'data/world/terrains/pics/desert/water/water_03.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_04.png' => 'data/world/terrains/pics/desert/water/water_04.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_05.png' => 'data/world/terrains/pics/desert/water/water_05.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_06.png' => 'data/world/terrains/pics/desert/water/water_06.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_07.png' => 'data/world/terrains/pics/desert/water/water_07.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_08.png' => 'data/world/terrains/pics/desert/water/water_08.png'
=== renamed file 'data/world/terrains/pics/desert/wasser_09.png' => 'data/world/terrains/pics/desert/water/water_09.png'
=== renamed directory 'data/world/terrains/pics/green' => 'data/world/terrains/pics/summer'
=== renamed file 'data/world/terrains/pics/green/strand_00.png' => 'data/world/terrains/pics/summer/beach_00.png'
=== added directory 'data/world/terrains/pics/summer/lava'
=== renamed file 'data/world/terrains/pics/green/lava_00.png' => 'data/world/terrains/pics/summer/lava/lava_00.png'
=== renamed file 'data/world/terrains/pics/green/lava_01.png' => 'data/world/terrains/pics/summer/lava/lava_01.png'
=== renamed file 'data/world/terrains/pics/green/lava_02.png' => 'data/world/terrains/pics/summer/lava/lava_02.png'
=== renamed file 'data/world/terrains/pics/green/lava_03.png' => 'data/world/terrains/pics/summer/lava/lava_03.png'
=== renamed file 'data/world/terrains/pics/green/lava_04.png' => 'data/world/terrains/pics/summer/lava/lava_04.png'
=== renamed file 'data/world/terrains/pics/green/lava_05.png' => 'data/world/terrains/pics/summer/lava/lava_05.png'
=== renamed file 'data/world/terrains/pics/green/wiese1_00.png' => 'data/world/terrains/pics/summer/meadow1_00.png'
=== renamed file 'data/world/terrains/pics/green/wiese2_00.png' => 'data/world/terrains/pics/summer/meadow2_00.png'
=== renamed file 'data/world/terrains/pics/green/wiese3_00.png' => 'data/world/terrains/pics/summer/meadow3_00.png'
=== renamed file 'data/world/terrains/pics/green/wiese4_00.png' => 'data/world/terrains/pics/summer/meadow4_00.png'
=== renamed file 'data/world/terrains/pics/green/berg1_00.png' => 'data/world/terrains/pics/summer/mountain1_00.png'
=== renamed file 'data/world/terrains/pics/green/berg2_00.png' => 'data/world/terrains/pics/summer/mountain2_00.png'
=== renamed file 'data/world/terrains/pics/green/berg3_00.png' => 'data/world/terrains/pics/summer/mountain3_00.png'
=== renamed file 'data/world/terrains/pics/green/berg4_00.png' => 'data/world/terrains/pics/summer/mountain4_00.png'
=== renamed file 'data/world/terrains/pics/green/bergwiese_00.png' => 'data/world/terrains/pics/summer/mountain_maedow_00.png'
=== renamed file 'data/world/terrains/pics/green/schnee_00.png' => 'data/world/terrains/pics/summer/snow_00.png'
=== renamed file 'data/world/terrains/pics/green/steppe_kahl_00.png' => 'data/world/terrains/pics/summer/steppe_barren_00.png'
=== added directory 'data/world/terrains/pics/summer/swamp'
=== renamed file 'data/world/terrains/pics/green/sumpf_00.png' => 'data/world/terrains/pics/summer/swamp/swamp_00.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_01.png' => 'data/world/terrains/pics/summer/swamp/swamp_01.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_02.png' => 'data/world/terrains/pics/summer/swamp/swamp_02.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_03.png' => 'data/world/terrains/pics/summer/swamp/swamp_03.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_04.png' => 'data/world/terrains/pics/summer/swamp/swamp_04.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_05.png' => 'data/world/terrains/pics/summer/swamp/swamp_05.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_06.png' => 'data/world/terrains/pics/summer/swamp/swamp_06.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_07.png' => 'data/world/terrains/pics/summer/swamp/swamp_07.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_08.png' => 'data/world/terrains/pics/summer/swamp/swamp_08.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_09.png' => 'data/world/terrains/pics/summer/swamp/swamp_09.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_10.png' => 'data/world/terrains/pics/summer/swamp/swamp_10.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_11.png' => 'data/world/terrains/pics/summer/swamp/swamp_11.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_12.png' => 'data/world/terrains/pics/summer/swamp/swamp_12.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_13.png' => 'data/world/terrains/pics/summer/swamp/swamp_13.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_14.png' => 'data/world/terrains/pics/summer/swamp/swamp_14.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_15.png' => 'data/world/terrains/pics/summer/swamp/swamp_15.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_16.png' => 'data/world/terrains/pics/summer/swamp/swamp_16.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_17.png' => 'data/world/terrains/pics/summer/swamp/swamp_17.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_18.png' => 'data/world/terrains/pics/summer/swamp/swamp_18.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_19.png' => 'data/world/terrains/pics/summer/swamp/swamp_19.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_20.png' => 'data/world/terrains/pics/summer/swamp/swamp_20.png'
=== renamed file 'data/world/terrains/pics/green/sumpf_21.png' => 'data/world/terrains/pics/summer/swamp/swamp_21.png'
=== added directory 'data/world/terrains/pics/summer/water'
=== renamed file 'data/world/terrains/pics/green/wasser_00.png' => 'data/world/terrains/pics/summer/water/water_00.png'
=== renamed file 'data/world/terrains/pics/green/wasser_01.png' => 'data/world/terrains/pics/summer/water/water_01.png'
=== renamed file 'data/world/terrains/pics/green/wasser_02.png' => 'data/world/terrains/pics/summer/water/water_02.png'
=== renamed file 'data/world/terrains/pics/green/wasser_03.png' => 'data/world/terrains/pics/summer/water/water_03.png'
=== renamed file 'data/world/terrains/pics/green/wasser_04.png' => 'data/world/terrains/pics/summer/water/water_04.png'
=== renamed file 'data/world/terrains/pics/green/wasser_05.png' => 'data/world/terrains/pics/summer/water/water_05.png'
=== renamed file 'data/world/terrains/pics/green/wasser_06.png' => 'data/world/terrains/pics/summer/water/water_06.png'
=== renamed file 'data/world/terrains/pics/green/wasser_07.png' => 'data/world/terrains/pics/summer/water/water_07.png'
=== renamed file 'data/world/terrains/pics/green/wasser_08.png' => 'data/world/terrains/pics/summer/water/water_08.png'
=== renamed file 'data/world/terrains/pics/green/wasser_09.png' => 'data/world/terrains/pics/summer/water/water_09.png'
=== renamed file 'data/world/terrains/pics/green/wasser_10.png' => 'data/world/terrains/pics/summer/water/water_10.png'
=== renamed file 'data/world/terrains/pics/green/wasser_11.png' => 'data/world/terrains/pics/summer/water/water_11.png'
=== renamed file 'data/world/terrains/pics/green/wasser_12.png' => 'data/world/terrains/pics/summer/water/water_12.png'
=== renamed file 'data/world/terrains/pics/green/wasser_13.png' => 'data/world/terrains/pics/summer/water/water_13.png'
=== renamed file 'data/world/terrains/pics/green/wasser_14.png' => 'data/world/terrains/pics/summer/water/water_14.png'
=== renamed file 'data/world/terrains/pics/green/wasser_15.png' => 'data/world/terrains/pics/summer/water/water_15.png'
=== renamed file 'data/world/terrains/pics/green/wasser_16.png' => 'data/world/terrains/pics/summer/water/water_16.png'
=== renamed file 'data/world/terrains/pics/green/wasser_17.png' => 'data/world/terrains/pics/summer/water/water_17.png'
=== renamed file 'data/world/terrains/pics/green/wasser_18.png' => 'data/world/terrains/pics/summer/water/water_18.png'
=== renamed file 'data/world/terrains/pics/green/wasser_19.png' => 'data/world/terrains/pics/summer/water/water_19.png'
=== renamed file 'data/world/terrains/pics/green/wasser_20.png' => 'data/world/terrains/pics/summer/water/water_20.png'
=== renamed file 'data/world/terrains/pics/green/wasser_21.png' => 'data/world/terrains/pics/summer/water/water_21.png'
=== renamed file 'data/world/terrains/pics/green/wasser_22.png' => 'data/world/terrains/pics/summer/water/water_22.png'
=== renamed file 'data/world/terrains/pics/green/wasser_23.png' => 'data/world/terrains/pics/summer/water/water_23.png'
=== renamed file 'data/world/terrains/pics/green/wasser_24.png' => 'data/world/terrains/pics/summer/water/water_24.png'
=== renamed file 'data/world/terrains/pics/green/wasser_25.png' => 'data/world/terrains/pics/summer/water/water_25.png'
=== renamed file 'data/world/terrains/pics/green/wasser_26.png' => 'data/world/terrains/pics/summer/water/water_26.png'
=== renamed file 'data/world/terrains/pics/green/wasser_27.png' => 'data/world/terrains/pics/summer/water/water_27.png'
=== renamed file 'data/world/terrains/pics/green/wasser_28.png' => 'data/world/terrains/pics/summer/water/water_28.png'
=== renamed file 'data/world/terrains/pics/green/wasser_29.png' => 'data/world/terrains/pics/summer/water/water_29.png'
=== renamed file 'data/world/terrains/pics/green/wasser_30.png' => 'data/world/terrains/pics/summer/water/water_30.png'
=== renamed file 'data/world/terrains/pics/green/wasser_31.png' => 'data/world/terrains/pics/summer/water/water_31.png'
=== renamed file 'data/world/terrains/pics/green/wasser_32.png' => 'data/world/terrains/pics/summer/water/water_32.png'
=== renamed file 'data/world/terrains/pics/wasteland/strand_00.png' => 'data/world/terrains/pics/wasteland/beach_00.png'
=== added directory 'data/world/terrains/pics/wasteland/lava_stone1'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_00.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_00.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_01.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_01.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_02.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_02.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_03.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_03.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_04.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_04.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone1_05.png' => 'data/world/terrains/pics/wasteland/lava_stone1/lava-stone1_05.png'
=== added directory 'data/world/terrains/pics/wasteland/lava_stone2'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_00.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_00.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_01.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_01.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_02.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_02.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_03.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_03.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_04.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_04.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_05.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_05.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_06.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_06.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_07.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_07.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_08.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_08.png'
=== renamed file 'data/world/terrains/pics/wasteland/lava-stone2_09.png' => 'data/world/terrains/pics/wasteland/lava_stone2/lava-stone2_09.png'
=== added directory 'data/world/terrains/pics/wasteland/water'
=== renamed file 'data/world/terrains/pics/wasteland/water_00.png' => 'data/world/terrains/pics/wasteland/water/water_00.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_01.png' => 'data/world/terrains/pics/wasteland/water/water_01.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_02.png' => 'data/world/terrains/pics/wasteland/water/water_02.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_03.png' => 'data/world/terrains/pics/wasteland/water/water_03.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_04.png' => 'data/world/terrains/pics/wasteland/water/water_04.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_05.png' => 'data/world/terrains/pics/wasteland/water/water_05.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_06.png' => 'data/world/terrains/pics/wasteland/water/water_06.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_07.png' => 'data/world/terrains/pics/wasteland/water/water_07.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_08.png' => 'data/world/terrains/pics/wasteland/water/water_08.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_09.png' => 'data/world/terrains/pics/wasteland/water/water_09.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_10.png' => 'data/world/terrains/pics/wasteland/water/water_10.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_11.png' => 'data/world/terrains/pics/wasteland/water/water_11.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_12.png' => 'data/world/terrains/pics/wasteland/water/water_12.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_13.png' => 'data/world/terrains/pics/wasteland/water/water_13.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_14.png' => 'data/world/terrains/pics/wasteland/water/water_14.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_15.png' => 'data/world/terrains/pics/wasteland/water/water_15.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_16.png' => 'data/world/terrains/pics/wasteland/water/water_16.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_17.png' => 'data/world/terrains/pics/wasteland/water/water_17.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_18.png' => 'data/world/terrains/pics/wasteland/water/water_18.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_19.png' => 'data/world/terrains/pics/wasteland/water/water_19.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_20.png' => 'data/world/terrains/pics/wasteland/water/water_20.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_21.png' => 'data/world/terrains/pics/wasteland/water/water_21.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_22.png' => 'data/world/terrains/pics/wasteland/water/water_22.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_23.png' => 'data/world/terrains/pics/wasteland/water/water_23.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_24.png' => 'data/world/terrains/pics/wasteland/water/water_24.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_25.png' => 'data/world/terrains/pics/wasteland/water/water_25.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_26.png' => 'data/world/terrains/pics/wasteland/water/water_26.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_27.png' => 'data/world/terrains/pics/wasteland/water/water_27.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_28.png' => 'data/world/terrains/pics/wasteland/water/water_28.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_29.png' => 'data/world/terrains/pics/wasteland/water/water_29.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_30.png' => 'data/world/terrains/pics/wasteland/water/water_30.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_31.png' => 'data/world/terrains/pics/wasteland/water/water_31.png'
=== renamed file 'data/world/terrains/pics/wasteland/water_32.png' => 'data/world/terrains/pics/wasteland/water/water_32.png'
=== renamed file 'data/world/terrains/pics/winter/strand_00.png' => 'data/world/terrains/pics/winter/beach_00.png'
=== added directory 'data/world/terrains/pics/winter/ice_flows1'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_00.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_00.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_01.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_01.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_02.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_02.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_03.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_03.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_04.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_04.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_05.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_05.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_06.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_06.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows_07.png' => 'data/world/terrains/pics/winter/ice_flows1/ice_flows_07.png'
=== added directory 'data/world/terrains/pics/winter/ice_flows2'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_00.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_00.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_01.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_01.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_02.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_02.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_03.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_03.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_04.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_04.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_05.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_05.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_06.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_06.png'
=== renamed file 'data/world/terrains/pics/winter/ice_flows2_07.png' => 'data/world/terrains/pics/winter/ice_flows2/ice_flows2_07.png'
=== added directory 'data/world/terrains/pics/winter/water'
=== renamed file 'data/world/terrains/pics/winter/water_00.png' => 'data/world/terrains/pics/winter/water/water_00.png'
=== renamed file 'data/world/terrains/pics/winter/water_01.png' => 'data/world/terrains/pics/winter/water/water_01.png'
=== renamed file 'data/world/terrains/pics/winter/water_02.png' => 'data/world/terrains/pics/winter/water/water_02.png'
=== renamed file 'data/world/terrains/pics/winter/water_03.png' => 'data/world/terrains/pics/winter/water/water_03.png'
=== renamed file 'data/world/terrains/pics/winter/water_04.png' => 'data/world/terrains/pics/winter/water/water_04.png'
=== renamed file 'data/world/terrains/pics/winter/water_05.png' => 'data/world/terrains/pics/winter/water/water_05.png'
=== renamed file 'data/world/terrains/pics/winter/water_06.png' => 'data/world/terrains/pics/winter/water/water_06.png'
=== renamed file 'data/world/terrains/pics/winter/water_07.png' => 'data/world/terrains/pics/winter/water/water_07.png'
=== renamed file 'data/world/terrains/pics/winter/water_08.png' => 'data/world/terrains/pics/winter/water/water_08.png'
=== renamed file 'data/world/terrains/pics/winter/water_09.png' => 'data/world/terrains/pics/winter/water/water_09.png'
=== renamed file 'data/world/terrains/pics/winter/water_10.png' => 'data/world/terrains/pics/winter/water/water_10.png'
=== modified file 'src/map_io/world_legacy_lookup_table.cc'
--- src/map_io/world_legacy_lookup_table.cc	2015-11-02 19:29:03 +0000
+++ src/map_io/world_legacy_lookup_table.cc	2016-06-28 20:15:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2015 by the Widelands Development Team
+ * Copyright (C) 2006-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -38,6 +38,7 @@
 private:
 	const std::map<std::string, std::string> immovables_;
 	const std::map<std::string, std::string> resources_;
+	const std::map<std::string, std::string> terrains_;
 };
 
 PostOneWorldLegacyLookupTable::PostOneWorldLegacyLookupTable() :
@@ -71,6 +72,27 @@
 resources_
 {
 	{"granite", "stones"},
+},
+
+// Renamed german spelled terrains into english
+terrains_
+{
+	{"wiese1", "summer_meadow1"},
+	{"wiese2", "summer_meadow2"},
+	{"wiese3", "summer_meadow3"},
+	{"wiese4", "summer_meadow4"},
+	{"berg4", "summer_mountain4"},
+	{"steppe", "summer_steppe"},
+	{"steppe_kahl", "summer_steppe_barren"},
+	{"bergwiese", "summer_mountain_meadow"},
+	{"berg1", "summer_mountain1"},
+	{"berg2", "summer_mountain2"},
+	{"berg3", "summer_mountain3"},
+	{"berg4", "summer_mountain4"},
+	{"sumpf", "summer_swamp"},
+	{"strand", "summer_beach"},
+	{"schnee", "summer_snow"},
+	{"wasser", "summer_water"},
 }
 {}
 
@@ -84,7 +106,11 @@
 }
 
 std::string PostOneWorldLegacyLookupTable::lookup_terrain(const std::string& terrain) const {
-	return terrain;
+	const auto& i = terrains_.find(terrain);
+	if (i == terrains_.end()) {
+		return terrain;
+	}
+	return i->second;
 }
 
 std::string PostOneWorldLegacyLookupTable::lookup_critter(const std::string& critter) const {