widelands

Merge lp:~hjd/widelands/bug717749 into lp:widelands

  1. bug717749
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merge reported by: SirVer
Merged at revision: not available
Proposed branch: lp:~hjd/widelands/bug717749
Merge into: lp:widelands
Diff against target: 29 lines (+3/-3)
3 files modified
tribes/atlanteans/fire_tongs/conf (+1/-1)
tribes/barbarians/fire_tongs/conf (+1/-1)
tribes/empire/fire_tongs/conf (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/bug717749
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+49510@code.launchpad.net

Description of the change

Updated fire tongs descriptions to use plural (closes bug #717749)

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

I am pro this change, but it isn't based on trunk, but on a eralier revision of the martin_i18n branch. It contains another commit by Jari that is not related to this change.

Therefore, i manually commmited the diff to trunk in r5828. This branch can therefore be set to merged or discarded.

review: Approve
Revision history for this message
SirVer (sirver) wrote :

Please ignore my prior remark. Your branch was perfectly fine, I was just a little too tired.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tribes/atlanteans/fire_tongs/conf'
2--- tribes/atlanteans/fire_tongs/conf 2010-08-01 14:35:38 +0000
3+++ tribes/atlanteans/fire_tongs/conf 2011-02-12 17:32:05 +0000
4@@ -1,4 +1,4 @@
5-help=_The fire tongs are the tools of the smelter, working in the smelting works. They are produced by the toolsmith.
6+help=_Fire tongs are tools of the smelter, who works in the smelting works. They are produced by the toolsmith.
7
8 [idle]
9 pics=idle.png
10
11=== modified file 'tribes/barbarians/fire_tongs/conf'
12--- tribes/barbarians/fire_tongs/conf 2010-11-09 14:14:57 +0000
13+++ tribes/barbarians/fire_tongs/conf 2011-02-12 17:32:05 +0000
14@@ -1,4 +1,4 @@
15-help=_The fire tongs are the tool of the smelter, working in the smelting works. Produced in the metal works (but ceases to be produced by the building if it is enhanced to an axefactory and war mill).
16+help=_Fire tongs are tools of the smelter, who works in the smelting works. Produced in the metal works (but ceases to be produced by the building if it is enhanced to an axefactory and war mill).
17
18 [idle]
19 pics=idle.png
20
21=== modified file 'tribes/empire/fire_tongs/conf'
22--- tribes/empire/fire_tongs/conf 2010-08-01 14:35:38 +0000
23+++ tribes/empire/fire_tongs/conf 2011-02-12 17:32:05 +0000
24@@ -1,4 +1,4 @@
25-help=_The fire tongs are the tool of the smelter, working in the smelting works. They are produced by the toolsmith.
26+help=_Fire tongs are tools of the smelter, who works in the smelting works. They are produced by the toolsmith.
27
28 [idle]
29 pics=idle.png

Subscribers

People subscribed via source and target branches

to status/vote changes: