widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140406/+merge/209770

Some small string bugfixes for i18n.

Catalogs will need rebuilding after the merge.
-- 
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140406/+merge/209770
Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands.

=== 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 @@
 -- =============
 scould_player = {
    title = _ "Nice And Easy Does It All the Time",
-   body = rt(p(_
+   body = rt(p(_(
 [[I am sorry, but will I have to tear this down again. ]] ..
 [[We might need the space here later on. ]] ..
 [[If I am too slow for you, you might want to play a real game and just find everything out for yourself. ]] ..
 [[Otherwise, please bear with me, I am not the youngest and quickest anymore.]]
-      )
+      ))
    )
 }
 
@@ -584,7 +584,7 @@
 [[Training happens in training sites like the training camp or the battle arena: ]] ..
 [[soldiers go there (as our little fellows are currently doing), ]] ..
 [[consume some wares and advance a level in one category. If a barbarian soldier is fully trained, ]] ..
-[[he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then!]] ..
+[[he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! ]] ..
 [[The individual statistics have the following meaning:]])
       ) .. h2(_"Health:") .. p(_(
 [[The total life of a soldier. A barbarian soldier starts with ~130 health points, ]] ..

=== 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 @@
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..
-		text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Fisher","18s"))
+		text_line(_"Performance:", _"The fisher pauses 18s before going to work again.")
 }

=== 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 @@
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..
-		text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Gamekeeper","52.5s"))
+		text_line(_"Performance:", _"The gamekeeper pauses 52.5s before going to work again.")
 }

=== 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 @@
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..
-		text_line(_"Performance:", _"The %1$s pauses %2$s before going to work again.":bformat(_"Hunter","35s"))
+		text_line(_"Performance:", _"The hunter pauses 35s before going to work again.")
 }

=== 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 @@
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..
-		text_line(_"Performance:", _"The %s pauses %s before going to work again.":format(_"Stonemason","25s"))
+		text_line(_"Performance:", _"The stonemason pauses 25s before going to work again.")
 }