Merge lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 6853
Proposed branch: lp:~gunchleoc/widelands/i18n-20140406
Merge into: lp:widelands
Diff against target: 71 lines (+7/-7)
5 files modified
campaigns/tutorial01.wmf/scripting/texts.lua (+3/-3)
tribes/barbarians/fishers_hut/help.lua (+1/-1)
tribes/barbarians/gamekeepers_hut/help.lua (+1/-1)
tribes/barbarians/hunters_hut/help.lua (+1/-1)
tribes/barbarians/quarry/help.lua (+1/-1)
To merge this branch: bzr merge lp:~gunchleoc/widelands/i18n-20140406
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+209770@code.launchpad.net

Description of the change

Some small string bugfixes for i18n.

Catalogs will need rebuilding after the merge.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua'
--- campaigns/tutorial01.wmf/scripting/texts.lua 2014-03-05 18:47:03 +0000
+++ campaigns/tutorial01.wmf/scripting/texts.lua 2014-03-06 20:03:33 +0000
@@ -13,12 +13,12 @@
13-- =============13-- =============
14scould_player = {14scould_player = {
15 title = _ "Nice And Easy Does It All the Time",15 title = _ "Nice And Easy Does It All the Time",
16 body = rt(p(_16 body = rt(p(_(
17[[I am sorry, but will I have to tear this down again. ]] ..17[[I am sorry, but will I have to tear this down again. ]] ..
18[[We might need the space here later on. ]] ..18[[We might need the space here later on. ]] ..
19[[If I am too slow for you, you might want to play a real game and just find everything out for yourself. ]] ..19[[If I am too slow for you, you might want to play a real game and just find everything out for yourself. ]] ..
20[[Otherwise, please bear with me, I am not the youngest and quickest anymore.]]20[[Otherwise, please bear with me, I am not the youngest and quickest anymore.]]
21 )21 ))
22 )22 )
23}23}
2424
@@ -584,7 +584,7 @@
584[[Training happens in training sites like the training camp or the battle arena: ]] ..584[[Training happens in training sites like the training camp or the battle arena: ]] ..
585[[soldiers go there (as our little fellows are currently doing), ]] ..585[[soldiers go there (as our little fellows are currently doing), ]] ..
586[[consume some wares and advance a level in one category. If a barbarian soldier is fully trained, ]] ..586[[consume some wares and advance a level in one category. If a barbarian soldier is fully trained, ]] ..
587[[he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then!]] ..587[[he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! ]] ..
588[[The individual statistics have the following meaning:]])588[[The individual statistics have the following meaning:]])
589 ) .. h2(_"Health:") .. p(_(589 ) .. h2(_"Health:") .. p(_(
590[[The total life of a soldier. A barbarian soldier starts with ~130 health points, ]] ..590[[The total life of a soldier. A barbarian soldier starts with ~130 health points, ]] ..
591591
=== modified file 'tribes/barbarians/fishers_hut/help.lua'
--- tribes/barbarians/fishers_hut/help.lua 2014-03-05 18:47:03 +0000
+++ tribes/barbarians/fishers_hut/help.lua 2014-03-06 20:03:33 +0000
@@ -46,5 +46,5 @@
46 text_line(_"Experience levels:","n/a") ..46 text_line(_"Experience levels:","n/a") ..
47 --Production Section47 --Production Section
48 rt(h2(_"Production")) ..48 rt(h2(_"Production")) ..
49 text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Fisher","18s"))49 text_line(_"Performance:", _"The fisher pauses 18s before going to work again.")
50}50}
5151
=== modified file 'tribes/barbarians/gamekeepers_hut/help.lua'
--- tribes/barbarians/gamekeepers_hut/help.lua 2014-03-05 18:47:03 +0000
+++ tribes/barbarians/gamekeepers_hut/help.lua 2014-03-06 20:03:33 +0000
@@ -40,5 +40,5 @@
40 text_line(_"Experience levels:","n/a") ..40 text_line(_"Experience levels:","n/a") ..
41 --Production Section41 --Production Section
42 rt(h2(_"Production")) ..42 rt(h2(_"Production")) ..
43 text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Gamekeeper","52.5s"))43 text_line(_"Performance:", _"The gamekeeper pauses 52.5s before going to work again.")
44}44}
4545
=== modified file 'tribes/barbarians/hunters_hut/help.lua'
--- tribes/barbarians/hunters_hut/help.lua 2014-03-05 18:47:03 +0000
+++ tribes/barbarians/hunters_hut/help.lua 2014-03-06 20:03:33 +0000
@@ -48,5 +48,5 @@
48 text_line(_"Experience levels:","n/a") ..48 text_line(_"Experience levels:","n/a") ..
49 --Production Section49 --Production Section
50 rt(h2(_"Production")) ..50 rt(h2(_"Production")) ..
51 text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Hunter","35s"))51 text_line(_"Performance:", _"The hunter pauses 35s before going to work again.")
52}52}
5353
=== modified file 'tribes/barbarians/quarry/help.lua'
--- tribes/barbarians/quarry/help.lua 2014-03-05 18:47:03 +0000
+++ tribes/barbarians/quarry/help.lua 2014-03-06 20:03:33 +0000
@@ -43,5 +43,5 @@
43 text_line(_"Experience levels:","n/a") ..43 text_line(_"Experience levels:","n/a") ..
44 --Production Section44 --Production Section
45 rt(h2(_"Production")) ..45 rt(h2(_"Production")) ..
46 text_line(_"Performance:", _"The %s pauses %s before going to work again.":format(_"Stonemason","25s"))46 text_line(_"Performance:", _"The stonemason pauses 25s before going to work again.")
47}47}

Subscribers

People subscribed via source and target branches

to status/vote changes: