widelands

Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands

  1. string-fixes
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6949
Proposed branch: lp:~widelands-dev/widelands/string-fixes
Merge into: lp:widelands
Diff against target: 54 lines (+5/-5)
4 files modified
campaigns/atl01.wmf/scripting/texts.lua (+2/-2)
src/logic/production_program.cc (+1/-1)
src/ui_fsmenu/launchMPG.cc (+1/-1)
src/ui_fsmenu/mapselect.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string-fixes
Reviewer Review Type Date Requested Status
GunChleoc Pending
Widelands Developers Pending
Review via email: mp+216424@code.launchpad.net

Description of the change

A couple of string fixes, discovered while translating.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

+1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
2--- campaigns/atl01.wmf/scripting/texts.lua 2014-04-15 06:13:23 +0000
3+++ campaigns/atl01.wmf/scripting/texts.lua 2014-04-18 09:47:32 +0000
4@@ -67,9 +67,9 @@
5 [[otherwise the fish breeder won’t be able to breed new ones. ]] ..
6 [[The smoking happens in a smokery, you will need at least two of those.]]) .. [[<br>]] ..
7 [[• ]] .. _[[Build a farm and a blackroot farm]] .. "<br>" ..
8-[[• ]] .. _[[Build a mill to make flour and blackroot flour]] .. "<br>" ..
9+[[• ]] .. _[[Build a mill to make cornflour and blackroot flour]] .. "<br>" ..
10 [[• ]] .. _[[Build a well]] .. "<br>" ..
11-[[• ]] .. _[[Build a bakery to bake bread from flour, blackroot flour and water]] .. "<br>" ..
12+[[• ]] .. _[[Build a bakery to bake bread from cornflour, blackroot flour and water]] .. "<br>" ..
13 [[• ]] .. _[[Build a hunter’s house to get raw meat]] .. "<br>" ..
14 [[• ]] .. _[[Build a fisher’s house close to water to get raw fish]] .. "<br>" ..
15 [[• ]] .. _[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]] .. "<br>" ..
16
17=== modified file 'src/logic/production_program.cc'
18--- src/logic/production_program.cc 2014-04-13 19:23:43 +0000
19+++ src/logic/production_program.cc 2014-04-18 09:47:32 +0000
20@@ -1277,7 +1277,7 @@
21 _("Main Vein Exhausted"),
22 _
23 ("This mine’s main vein is exhausted. Expect strongly diminished returns on investment. "
24- "You should consider expanding, dismantling or destroying it."),
25+ "You should consider enhancing, dismantling or destroying it."),
26 true,
27 60 * 60 * 1000,
28 0);
29
30=== modified file 'src/ui_fsmenu/launchMPG.cc'
31--- src/ui_fsmenu/launchMPG.cc 2014-03-29 16:04:47 +0000
32+++ src/ui_fsmenu/launchMPG.cc 2014-04-18 09:47:32 +0000
33@@ -672,7 +672,7 @@
34 m_help->add_paragraph
35 (_
36 ("On the left side is a list of all clients including you. You can set your role "
37- "With the button following your nickname. Available roles are:"));
38+ "with the button following your nickname. Available roles are:"));
39 m_help->add_picture_li
40 (_
41 ("The player with the color of the flag. If more than one client selected the same color, these "
42
43=== modified file 'src/ui_fsmenu/mapselect.cc'
44--- src/ui_fsmenu/mapselect.cc 2014-03-29 16:04:47 +0000
45+++ src/ui_fsmenu/mapselect.cc 2014-04-18 09:47:32 +0000
46@@ -56,7 +56,7 @@
47 m_label_load_map_as_scenario
48 (this,
49 get_w() * 23 / 25, get_h() * 11 / 40,
50- _("Load Map as scenario"),
51+ _("Load map as scenario"),
52 UI::Align_Right),
53 m_label_name
54 (this,

Subscribers

People subscribed via source and target branches

to status/vote changes: