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

Proposed by GunChleoc
Status: Merged
Merged at revision: 8316
Proposed branch: lp:~widelands-dev/widelands/string-fixes
Merge into: lp:widelands
Diff against target: 51 lines (+4/-4)
4 files modified
data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua (+1/-1)
data/txts/tips/barbarians.lua (+1/-1)
data/txts/tips/editor.lua (+1/-1)
data/txts/tips/empire.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string-fixes
Reviewer Review Type Date Requested Status
kaputtnik (community) Approve
Review via email: mp+318985@code.launchpad.net

Commit message

Small string fixes for issues reported on Transifex.

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

One nit, otherwise looks good to me.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Regarding your comment, I changed it due to the following feedback on Transifex:

Wait, so Jundlina writes a letter in which she writes that she will write a letter to Sidolus?
Perhaps we should just go with one of the older titles? It would fit perfectly well if she received a letter instead of writing one, for example.

Change it to "Jundlina Received a Message"?

Revision history for this message
kaputtnik (franku) wrote :

For me "Jundlina Writes a Letter" is the heading of this chapter. The header gives a hint on whats going on in the following text, but isn't a concrete part of the text.

Since i am not registered on transifex and you are the master of translation, feel free to change it as you like.

I am not good in explaining such things :D

Revision history for this message
GunChleoc (gunchleoc) wrote :

Since we don't have a consensus, I reverted it to the way it was. I don't have strong feelings about this string.

Ans even as master of strings I appreciate any feedback and improvement from others ;)

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2038. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207741512.
Appveyor build 1873. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-1873.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
2--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2016-12-06 18:41:32 +0000
3+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2017-03-04 18:35:47 +0000
4@@ -166,7 +166,7 @@
5 }
6
7 lumberjack_message_07 = {
8- title = _"Lumberjack is Done",
9+ title = _"The Lumberjack’s Hut is Done",
10 position = "topright",
11 body = rt(
12 p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the granite.]])
13
14=== modified file 'data/txts/tips/barbarians.lua'
15--- data/txts/tips/barbarians.lua 2017-03-02 11:09:27 +0000
16+++ data/txts/tips/barbarians.lua 2017-03-04 18:35:47 +0000
17@@ -9,7 +9,7 @@
18 seconds = 5
19 },
20 {
21- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
22+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
23 seconds = 7
24 },
25 }
26
27=== modified file 'data/txts/tips/editor.lua'
28--- data/txts/tips/editor.lua 2017-03-02 11:09:27 +0000
29+++ data/txts/tips/editor.lua 2017-03-04 18:35:47 +0000
30@@ -41,7 +41,7 @@
31 seconds = 7
32 },
33 {
34- text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or unbuildable terrain towards the west, northwest and northeast.",
35+ text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
36 seconds = 7
37 },
38 }
39
40=== modified file 'data/txts/tips/empire.lua'
41--- data/txts/tips/empire.lua 2017-03-02 11:09:27 +0000
42+++ data/txts/tips/empire.lua 2017-03-04 18:35:47 +0000
43@@ -9,7 +9,7 @@
44 seconds = 5
45 },
46 {
47- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
48+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
49 seconds = 7
50 },
51 {

Subscribers

People subscribed via source and target branches

to status/vote changes: