widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1289586 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1289586 in widelands: "Let tree descriptions use the same size scheme as buildings"
  https://bugs.launchpad.net/widelands/+bug/1289586

For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/bug-1289586/+merge/210060

Tree sizes renamed :)
-- 
https://code.launchpad.net/~gunchleoc/widelands/bug-1289586/+merge/210060
Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/bug-1289586 into lp:widelands.

=== modified file 'worlds/blackland/conf'
--- worlds/blackland/conf	2014-02-26 21:20:10 +0000
+++ worlds/blackland/conf	2014-03-08 20:46:35 +0000
@@ -42,38 +42,42 @@
 stones4=_Stones
 stones5=_Stones
 stones6=_Stones
-tree1=_Aspen
-tree1_m=_Aspen (medium)
-tree1_s=_Aspen (small)
-tree1_t=_Aspen (tiny)
-tree2=_Oak
-tree2_m=_Oak (medium)
-tree2_s=_Oak (small)
-tree2_t=_Oak (tiny)
-tree3=_Spruce
-tree3_m=_Spruce (medium)
-tree3_s=_Spruce (small)
-tree3_t=_Spruce (tiny)
-tree4=_Maple
-tree4_m=_Maple (medium)
-tree4_s=_Maple (small)
-tree4_t=_Maple (tiny)
-tree5=_Birch
-tree5_m=_Birch (medium)
-tree5_s=_Birch (small)
-tree5_t=_Birch (tiny)
-tree6=_Beech
-tree6_m=_Beech (medium)
-tree6_s=_Beech (small)
-tree6_t=_Beech (tiny)
-tree7=_Larch
-tree7_m=_Larch (medium)
-tree7_s=_Larch (small)
-tree7_t=_Larch (tiny)
-tree8=_Rowan
-tree8_m=_Rowan (medium)
-tree8_s=_Rowan (small)
-tree8_t=_Rowan (tiny)
+# TRANSLATORS: Old tree: dominate old growth forest; height growth slows greatly, with majority of productivity in seed production
+tree1=_Aspen (Old)
+# TRANSLATORS: Mature tree: over 30 cm diameter, reproductive years begin
+tree1_m=_Aspen (Mature)
+# TRANSLATORS: Pole: young trees from 7-30 cm diameter
+tree1_s=_Aspen (Pole)
+# TRANSLATORS: Sapling: After the seedling reaches 1 m tall, and until it reaches 7 cm in stem diameter
+tree1_t=_Aspen (Sapling)
+tree2=_Oak (Old)
+tree2_m=_Oak (Mature)
+tree2_s=_Oak (Pole)
+tree2_t=_Oak (Sapling)
+tree3=_Spruce (Old)
+tree3_m=_Spruce (Mature)
+tree3_s=_Spruce (Pole)
+tree3_t=_Spruce (Sapling)
+tree4=_Maple (Old)
+tree4_m=_Maple (Mature)
+tree4_s=_Maple (Pole)
+tree4_t=_Maple (Sapling)
+tree5=_Birch (Old)
+tree5_m=_Birch (Mature)
+tree5_s=_Birch (Pole)
+tree5_t=_Birch (Sapling)
+tree6=_Beech (Old)
+tree6_m=_Beech (Mature)
+tree6_s=_Beech (Pole)
+tree6_t=_Beech (Sapling)
+tree7=_Larch (Old)
+tree7_m=_Larch (Mature)
+tree7_s=_Larch (Pole)
+tree7_t=_Larch (Sapling)
+tree8=_Rowan (Old)
+tree8_m=_Rowan (Mature)
+tree8_s=_Rowan (Pole)
+tree8_t=_Rowan (Sapling)
 
 [critter bob types]
 bunny=_Bunny

=== modified file 'worlds/desert/conf'
--- worlds/desert/conf	2014-02-26 21:20:10 +0000
+++ worlds/desert/conf	2014-03-08 20:46:35 +0000
@@ -48,38 +48,43 @@
 stones4=_Stones
 stones5=_Stones
 stones6=_Stones
-tree1=_Palm
-tree1_m=_Palm (medium)
-tree1_s=_Palm (small)
-tree1_t=_Palm (tiny)
-tree2=_Palm
-tree2_m=_Palm (medium)
-tree2_s=_Palm (small)
-tree2_t=_Palm (tiny)
-tree3=_Palm
-tree3_m=_Palm (medium)
-tree3_s=_Palm (small)
-tree3_t=_Palm (tiny)
-tree4=_Palm
-tree4_m=_Palm (medium)
-tree4_s=_Palm (small)
-tree4_t=_Palm (tiny)
-tree5=_Palm
-tree5_m=_Palm (medium)
-tree5_s=_Palm (small)
-tree5_t=_Palm (tiny)
-tree6=_Beech
-tree6_m=_Beech (medium)
-tree6_s=_Beech (small)
-tree6_t=_Beech (tiny)
-tree7=_Larch
-tree7_m=_Larch (medium)
-tree7_s=_Larch (small)
-tree7_t=_Larch (tiny)
-tree8=_Rowan
-tree8_m=_Rowan (medium)
-tree8_s=_Rowan (small)
-tree8_t=_Rowan (tiny)
+
+# TRANSLATORS: Old tree: dominate old growth forest; height growth slows greatly, with majority of productivity in seed production
+tree1=_Palm (Old)
+# TRANSLATORS: Mature tree: over 30 cm diameter, reproductive years begin
+tree1_m=_Palm (Mature)
+# TRANSLATORS: Pole: young trees from 7-30 cm diameter
+tree1_s=_Palm (Pole)
+# TRANSLATORS: Sapling: After the seedling reaches 1 m tall, and until it reaches 7 cm in stem diameter
+tree1_t=_Palm (Sapling)
+tree2=_Palm (Old)
+tree2_m=_Palm (Mature)
+tree2_s=_Palm (Pole)
+tree2_t=_Palm (Sapling)
+tree3=_Palm (Old)
+tree3_m=_Palm (Mature)
+tree3_s=_Palm (Pole)
+tree3_t=_Palm (Sapling)
+tree4=_Palm (Old)
+tree4_m=_Palm (Mature)
+tree4_s=_Palm (Pole)
+tree4_t=_Palm (Sapling)
+tree5=_Palm (Old)
+tree5_m=_Palm (Mature)
+tree5_s=_Palm (Pole)
+tree5_t=_Palm (Sapling)
+tree6=_Beech (Old)
+tree6_m=_Beech (Mature)
+tree6_s=_Beech (Pole)
+tree6_t=_Beech (Sapling)
+tree7=_Larch (Old)
+tree7_m=_Larch (Mature)
+tree7_s=_Larch (Pole)
+tree7_t=_Larch (Sapling)
+tree8=_Rowan (Old)
+tree8_m=_Rowan (Mature)
+tree8_s=_Rowan (Pole)
+tree8_t=_Rowan (Sapling)
 
 [critter bob types]
 bunny=_Bunny

=== modified file 'worlds/greenland/conf'
--- worlds/greenland/conf	2014-02-26 21:20:10 +0000
+++ worlds/greenland/conf	2014-03-08 20:46:35 +0000
@@ -43,38 +43,42 @@
 stones4=_Stones
 stones5=_Stones
 stones6=_Stones
-tree1=_Aspen
-tree1_m=_Aspen (medium)
-tree1_s=_Aspen (small)
-tree1_t=_Aspen (tiny)
-tree2=_Oak
-tree2_m=_Oak (medium)
-tree2_s=_Oak (small)
-tree2_t=_Oak (tiny)
-tree3=_Spruce
-tree3_m=_Spruce (medium)
-tree3_s=_Spruce (small)
-tree3_t=_Spruce (tiny)
-tree4=_Alder
-tree4_m=_Alder (medium)
-tree4_s=_Alder (small)
-tree4_t=_Alder (tiny)
-tree5=_Birch
-tree5_m=_Birch (medium)
-tree5_s=_Birch (small)
-tree5_t=_Birch (tiny)
-tree6=_Beech
-tree6_m=_Beech (medium)
-tree6_s=_Beech (small)
-tree6_t=_Beech (tiny)
-tree7=_Larch
-tree7_m=_Larch (medium)
-tree7_s=_Larch (small)
-tree7_t=_Larch (tiny)
-tree8=_Rowan
-tree8_m=_Rowan (medium)
-tree8_s=_Rowan (small)
-tree8_t=_Rowan (tiny)
+# TRANSLATORS: Old tree: dominate old growth forest; height growth slows greatly, with majority of productivity in seed production
+tree1=_Aspen (Old)
+# TRANSLATORS: Mature tree: over 30 cm diameter, reproductive years begin
+tree1_m=_Aspen (Mature)
+# TRANSLATORS: Pole: young trees from 7-30 cm diameter
+tree1_s=_Aspen (Pole)
+# TRANSLATORS: Sapling: After the seedling reaches 1 m tall, and until it reaches 7 cm in stem diameter
+tree1_t=_Aspen (Sapling)
+tree2=_Oak (Old)
+tree2_m=_Oak (Mature)
+tree2_s=_Oak (Pole)
+tree2_t=_Oak (Sapling)
+tree3=_Spruce (Old)
+tree3_m=_Spruce (Mature)
+tree3_s=_Spruce (Pole)
+tree3_t=_Spruce (Sapling)
+tree4=_Alder (Old)
+tree4_m=_Alder (Mature)
+tree4_s=_Alder (Pole)
+tree4_t=_Alder (Sapling)
+tree5=_Birch (Old)
+tree5_m=_Birch (Mature)
+tree5_s=_Birch (Pole)
+tree5_t=_Birch (Sapling)
+tree6=_Beech (Old)
+tree6_m=_Beech (Mature)
+tree6_s=_Beech (Pole)
+tree6_t=_Beech (Sapling)
+tree7=_Larch (Old)
+tree7_m=_Larch (Mature)
+tree7_s=_Larch (Pole)
+tree7_t=_Larch (Sapling)
+tree8=_Rowan (Old)
+tree8_m=_Rowan (Mature)
+tree8_s=_Rowan (Pole)
+tree8_t=_Rowan (Sapling)
 
 [critter bob types]
 badger=_Badger

=== modified file 'worlds/winterland/conf'
--- worlds/winterland/conf	2014-02-26 21:20:10 +0000
+++ worlds/winterland/conf	2014-03-08 20:46:35 +0000
@@ -42,38 +42,42 @@
 stones5=_Stones
 stones6=_Stones
 track=_Track
-tree1=_Aspen
-tree1_m=_Aspen (medium)
-tree1_s=_Aspen (small)
-tree1_t=_Aspen (tiny)
-tree2=_Oak
-tree2_m=_Oak (medium)
-tree2_s=_Oak (small)
-tree2_t=_Oak (tiny)
-tree3=_Spruce
-tree3_m=_Spruce (medium)
-tree3_s=_Spruce (small)
-tree3_t=_Spruce (tiny)
-tree4=_Maple
-tree4_m=_Maple (medium)
-tree4_s=_Maple (small)
-tree4_t=_Maple (tiny)
-tree5=_Birch
-tree5_m=_Birch (medium)
-tree5_s=_Birch (small)
-tree5_t=_Birch (tiny)
-tree6=_Beech
-tree6_m=_Beech (medium)
-tree6_s=_Beech (small)
-tree6_t=_Beech (tiny)
-tree7=_Larch
-tree7_m=_Larch (medium)
-tree7_s=_Larch (small)
-tree7_t=_Larch (tiny)
-tree8=_Rowan
-tree8_m=_Rowan (medium)
-tree8_s=_Rowan (small)
-tree8_t=_Rowan (tiny)
+# TRANSLATORS: Old tree: dominate old growth forest; height growth slows greatly, with majority of productivity in seed production
+tree1=_Aspen (Old)
+# TRANSLATORS: Mature tree: over 30 cm diameter, reproductive years begin
+tree1_m=_Aspen (Mature)
+# TRANSLATORS: Pole: young trees from 7-30 cm diameter
+tree1_s=_Aspen (Pole)
+# TRANSLATORS: Sapling: After the seedling reaches 1 m tall, and until it reaches 7 cm in stem diameter
+tree1_t=_Aspen (Sapling)
+tree2=_Oak (Old)
+tree2_m=_Oak (Mature)
+tree2_s=_Oak (Pole)
+tree2_t=_Oak (Sapling)
+tree3=_Spruce (Old)
+tree3_m=_Spruce (Mature)
+tree3_s=_Spruce (Pole)
+tree3_t=_Spruce (Sapling)
+tree4=_Maple (Old)
+tree4_m=_Maple (Mature)
+tree4_s=_Maple (Pole)
+tree4_t=_Maple (Sapling)
+tree5=_Birch (Old)
+tree5_m=_Birch (Mature)
+tree5_s=_Birch (Pole)
+tree5_t=_Birch (Sapling)
+tree6=_Beech (Old)
+tree6_m=_Beech (Mature)
+tree6_s=_Beech (Pole)
+tree6_t=_Beech (Sapling)
+tree7=_Larch (Old)
+tree7_m=_Larch (Mature)
+tree7_s=_Larch (Pole)
+tree7_t=_Larch (Sapling)
+tree8=_Rowan (Old)
+tree8_m=_Rowan (Mature)
+tree8_s=_Rowan (Pole)
+tree8_t=_Rowan (Sapling)
 
 [critter bob types]
 badger=_Badger