Merge lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 7124
Proposed branch: lp:~widelands-dev/widelands/string_fix_headquarters
Merge into: lp:widelands
Diff against target: 123 lines (+11/-11)
8 files modified
campaigns/t03.wmf/scripting/texts.lua (+4/-4)
campaigns/tutorial01.wmf/scripting/texts.lua (+1/-1)
tribes/atlanteans/headquarters/help.lua (+1/-1)
tribes/barbarians/headquarters/help.lua (+1/-1)
tribes/barbarians/headquarters_interim/help.lua (+1/-1)
tribes/barbarians/reed_yard/help.lua (+1/-1)
tribes/empire/headquarters/help.lua (+1/-1)
tribes/empire/headquarters_shipwreck/help.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string_fix_headquarters
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+227543@code.launchpad.net

Description of the change

Small string fix

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 'campaigns/t03.wmf/scripting/texts.lua'
2--- campaigns/t03.wmf/scripting/texts.lua 2014-07-14 10:45:44 +0000
3+++ campaigns/t03.wmf/scripting/texts.lua 2014-07-21 14:07:54 +0000
4@@ -35,8 +35,8 @@
5 title = _ "Build a cattle farm",
6 number = 1,
7 body = objective_text(_"Remember to build a cattle farm",
8- _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly.)" ..
9- listitem_bullet(_"Remember to build a cattle farm!")
10+ _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly." ..
11+ listitem_bullet(_"Remember to build a cattle farm")
12 ),
13 }
14
15@@ -63,7 +63,7 @@
16 title=_"Build a mining infrastructure",
17 number = 6,
18 body = objective_text(_"Build a mining infrastructure",
19- listitem_bullet(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metalworks.")
20+ listitem_bullet(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop.")
21 ),
22 }
23
24@@ -106,7 +106,7 @@
25 listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
26 listitem_arrow(_"Training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight." ..
27 "<br>" ..
28- _"The attributes are: health points, attack, defense and evade.")
29+ _"The attributes are: health, attack, defense and evade.")
30 ),
31 }
32
33
34=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua'
35--- campaigns/tutorial01.wmf/scripting/texts.lua 2014-07-14 10:45:44 +0000
36+++ campaigns/tutorial01.wmf/scripting/texts.lua 2014-07-21 14:07:54 +0000
37@@ -381,7 +381,7 @@
38 p(_[[A soldier is created like any normal worker: a carrier grabs a tool in a warehouse as soon as a request for a certain profession is not fulfilled. The tool to create a barbarian soldier is an ax. Newly created soldiers are of level 0. To make soldiers better in any of the four categories, training is needed.]]) ..
39 p(_[[Training happens in training sites like the training camp or the battle arena: soldiers go there (as our little fellows are currently doing), consume some wares and advance a level in one category. If a barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual statistics have the following meaning:]]) ..
40 h2(_"Health:") ..
41- p(_[[The total life of a soldier. A barbarian soldier starts with ~130 health points, and with each health level he gains 28 health points.]]) ..
42+ p(_[[The total life of a soldier. A barbarian soldier starts with ~130 health, and with each health level he gains 28 health.]]) ..
43 h2(_"Attack:") ..
44 p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]]) ..
45 h2(_"Defense:") ..
46
47=== modified file 'tribes/atlanteans/headquarters/help.lua'
48--- tribes/atlanteans/headquarters/help.lua 2014-05-27 14:14:14 +0000
49+++ tribes/atlanteans/headquarters/help.lua 2014-07-21 14:07:54 +0000
50@@ -13,7 +13,7 @@
51 building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
52 --General Section
53 building_help_general_string("atlanteans", building_description, "carrier",
54- _"Accomodation for your people. Also stores your wares and tools.",
55+ _"Accommodation for your people. Also stores your wares and tools.",
56 _"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
57
58 --Building Section
59
60=== modified file 'tribes/barbarians/headquarters/help.lua'
61--- tribes/barbarians/headquarters/help.lua 2014-04-18 10:08:08 +0000
62+++ tribes/barbarians/headquarters/help.lua 2014-07-21 14:07:54 +0000
63@@ -13,7 +13,7 @@
64 building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
65 --General Section
66 building_help_general_string("barbarians", building_description, "carrier",
67- _"Accomodation for your people. Also stores your wares and tools.",
68+ _"Accommodation for your people. Also stores your wares and tools.",
69 _"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
70
71 --Building Section
72
73=== modified file 'tribes/barbarians/headquarters_interim/help.lua'
74--- tribes/barbarians/headquarters_interim/help.lua 2014-04-18 10:08:08 +0000
75+++ tribes/barbarians/headquarters_interim/help.lua 2014-07-21 14:07:54 +0000
76@@ -13,7 +13,7 @@
77 building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
78 --General Section
79 building_help_general_string("barbarians", building_description, "carrier",
80- _"Accomodation for your people. Also stores your wares and tools.",
81+ _"Accommodation for your people. Also stores your wares and tools.",
82 _"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
83
84 --Building Section
85
86=== modified file 'tribes/barbarians/reed_yard/help.lua'
87--- tribes/barbarians/reed_yard/help.lua 2014-05-26 18:14:46 +0000
88+++ tribes/barbarians/reed_yard/help.lua 2014-07-21 14:07:54 +0000
89@@ -15,7 +15,7 @@
90 --General Section
91 building_help_general_string("barbarians", building_description, "thatchreed",
92 _"The Reed Yard cultivates reed that serves two different purposes for the Barbarian tribe.",
93- "Thatch reed is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.") ..
94+ _"Thatch reed is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.") ..
95
96 --Dependencies
97 building_help_dependencies_production("barbarians", building_description, true) ..
98
99=== modified file 'tribes/empire/headquarters/help.lua'
100--- tribes/empire/headquarters/help.lua 2014-05-26 20:36:01 +0000
101+++ tribes/empire/headquarters/help.lua 2014-07-21 14:07:54 +0000
102@@ -13,7 +13,7 @@
103 building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
104 --General Section
105 building_help_general_string("empire", building_description, "carrier",
106- _"Accomodation for your people. Also stores your wares and tools.",
107+ _"Accommodation for your people. Also stores your wares and tools.",
108 _"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
109
110 --Building Section
111
112=== modified file 'tribes/empire/headquarters_shipwreck/help.lua'
113--- tribes/empire/headquarters_shipwreck/help.lua 2014-05-26 20:36:01 +0000
114+++ tribes/empire/headquarters_shipwreck/help.lua 2014-07-21 14:07:54 +0000
115@@ -13,7 +13,7 @@
116 building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
117 --General Section
118 building_help_general_string("empire", building_description, "carrier",
119- _"Although this ship ran aground, it still serves as accomodation for your people. It also stores your wares and tools.",
120+ _"Although this ship ran aground, it still serves as accommodation for your people. It also stores your wares and tools.",
121 _"The headquarters shipwreck is your main building." .. "<br>" .. _[[Text needed]]) ..
122
123 --Building Section

Subscribers

People subscribed via source and target branches

to status/vote changes: