widelands

Merge lp:~widelands-dev/widelands/world-stringfix into lp:widelands

  1. world-stringfix
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7069
Proposed branch: lp:~widelands-dev/widelands/world-stringfix
Merge into: lp:widelands
Diff against target: 289 lines (+33/-1)
8 files modified
world/immovables/trees/cirrus/init.lua (+5/-1)
world/immovables/trees/liana/init.lua (+4/-0)
world/immovables/trees/mushroom_dark/init.lua (+4/-0)
world/immovables/trees/mushroom_green/init.lua (+4/-0)
world/immovables/trees/mushroom_red/init.lua (+4/-0)
world/immovables/trees/twine/init.lua (+4/-0)
world/immovables/trees/umbrella_green/init.lua (+4/-0)
world/immovables/trees/umbrella_red/init.lua (+4/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/world-stringfix
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+226426@code.launchpad.net

Description of the change

Removed a blank space from tree name + added some translator comments

ETA: Already fixed by other merge request, but please merge anyway for the added comments.

https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'world/immovables/trees/cirrus/init.lua'
2--- world/immovables/trees/cirrus/init.lua 2014-07-05 14:09:47 +0000
3+++ world/immovables/trees/cirrus/init.lua 2014-07-11 09:52:56 +0000
4@@ -9,7 +9,8 @@
5
6 world:new_immovable_type{
7 name = "cirrus_wasteland_sapling",
8- descname = _ " Cirrus Tree (Sapling)",
9+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
10+ descname = _ "Cirrus Tree (Sapling)",
11 editor_category = "trees_wasteland",
12 size = "small",
13 attributes = { "tree_sapling" },
14@@ -32,6 +33,7 @@
15
16 world:new_immovable_type{
17 name = "cirrus_wasteland_pole",
18+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
19 descname = _ "Cirrus Tree (Pole)",
20 editor_category = "trees_wasteland",
21 size = "small",
22@@ -55,6 +57,7 @@
23
24 world:new_immovable_type{
25 name = "cirrus_wasteland_mature",
26+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
27 descname = _ "Cirrus Tree (Mature)",
28 editor_category = "trees_wasteland",
29 size = "small",
30@@ -78,6 +81,7 @@
31
32 world:new_immovable_type{
33 name = "cirrus_wasteland_old",
34+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
35 descname = _ "Cirrus Tree (Old)",
36 editor_category = "trees_wasteland",
37 size = "small",
38
39=== modified file 'world/immovables/trees/liana/init.lua'
40--- world/immovables/trees/liana/init.lua 2014-07-05 14:09:47 +0000
41+++ world/immovables/trees/liana/init.lua 2014-07-11 09:52:56 +0000
42@@ -9,6 +9,7 @@
43
44 world:new_immovable_type{
45 name = "liana_wasteland_sapling",
46+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
47 descname = _ "Liana Tree (Sapling)",
48 editor_category = "trees_wasteland",
49 size = "small",
50@@ -32,6 +33,7 @@
51
52 world:new_immovable_type{
53 name = "liana_wasteland_pole",
54+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
55 descname = _ "Liana Tree (Pole)",
56 editor_category = "trees_wasteland",
57 size = "small",
58@@ -55,6 +57,7 @@
59
60 world:new_immovable_type{
61 name = "liana_wasteland_mature",
62+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
63 descname = _ "Liana Tree (Mature)",
64 editor_category = "trees_wasteland",
65 size = "small",
66@@ -81,6 +84,7 @@
67
68 world:new_immovable_type{
69 name = "liana_wasteland_old",
70+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
71 descname = _ "Liana Tree (Old)",
72 editor_category = "trees_wasteland",
73 size = "small",
74
75=== modified file 'world/immovables/trees/mushroom_dark/init.lua'
76--- world/immovables/trees/mushroom_dark/init.lua 2014-07-05 14:09:47 +0000
77+++ world/immovables/trees/mushroom_dark/init.lua 2014-07-11 09:52:56 +0000
78@@ -9,6 +9,7 @@
79
80 world:new_immovable_type{
81 name = "mushroom_dark_wasteland_sapling",
82+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
83 descname = _ "Dark Mushroom Tree (Sapling)",
84 editor_category = "trees_wasteland",
85 size = "small",
86@@ -32,6 +33,7 @@
87
88 world:new_immovable_type{
89 name = "mushroom_dark_wasteland_pole",
90+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
91 descname = _ "Dark Mushroom Tree (Pole)",
92 editor_category = "trees_wasteland",
93 size = "small",
94@@ -55,6 +57,7 @@
95
96 world:new_immovable_type{
97 name = "mushroom_dark_wasteland_mature",
98+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
99 descname = _ "Dark Mushroom Tree (Mature)",
100 editor_category = "trees_wasteland",
101 size = "small",
102@@ -78,6 +81,7 @@
103
104 world:new_immovable_type{
105 name = "mushroom_dark_wasteland_old",
106+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
107 descname = _ "Dark Mushroom Tree (Old)",
108 editor_category = "trees_wasteland",
109 size = "small",
110
111=== modified file 'world/immovables/trees/mushroom_green/init.lua'
112--- world/immovables/trees/mushroom_green/init.lua 2014-07-05 14:09:47 +0000
113+++ world/immovables/trees/mushroom_green/init.lua 2014-07-11 09:52:56 +0000
114@@ -9,6 +9,7 @@
115
116 world:new_immovable_type{
117 name = "mushroom_green_wasteland_sapling",
118+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
119 descname = _ "Green Mushroom Tree (Sapling)",
120 editor_category = "trees_wasteland",
121 size = "small",
122@@ -32,6 +33,7 @@
123
124 world:new_immovable_type{
125 name = "mushroom_green_wasteland_pole",
126+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
127 descname = _ "Green Mushroom Tree (Pole)",
128 editor_category = "trees_wasteland",
129 size = "small",
130@@ -55,6 +57,7 @@
131
132 world:new_immovable_type{
133 name = "mushroom_green_wasteland_mature",
134+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
135 descname = _ "Green Mushroom Tree (Mature)",
136 editor_category = "trees_wasteland",
137 size = "small",
138@@ -78,6 +81,7 @@
139
140 world:new_immovable_type{
141 name = "mushroom_green_wasteland_old",
142+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
143 descname = _ "Green Mushroom Tree (Old)",
144 editor_category = "trees_wasteland",
145 size = "small",
146
147=== modified file 'world/immovables/trees/mushroom_red/init.lua'
148--- world/immovables/trees/mushroom_red/init.lua 2014-07-05 14:09:47 +0000
149+++ world/immovables/trees/mushroom_red/init.lua 2014-07-11 09:52:56 +0000
150@@ -9,6 +9,7 @@
151
152 world:new_immovable_type{
153 name = "mushroom_red_wasteland_sapling",
154+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
155 descname = _ "Red Mushroom Tree (Sapling)",
156 editor_category = "trees_wasteland",
157 size = "small",
158@@ -32,6 +33,7 @@
159
160 world:new_immovable_type{
161 name = "mushroom_red_wasteland_pole",
162+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
163 descname = _ "Red Mushroom Tree (Pole)",
164 editor_category = "trees_wasteland",
165 size = "small",
166@@ -55,6 +57,7 @@
167
168 world:new_immovable_type{
169 name = "mushroom_red_wasteland_mature",
170+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
171 descname = _ "Red Mushroom Tree (Mature)",
172 editor_category = "trees_wasteland",
173 size = "small",
174@@ -81,6 +84,7 @@
175
176 world:new_immovable_type{
177 name = "mushroom_red_wasteland_old",
178+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
179 descname = _ "Red Mushroom Tree (Old)",
180 editor_category = "trees_wasteland",
181 size = "small",
182
183=== modified file 'world/immovables/trees/twine/init.lua'
184--- world/immovables/trees/twine/init.lua 2014-07-05 14:09:47 +0000
185+++ world/immovables/trees/twine/init.lua 2014-07-11 09:52:56 +0000
186@@ -9,6 +9,7 @@
187
188 world:new_immovable_type{
189 name = "twine_wasteland_sapling",
190+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
191 descname = _ "Twine Tree (Sapling)",
192 editor_category = "trees_wasteland",
193 size = "small",
194@@ -32,6 +33,7 @@
195
196 world:new_immovable_type{
197 name = "twine_wasteland_pole",
198+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
199 descname = _ "Twine Tree (Pole)",
200 editor_category = "trees_wasteland",
201 size = "small",
202@@ -55,6 +57,7 @@
203
204 world:new_immovable_type{
205 name = "twine_wasteland_mature",
206+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
207 descname = _ "Twine Tree (Mature)",
208 editor_category = "trees_wasteland",
209 size = "small",
210@@ -78,6 +81,7 @@
211
212 world:new_immovable_type{
213 name = "twine_wasteland_old",
214+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
215 descname = _ "Twine Tree (Old)",
216 editor_category = "trees_wasteland",
217 size = "small",
218
219=== modified file 'world/immovables/trees/umbrella_green/init.lua'
220--- world/immovables/trees/umbrella_green/init.lua 2014-07-05 14:09:47 +0000
221+++ world/immovables/trees/umbrella_green/init.lua 2014-07-11 09:52:56 +0000
222@@ -9,6 +9,7 @@
223
224 world:new_immovable_type{
225 name = "umbrella_green_wasteland_sapling",
226+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
227 descname = _ "Green Umbrella Tree (Sapling)",
228 editor_category = "trees_wasteland",
229 size = "small",
230@@ -32,6 +33,7 @@
231
232 world:new_immovable_type{
233 name = "umbrella_green_wasteland_pole",
234+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
235 descname = _ "Green Umbrella Tree (Pole)",
236 editor_category = "trees_wasteland",
237 size = "small",
238@@ -55,6 +57,7 @@
239
240 world:new_immovable_type{
241 name = "umbrella_green_wasteland_mature",
242+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
243 descname = _ "Green Umbrella Tree (Mature)",
244 editor_category = "trees_wasteland",
245 size = "small",
246@@ -78,6 +81,7 @@
247
248 world:new_immovable_type{
249 name = "umbrella_green_wasteland_old",
250+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
251 descname = _ "Green Umbrella Tree (Old)",
252 editor_category = "trees_wasteland",
253 size = "small",
254
255=== modified file 'world/immovables/trees/umbrella_red/init.lua'
256--- world/immovables/trees/umbrella_red/init.lua 2014-07-05 14:09:47 +0000
257+++ world/immovables/trees/umbrella_red/init.lua 2014-07-11 09:52:56 +0000
258@@ -9,6 +9,7 @@
259
260 world:new_immovable_type{
261 name = "umbrella_red_wasteland_sapling",
262+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
263 descname = _ "Red Umbrella Tree (Sapling)",
264 editor_category = "trees_wasteland",
265 size = "small",
266@@ -32,6 +33,7 @@
267
268 world:new_immovable_type{
269 name = "umbrella_red_wasteland_pole",
270+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
271 descname = _ "Red Umbrella Tree (Pole)",
272 editor_category = "trees_wasteland",
273 size = "small",
274@@ -55,6 +57,7 @@
275
276 world:new_immovable_type{
277 name = "umbrella_red_wasteland_mature",
278+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
279 descname = _ "Red Umbrella Tree (Mature)",
280 editor_category = "trees_wasteland",
281 size = "small",
282@@ -81,6 +84,7 @@
283
284 world:new_immovable_type{
285 name = "umbrella_red_wasteland_old",
286+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
287 descname = _ "Red Umbrella Tree (Old)",
288 editor_category = "trees_wasteland",
289 size = "small",

Subscribers

People subscribed via source and target branches

to status/vote changes: