GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140308 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140308/+merge/210081
Some more string fixes
--
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140308/+merge/210081
Your team Widelands Developers is requested to review the proposed merge of
lp:~gunchleoc/widelands/i18n-20140308 into lp:widelands.
=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua 2014-03-05 18:47:03 +
+++ campaigns/atl01.wmf/scripting/texts.lua 2014-03-09 09:45:53 +
@@ -125,9 +125,9 @@
obj_horsefarm_and_warehouse = {
name = obj_horsefarm_and_warehouse,
- title = _Build a warehouse and a horsefarm,
+ title = _Build a warehouse and a horse farm,
number = 2,
- body = objective_text(_Warehouse and Horsefarm, _(
+ body = objective_text(_Warehouse and Horse Farm, _(
[[As your road network gets longer and more complicated, you should employ horses ]] ..
[[to help out your carriers. Horses are bred at horse farms using water and corn. ]] ..
[[A warehouse will also help to ensure that your transportation system does not collapse.]]) .. br ..
@@ -261,12 +261,12 @@
},
{
title = _ Sidolus Speaks,
- body = sidolus(_
+ body = sidolus(_(
[[May Satul warm you, Jundlina! I agree with what Loftomor proposes. ]] ..
[[We need a good supply of building materials for we have to expand our territory swiftly. ]] ..
[[I will not feel safe on this island as long as we have not seen all its shores it. ]] ..
[[I brought plenty of good men from Atlantis. The military might is available. ]] ..
-[[We only need some housing to live in.]]
+[[We only need some housing to live in.]])
) .. new_objectives(obj_expand)
}
}
=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua 2014-02-26 12:53:34 +
+++ campaigns/emp02.wmf/scripting/texts.lua 2014-03-09 09:45:53 +
@@ -169,7 +169,7 @@
saledus_2 = {
title =_ Marble on the Mountain,
body= saledus(_Saledus smiles,
-_([[Lutius, I’ve got good news for you:]] ..
+_([[Lutius, I’ve got good news for you: ]] ..
[[As I walked to the east, I found a larger mountain.]] ..
[[I am not absolutely sure – a geologist should check if I am right]] ..
[[ – but I believe we could mine marble from some places on the mountain.]]) .. brbr ..
=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua 2014-03-05 18:47:03 +
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua 2014-03-09 09:45:53 +
@@ -275,9 +275,8 @@
order_msg_10_bread = {
title=_The Advisor,
body=khantrukh(_The elder jumps into the air...,
-_([[Wisdom commands to seek variety.
-
-North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a farm? ]] ..
+_([[Wisdom commands to seek variety.]]) .. brbr ..
+_([[North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a farm? ]] ..
[[I sure would enjoy a freshly baked pitta bread for a change...]])
) .. new_objectives(obj_begin_farming)
}
=== modified file 'global/militarysites/stronghold.barbarians/conf'
--- global/militarysites/stronghold.barbarians/conf 2013-10-29 10:55:20 +
+++ global/militarysites/stronghold.barbarians/conf 2014-03-09 09:45:53 +
@@ -5,10 +5,10 @@
buildable=no
prefer_heroes=false
occupied_string=
-aggressor_string=_Your Stronghold discovered an aggressor.
-attack_string=_Your Stronghold is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Stronghold
-defeated_you_string=_Your soldiers defeated the enemy at the Stronghold
+aggressor_string=Your Stronghold discovered an aggressor.
+attack_string=Your Stronghold is under attack.
+defeated_enemy_string=The enemy defeated your soldiers at the Stronghold
+defeated_you_string=Your soldiers defeated the enemy at the Stronghold
[idle]
=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf 2014-03-05 18:47:03 +
+++ tribes/atlanteans/conf 2014-03-09 09:45:53 +
@@ -150,7 +150,7 @@
donjon.barbarians=_Donjon
fortress.barbarians=_Fortress
sentry.barbarians=_Sentry
-stronghold.barbarians=_Stronghold
+stronghold.barbarians=Stronghold
sentry.empire=_Sentry
barracks.empire=_Barracks
barrier.empire=_Barrier
=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf 2014-03-05 18:47:03 +
+++ tribes/barbarians/conf 2014-03-09 09:45:53 +
@@ -219,7 +219,7 @@
[militarysite types]
barrier=_Barrier
sentry=_Sentry
-stronghold=_Stronghold
+stronghold=Stronghold
citadel=_Citadel
fortress=_Fortress
donjon=_Donjon
=== modified file 'tribes/barbarians/stronghold/conf'
--- tribes/barbarians/stronghold/conf 2013-10-29 10:55:20 +
+++