Merge lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands

Proposed by kaputtnik
Status: Merged
Merged at revision: 8949
Proposed branch: lp:~widelands-dev/widelands/bug-1807701_string_fixes_2
Merge into: lp:widelands
Diff against target: 24 lines (+1/-2)
2 files modified
data/txts/README.lua (+1/-1)
data/world/terrains/init.lua (+0/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1807701_string_fixes_2
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+361115@code.launchpad.net

Commit message

fixed some strings

Description of the change

Just a few string fixes

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

Continuous integration builds have changed state:

Travis build 4348. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469887381.
Appveyor build 4142. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1807701_string_fixes_2-4142.

8945. By kaputtnik

merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4354. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470617783.
Appveyor build 4148. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1807701_string_fixes_2-4148.

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM, thanks for catching these :)

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/txts/README.lua'
2--- data/txts/README.lua 2018-02-28 09:53:42 +0000
3+++ data/txts/README.lua 2018-12-20 16:45:50 +0000
4@@ -22,7 +22,7 @@
5
6 h2(_"Reporting Bugs") ..
7 p(_"If you encounter a bug, please report it to our bugtracker:") ..
8- p(a("widelands.org/wiki/ReportingBugs]")) ..
9+ p(a("widelands.org/wiki/ReportingBugs")) ..
10 p(_"Please provide enough background information. Tell us:") ..
11 p(
12 li(_"Detailed steps on how to trigger the bug, if possible.") ..
13
14=== modified file 'data/world/terrains/init.lua'
15--- data/world/terrains/init.lua 2018-11-03 11:14:46 +0000
16+++ data/world/terrains/init.lua 2018-12-20 16:45:50 +0000
17@@ -79,7 +79,6 @@
18 -- *Optional*. Additional custom tooltip entries, e.g.::
19 --
20 -- tooltips = {
21--- -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
22 -- _"likes trees",
23 -- },
24 --

Subscribers

People subscribed via source and target branches

to status/vote changes: