From e727f9e9d4823ed3c140762444a5020e602f4724 Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Mon, 12 Jan 2015 16:27:05 +0100 Subject: [PATCH 1/7] translated English messages and fixed a ton of typos --- res/core/messages.xml | 381 ++++++++++++++++++++++++------------------ 1 file changed, 221 insertions(+), 160 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index cbc5dd780..a20a3bf0d 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -48,7 +48,7 @@ "$unit($mage) läßt einen Teil seiner selbst in die Erde fliessen. Die Bäume, die Transformation überlebt haben, erscheinen nun viel kräftiger." "The power of $unit($mage) flows into the region and the trees which survived the spell appear stronger now." - "The power of $unit($mage) flows into the region and the trees which survived the spell appear stronger now." + "The power of $unit($mage) flows into the ground and the trees which survived the spell appear much stronger now." @@ -69,6 +69,7 @@ Eine Feuerwand blockiert die Ein- und Ausreise. ($int36($id)) + A wall of fire blocks entry and exit. ($int36($id)) @@ -79,22 +80,27 @@ Dieser mächtige Bann scheint die Einheit ihres freien Willens zu berauben. Solange der Zauber wirkt, wird sie nur den Befehlen ihres neuen Herrn gehorchen. ($int36($id)) + This powerful curse appears to rob the unit of its free will. As long as the curse is active, it will only obey the orders of its new lord. ($int36($id)) Dieser Beeinflussungszauber scheint die Einheit einem ganz bestimmten Volk wohlgesonnen zu machen. ($int36($id)) + This enchantment appears to make the unit well-disposed towards a particular faction. ($int36($id)) Dieser Zauber verursacht einen gigantischen magischen Strudel. Der Mahlstrom wird alle Schiffe, die in seinen Sog geraten, schwer beschädigen. ($int36($id)) + This spell causes a gargantuan vortex. The maelstrom will heavily damage all ships coming into its wake. ($int36($id)) Heilung ist in dieser Region magisch beeinflusst. ($int36($id)) + Healing in this region is affected by magic. ($int36($id)) Dieses Schiff hat sich verfahren. ($int36($id)) + This ship has lost its path. ($int36($id)) @@ -254,7 +260,7 @@ - "$unit($unit) mag $faction($faction) zu mögen. ($int36($id))" + "$unit($unit) scheint $faction($faction) zu mögen. ($int36($id))" "$unit($unit) likes $faction($faction). ($int36($id))" @@ -476,7 +482,7 @@ "Diese Region wurde von den Göttern verflucht. Stinkende Nebel ziehen über die tote Erde und furchtbare Kreaturen ziehen über das Land. Die Brunnen sind vergiftet, und die wenigen essbaren Früchte sind von einem rosa Pilz überzogen. Niemand kann hier lange überleben. ($int36($id))" "($int36($id))" - "This region was cursed by the gods. Noone can live here for long. ($int36($id))" + "This region was cursed by the gods. Stinking vapors billow over the dead ground and hideous creatures move about the country. The wells are poisened and the edible plants are covered by a pink fungus. Noone can live here for long. ($int36($id))" @@ -571,7 +577,7 @@ "Dichte Nebel bedecken diese Woche die Region. Keine Einheit schafft es, diese Nebel zu durchdringen und die Region zu verlassen. ($int36($id))" "heavy fog makes it impossible to leave the region. ($int36($id))" - "heavy fog makes it impossible to leave the region. ($int36($id))" + "Heavy fog makes it impossible to leave the region. ($int36($id))" @@ -766,8 +772,8 @@ "$unit($unit) in $region($region): '$order($command)' - Dafür braucht die Einheit $resources($required)." - "$unit($unit) in $region($region): '$order($command)' - for this, the unit needs $resources($required)." - "$unit($unit) in $region($region): '$order($command)' - for this, the unit needs $resources($required)." + "$unit($unit) in $region($region): '$order($command)' - For this, the unit needs $resources($required)." + "$unit($unit) in $region($region): '$order($command)' - For this, the unit needs $resources($required)." @@ -954,7 +960,7 @@ "$unit($unit) benutzt einen Astralkristall und gewinnt $int($aura) Aura hinzu." "$unit($unit) uses an astralcrystal and gains $int($aura) aura." - "$unit($unit) uses an astralcrystal and gains $int($aura) aura." + "$unit($unit) uses an astral crystal and gains $int($aura) aura." @@ -1079,8 +1085,8 @@ "In $region($region) stürzte $building($building) ein.$if($road," Beim Einsturz wurde die halbe Straße vernichtet.","")$if($opfer," $int($opfer) Opfer $if($eq($opfer,1),"ist","sind") zu beklagen.","")" - "$building($building) in $region($region) collapses.$if($opfer," There are $int($opfer) caualties.","")" - "$building($building) in $region($region) collapses.$if($opfer," There are $int($opfer) caualties.","")" + "$building($building) in $region($region) collapses.$if($opfer," There are $int($opfer) casualties.","")" + "$building($building) in $region($region) collapses.$if($road," The collapse ruined half of the road.","")$if($opfer," There are $int($opfer) casualties.","")" @@ -1153,6 +1159,7 @@ "$int($amount) Personen von $unit($unit) ertrinken.$if($isnull($region),""," Die Einheit rettet sich nach $region($region).")" + "$int($amount) people of $unit($unit) drown.$if($isnull($region),""," The unit makes it to $region($region).")" @@ -1160,7 +1167,8 @@ - "$unit($unit) ueberlebt unbeschadet und rettet sich nach $region($region)." + "$unit($unit) überlebt unbeschadet und rettet sich nach $region($region)." + "$unit($unit) survives unscathed and makes it to $region($region)." @@ -1169,6 +1177,7 @@ "$ship($ship) versinkt in den Fluten von $region($region)." + "$ship($ship) disappears in the depths of $region($region)." @@ -1177,6 +1186,7 @@ "$unit($unit) wurde beim versenken von $ship($ship) entdeckt." + "$unit($unit) was spotted sinking $ship($ship)." @@ -1185,7 +1195,8 @@ - "$unit($unit) entdeckte $unit($saboteur) beim versenken von $ship($ship)." + "$unit($unit) entdeckte $unit($saboteur) beim Versenken von $ship($ship)." + "$unit($unit) caught $unit($saboteur) trying to sink $ship($ship)." @@ -1194,7 +1205,7 @@ "$unit($unit) ertrinkt in $region($region)." - "$unit($unit) drowns in in $region($region)." + "$unit($unit) drowns in $region($region)." @@ -1221,6 +1232,7 @@ "$unit($unit) schwenkt sein Szepter und sorgt für Verwirrung und Chaos in der Region." + "$unit($unit) waves their scepter and causes chaos and confusion in the region." @@ -1230,10 +1242,12 @@ "$unit($unit) stolpert bei der Erforschung der Region über $localize($location). Nähere Durchsuchung fördert ein zerfleddertes altes Buch mit dem Titel '$localize($book)' zu Tage. Der Wissensschub ist enorm." + "$unit($unit) stumbles upon $localize($location) while exploring the region. Closer inspection reveals a torn old book titled '$localize($book)'. The expansion of knowledge is tremendous." "Ein Alp hat sein Opfer gefunden und springt auf den Rücken von $unit($target)!" + "An evil spirit has found its victim and mounts the back of $unit($target)!" @@ -1251,6 +1265,7 @@ "$unit($unit) hat Schwierigkeiten seine magischen Energien zu sammeln. ($int36($id))" + "$unit($unit) finds it difficult to gather its magical energies. ($int36($id))" @@ -1278,6 +1293,7 @@ "$unit($mage) rief in $region($region) einen Riss in dem Gefüge der Magie hervor, der alle magische Kraft aus der Region riss." + "$unit($mage) in $region($region) caused a tear in the fabric of magic, that sucked all magical energies out of the region." @@ -1336,7 +1352,7 @@ "$unit($mage) zaubert $spell($spell), aber es gab niemanden, der beeinflusst werden konnte." - "$unit($mage) casts $spell($spell), but nobody is impressed." + "$unit($mage) casts $spell($spell), but nobody is affected." @@ -1355,7 +1371,7 @@ "$unit($mage) zaubert $spell($spell): Das Kampfgetümmel erstirbt und er kann unbehelligt seines Weges ziehen." - "$unit($mage) casts $spell($spell): The noise of the battle dies down and he is able to slip away unharmed." + "$unit($mage) casts $spell($spell): The noise of the battle dies down and the mage is able to slip away unharmed." @@ -1402,6 +1418,7 @@ "$unit($mage) ruft ein fürchterliches Unwetter über seine Feinde, doch es gab niemanden mehr, den dies treffen konnte." + "$unit($mage) calls forth a terrible torment over the enemy side, but there was nobody who could be affected by it." @@ -1409,6 +1426,7 @@ "$unit($mage) ruft ein fürchterliches Unwetter über seine Feinde, doch der magische Regen zeigt keinen Effekt." + "$unit($mage) causes a terrible storm over the enemy, but the magic rain does not do any harm." @@ -1416,6 +1434,7 @@ "$unit($mage) ruft ein fürchterliches Unwetter über seine Feinde. Der magischen Regen lässt alles Eisen rosten." + "$unit($mage) calls forth a terrible torment over the enemy. The magical rain makes all iron rusty." @@ -1483,7 +1502,7 @@ "$unit($mage) beginnt ein Ritual der Wiederbelebung und benutzt ein $resource($item,1), um den Zauber zu verstärken. $int($amount) Krieger stehen von den Toten auf." - "$unit($mage) begins a ritual of resurrection using a $resource($item,1). $int($amount) warriors rise from the dead." + "$unit($mage) begins a ritual of resurrection augmented by a $resource($item,1). $int($amount) warriors rise from the dead." @@ -1555,6 +1574,7 @@ ""AAAAAAAGHHHHHH!" - Ein Schrei durchzieht die Region, $unit($unit) windet sich vor Schmerz." + ""AAAAAAAGHHHHHH!" - $unit($unit) screams and squirms with pain." @@ -1564,6 +1584,7 @@ "$unit($unit) in $region($region): '$order($command)' - Eine höhere Macht hindert $unit($unit) daran, das Objekt zu übergeben. 'ES IST DEINS, MEIN KIND. DEINS GANZ ALLEIN'." + "$unit($unit) in $region($region): '$order($command)' - A higher power prevents $unit($unit) from giving the object away. 'IT IS YOURS MY CHILD. ONLY YOURS.'." @@ -1571,6 +1592,7 @@ "$unit($unit) sendet ein Stoßgebet an den Herrn der Schreie." + "$unit($unit) sends a prayer to the Lord of Screams." @@ -1705,6 +1727,7 @@ "Verwundert blicken die Bauern von $region($region) auf ein neues Gebäude." + "Flabbergasted, the peasants of $region($region) behold a new building." @@ -1813,7 +1836,8 @@ - "$unit($unit) in $region($region): '$order($command)' - $unit($target) kann keine $race($race,1)-Gestalt annehmen." + "$unit($unit) in $region($region): '$order($command)' - $unit($target) kann nicht $race($race,1) werden." + "$unit($unit) in $region($region): '$order($command)' - $unit($target) cannot take the form of $race($race,1)." @@ -1823,6 +1847,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Elementar ist zu klein, um das Gebäude zu tragen." + "$unit($unit) in $region($region): '$order($command)' - The elemental is too small to carry the building." @@ -1886,6 +1911,7 @@ "Ein Beben erschüttert $building($building). Viele kleine Pseudopodien erheben das Gebäude und tragen es in Richtung $direction($direction)." + "An tremor shakes $building($building). Many little pseudopods lift up the building and carry it to $direction($direction)." @@ -1911,7 +1937,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Sphären des Chaos geben dem Magier einen Teil ihrer Kraft." - "$unit($unit) in $region($region): '$order($command)' - The sphere of chaos returns a part of his power to the magician." + "$unit($unit) in $region($region): '$order($command)' - The Spheres of Chaos return a part of his power to the magician." @@ -1920,7 +1946,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Magier konnte keinen Fluch zerstören." - "$unit($unit) in $region($region): '$order($command)' - The magician could not destroy any magic." + "$unit($unit) in $region($region): '$order($command)' - The magician could not destroy any curse." @@ -1950,8 +1976,8 @@ - "$unit($unit) in $region($region): '$order($command)' - Der Magier zerstört den Fluch($id) auf ${target}." - "$unit($unit) in $region($region): '$order($command)' - The magician destroys the spell on ${target}." + "$unit($unit) in $region($region): '$order($command)' - Der Magier zerstört den Fluch ($id) auf ${target}." + "$unit($unit) in $region($region): '$order($command)' - The magician destroys the spell ($id) on ${target}." @@ -1961,8 +1987,8 @@ - "$unit($unit) in $region($region): '$order($command)' - Der Zauber ist nicht stark genug, um den Fluch auf ${target} zu zerstören." - "$unit($unit) in $region($region): '$order($command)' - The spell is not strong enough to destroy the curse on ${target}." + "$unit($unit) in $region($region): '$order($command)' - Der Zauber ist nicht stark genug, um den Fluch ($id) auf ${target} zu zerstören." + "$unit($unit) in $region($region): '$order($command)' - The spell is not strong enough to destroy the curse ($id) on ${target}." @@ -2004,7 +2030,7 @@ "$unit($mage) legt einen Rosthauch auf $unit($target), doch der Rosthauch fand keine Nahrung." - "$unit($mage) puts a spell of rust on $unit($target), but it shows no effect." + "$unit($mage) puts a spell of rust on $unit($target) but it found nothing to consume." @@ -2021,14 +2047,14 @@ $if($isnull($mage),"Ein unentdeckter Magier",$unit($mage)) erschuf einen heiligen Hain von $int($amount) Schößlingen. - $if($isnull($mage),"An unknown magician ",$unit($mage)) created a holy forest of $int($amount) young trees. + $if($isnull($mage),"An unknown magician",$unit($mage)) created a holy forest of $int($amount) young trees. "$if($isnull($mage),"Ein unentdeckter Magier",$unit($mage)) segnet in einem kurzen Ritual die Felder." - "$if($isnull($mage),"an unseen magician",$unit($mage)) blesses the fields in a short ritual." + "$if($isnull($mage),"An unseen magician",$unit($mage)) blesses the fields in a short ritual." @@ -2043,7 +2069,7 @@ "$unit($mage) belebt $int($amount) Bäume." - "$unit($mage) revives $int($amount) trees." + "$unit($mage) animates $int($amount) trees." @@ -2069,7 +2095,7 @@ "$unit($unit) transferiert $int($aura) Aura auf $unit($target)." "$unit($unit) transfers $int($aura) Aura to $unit($target)." - "$unit($unit) transfers $int($aura) Aura to $unit($target)." + "$unit($unit) transfers $int($aura) aura to $unit($target)." @@ -2130,7 +2156,7 @@ "$unit($mage) fand heraus, dass auf $building($building) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt." - "$unit($mage) discovers that $building($building) is charmed with $curse($curse), which will last for, about $int($months) more weeks." + "$unit($mage) discovers that $building($building) is charmed with $curse($curse), which will last for about $int($months) more weeks." @@ -2150,7 +2176,7 @@ "$unit($mage) fand heraus, dass auf $region($region) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt." - "$unit($mage) discovers that $region($region) is charmed with $curse($curse), which will last for, about $int($months) more weeks." + "$unit($mage) discovers that $region($region) is charmed with $curse($curse), which will last for about $int($months) more weeks." @@ -2406,7 +2432,7 @@ "Als $unit($unit) in $region($region) versucht, $spell($spell) zu zaubern erhebt sich plötzlich ein dunkler Wind. Bizarre geisterhafte Gestalten kreisen um den Magier und scheinen sich von den magischen Energien des Zaubers zu ernähren. Mit letzter Kraft gelingt es $unit($unit) dennoch den Spruch zu zaubern." - "When $unit($unit) in $region($region) tries to cast $spell($spell), strong winds suddenly rise. Bizare ghostlike creatures circle around the magician and seem to be leeching his magical energy. However, with a final effort of strength, $unit($unit) manages to complete the spell." + "When $unit($unit) in $region($region) tries to cast $spell($spell), strong winds suddenly rise. Bizarre ghostlike creatures circle around the magician and seem to be leeching magical energy. However, with a final effort of strength, $unit($unit) manages to complete the spell." @@ -2453,16 +2479,15 @@ "$unit($unit) hat einen feuchtfröhlichen Abend in der Taverne verbracht. Ausser einem fürchterlichen Brummschädel ist da auch noch das dumme Gefühl $unit($mage) seine ganze Lebensgeschichte erzählt zu haben." + "$unit($unit) spent the evening carousing in the tavern. In addition to a terrible headache, there remains this feeling of having told $unit($mage) the story of his entire life." - "$unit($unit) hat einen feuchtfröhlichen Abend in der - Taverne verbracht. Ausser einem fürchterlichen Brummschädel ist da auch - noch das dumme Gefühl die ganze Taverne mit seiner Lebensgeschichte - unterhalten zu haben." + "$unit($unit) hat einen feuchtfröhlichen Abend in der Taverne verbracht. Ausser einem fürchterlichen Brummschädel ist da auch noch das dumme Gefühl die ganze Taverne mit seiner Lebensgeschichte unterhalten zu haben." + "$unit($unit) spent the evening carousing in the tavern. In addition to a terrible headache, there remains this feeling of having told everyone the story of his entire life." @@ -2472,6 +2497,7 @@ "$unit($mage) gelingt es $unit($unit) zu verzaubern. $unit($unit) wird für etwa $int($duration) Wochen unseren Befehlen gehorchen." + "$unit($mage) chamrs $unit($unit). $unit($unit) will obey our orders for approximatley $int($duration) more weeks." @@ -2498,7 +2524,7 @@ "$unit($unit) in $region($region) hat rasende Kopfschmerzen und kann sich nicht mehr richtig konzentrieren. Irgendwas bei diesem Zauber ist fürchterlich schiefgelaufen." - "$unit($unit) in $region($region) is hit by a massive headacheand cannot concentrate on the spell. Some part of this ritual has gone very wrong indeed." + "$unit($unit) in $region($region) is hit by a massive headache and cannot concentrate on the spell. Some part of this ritual has gone very wrong indeed." @@ -2506,7 +2532,8 @@ - "$unit($unit) in $region($region): '$order($command)' - Der Magier verfängt sich in seinem eigenen Zauber." + "$unit($unit) in $region($region): '$order($command)' - Der Magier verfängt sich im eigenen Zauber." + "$unit($unit) in $region($region): '$order($command)' - The magician is caught in their own spell." "In der Region erstrahlen des Nachts bunte Lichter, Gloeckchen klingeln und frohes Kindergelaechter klingt durch den Wald." @@ -2519,6 +2546,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Zauber von $unit.dative($unit) war viel zu schwach und löst sich gleich wieder auf." + "$unit($unit) in $region($region): '$order($command)' - The spell of $unit($unit) was way to weak and its magic dissolves immediately." @@ -2716,6 +2744,7 @@ "$unit($unit) verdient in $region($region) $int($amount)$if($eq($wanted,$amount),""," statt $int($wanted)") Silber durch Zauberei." + "$unit($unit) in $region($region) earns $int($amount)$if($eq($wanted,$amount),""," instead of $int($wanted)") silver through magic." @@ -2754,7 +2783,7 @@ "$unit($unit) treibt in $region($region) Steuern in Höhe von $int($amount)$if($eq($wanted,$amount),""," statt $int($wanted)") Silber ein." - "$unit($unit) collects taxes of only $int($amount) instead of$if($eq($wanted,$amount),""," of$if($eq($wanted,$amount),""," of $int($wanted)") ") silver in $region($region)." + "$unit($unit) collects taxes of$if($eq($wanted,$amount),""," only") $int($amount) silver$if($eq($wanted,$amount),""," instead of $int($wanted) silver") ") in $region($region)." @@ -2774,8 +2803,7 @@ "$unit($unit) verdient$if($eq($mode,4)," am Handel","") in $region($region) $int($amount)$if($eq($wanted,$amount),""," statt $int($wanted)") Silber$if($eq($mode,1)," durch Unterhaltung",$if($eq($mode,2)," durch Steuern",$if($eq($mode,3)," durch Handel",$if($eq($mode,5)," durch Diebstahl",$if($eq($mode,6)," durch Zauberei",$if($eq($mode,7)," durch Plündern",""))))))." - "$unit($unit) earns $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") in $region($region)." - "$unit($unit) earns $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") in $region($region)." + "$unit($unit) earns $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") in $region($region) $if($eq($mode,1)," by entertainment",$if($eq($mode,2)," by taxes",$if($eq($mode,3)," by trade",$if($eq($mode,5)," by stealing",$if($eq($mode,6)," by magic",$if($eq($mode,7)," by pillaging",""))))))." @@ -2821,7 +2849,7 @@ "Die Laenader in $region($region) ist erschöpft." - "There is no more laen in $region($region)." + "There is no more laen left in $region($region)." @@ -2932,7 +2960,7 @@ "$unit($unit) entdeckt dass im $direction($direction) $terrain($region) ist." "$unit($unit) discovered that an ocean lies in the $direction($direction)." - "$unit($unit) discovered that an ocean lies in the $direction($direction)." + "$unit($unit) discovered that $terrain($region) lies in the $direction($direction)." @@ -2958,8 +2986,8 @@ "Die Mannschaft der $ship($ship) kann in letzter Sekunde verhindern, dass das Schiff in $region($region) auf Land aufläuft." - "In the very last moment, the crew of the $ship($ship) saved the ship from grounding in $region($region)." - "In the very last moment, the crew of the $ship($ship) saved the ship from grounding in $region($region)." + "At the very last moment, the crew of the $ship($ship) saved the ship from running aground in $region($region)." + "At the very last moment, the crew of the $ship($ship) saved the ship from running aground in $region($region)." @@ -2976,8 +3004,8 @@ "Die Mannschaft der $ship($ship) weigert sich, nach $direction($direction) zu reisen." - " The crew of the $ship($ship) refuses to travel to the$direction($direction)." - " The crew of the $ship($ship) refuses to travel to the$direction($direction)." + " The crew of the $ship($ship) refuses to travel to the $direction($direction)." + " The crew of the $ship($ship) refuses to travel to the $direction($direction)." @@ -2994,8 +3022,8 @@ "$unit($unit) weigert sich, nach $direction($direction) zu reisen." - "$unit($unit) refuses to travel to the$direction($direction)." - "$unit($unit) refuses to travel to the$direction($direction)." + "$unit($unit) refuses to travel to the $direction($direction)." + "$unit($unit) refuses to travel to the $direction($direction)." @@ -3124,7 +3152,7 @@ "In $region($region) erschienen die Herren der Bäume." "In $region($region), the lords of the trees have risen." - "In $region($region), the lords of the trees have risen." + "In $region($region), the Lords of the Trees have risen." @@ -3155,7 +3183,7 @@ "Die Partei bekommt von $unit.dative($unit) in $region($region) einen Spitznamen." - "Your faction received a nickname from $unit($unit)." + "Your faction received a nickname from $unit($unit) in $region($region)." @@ -3221,8 +3249,8 @@ "Der Vulkan in $region($region) bricht aus." - "The volcano in $region($region) breaks out." - "The volcano in $region($region) breaks out." + "The volcano in $region($region) erupts." + "The volcano in $region($region) erupts." @@ -3230,8 +3258,8 @@ "Der Vulkan in $region($regionv) bricht aus. Die Lavamassen verwüsten $region($regionn)." - "The volcano in $region($regionv) breaks out. The lava devastates $region($regionn)." - "The volcano in $region($regionv) breaks out. The lava devastates $region($regionn)." + "The volcano in $region($regionv) breaks out. The lava devastates $region($region)." + "The volcano in $region($regionv) erupts. The lava devastates $region($region)." @@ -3240,8 +3268,8 @@ "Beim Vulkanausbruch in $region($region) sterben $int($dead) Personen in $unit($unit)." - "$int($dead) people in $unit($unit) perisch when the volcano in $region($region) breaks out." - "$int($dead) people in $unit($unit) perisch when the volcano in $region($region) breaks out." + "$int($dead) people in $unit($unit) perish when the volcano in $region($region) breaks out." + "$int($dead) people in $unit($unit) perish when the volcano in $region($region) erupts." @@ -3373,8 +3401,8 @@ "Vor den vielen Orks in $region($region) fliehen die anderen Einwohner." - "People $region($region) flee from an Orc superiority." - "People $region($region) flee from an Orc superiority." + "People in $region($region) flee because of too many orcs." + "People in $region($region) flee because of too many orcs." @@ -3563,8 +3591,8 @@ - "$unit($spy) gelang es, Informationen über $unit($target) ($status) herauszubekommen." - "$unit($spy) managed to gather information about $unit($target)." + "$unit($spy) gelang es, Informationen über $unit($target) herauszubekommen: Kampfstatus $status." + "$unit($spy) managed to gather information about $unit($target): combat status ($status)." @@ -3580,7 +3608,7 @@ "$unit($target) beherrscht ${skills}." - "$unit($target) has the skills ${skills}." + "$unit($target) knows ${skills}." @@ -3606,7 +3634,7 @@ "$unit($target) fühlt sich $if($isnull($spy),"","durch $unit($spy) ")beobachtet." "$unit($target) feels watched by $unit($spy)." - "$unit($target) feels watched by $unit($spy)." + "$unit($target) feels watched$if($isnull($spy),""," by $unit($spy)")." @@ -3625,8 +3653,8 @@ "$unit($unit) vergisst durch Dumpfbackenbrot $int($weeks) Wochen des Talentes $skill($skill)." - "$unit($unit) eats a Dumpfbackenbrot and forgets $int($weeks) weeks worth of $skill($skill)." - "$unit($unit) eats a Dumpfbackenbrot and forgets $int($weeks) weeks worth of $skill($skill)." + "$unit($unit) eats a duncebuns and forgets $int($weeks) weeks worth of $skill($skill)." + "$unit($unit) eats a duncebuns and forgets $int($weeks) weeks worth of $skill($skill)." @@ -3664,7 +3692,7 @@ "Die $ship($ship) ist zu stark beschädigt und sinkt." "The $ship($ship) suffers too heavy damage and sinks." - "The $ship($ship) suffers too heavy damage and sinks." + "The $ship($ship) has suffered too much damage and sinks." @@ -3672,7 +3700,7 @@ "Die $ship($ship) entdeckt, dass $region($region) Festland ist." - "The $ship($ship) discovers that $region($region) has no shore." + "The $ship($ship) discovers that $region($region) is dry land." @@ -3700,7 +3728,7 @@ "Die $ship($ship) wird in $region($region) von Stürmen abgetrieben$if($sink," und sinkt","")." "The $ship($ship) in $region($region) drifts in heavy storm$if($sink," and sinks","")." - "The $ship($ship) in $region($region) drifts in heavy storm$if($sink," and sinks","")." + "The $ship($ship) in $region($region) gets off course in heavy storm$if($sink," and sinks","")." @@ -3747,8 +3775,7 @@ "$unit($unit) in $region($region) rekrutiert $int($amount) von $int($want) Personen." - "$unit($unit) in $region($region) recruits - $int($amount) of $int($want) people." + "$unit($unit) in $region($region) recruits $int($amount) of $int($want) people." @@ -3933,9 +3960,9 @@ - "$unit($unit) in $region($region): '$order($command)' - Die Optionen ZIP und BZIP2 können nur um, nicht ausgeschaltet werden." - "$unit($unit) in $region($region): '$order($command)' - options ZIP and BZIP2 can only be switched, not turned off." - "$unit($unit) in $region($region): '$order($command)' - options ZIP and BZIP2 can only be switched, not turned off." + "$unit($unit) in $region($region): '$order($command)' - Die Optionen ZIP und BZIP2 können nur um-, nicht ausgeschaltet werden." + "$unit($unit) in $region($region): '$order($command)' - Options ZIP and BZIP2 can only be switched, not turned off." + "$unit($unit) in $region($region): '$order($command)' - Options ZIP and BZIP2 can only be switched, not turned off." @@ -3944,8 +3971,8 @@ "$unit($unit) in $region($region): '$order($command)' - Einheiten einer Partei, die noch immun gegen Angriffe ist, dürfen nicht bewachen." - "$unit($unit) in $region($region): '$order($command)' - units of a faction that can't be attacked may not guard." - "$unit($unit) in $region($region): '$order($command)' - units of a faction that can't be attacked may not guard." + "$unit($unit) in $region($region): '$order($command)' - Units of a faction that can't be attacked may not guard." + "$unit($unit) in $region($region): '$order($command)' - Units of a faction that can't be attacked may not guard." @@ -3954,7 +3981,7 @@ "$unit($unit) in $region($region): '$order($command)' - In dieser Region kann man nichts verkaufen." - "$unit($unit) in $region($region): '$order($command)' - there is no trade in this region." + "$unit($unit) in $region($region): '$order($command)' - No trade is possible in this region." @@ -3963,8 +3990,8 @@ "$unit($unit) in $region($region): '$order($command)' - Bereits ein Synonym gesetzt." - "$unit($unit) in $region($region): '$order($command)' - synonym already set." - "$unit($unit) in $region($region): '$order($command)' - synonym already set." + "$unit($unit) in $region($region): '$order($command)' - Synonym already set." + "$unit($unit) in $region($region): '$order($command)' - Synonym already set." @@ -3973,8 +4000,8 @@ "$unit($unit) in $region($region): '$order($command)' - Kein Synonym angegeben." - "$unit($unit) in $region($region): '$order($command)' - synonym missing." - "$unit($unit) in $region($region): '$order($command)' - synonym missing." + "$unit($unit) in $region($region): '$order($command)' - Synonym missing." + "$unit($unit) in $region($region): '$order($command)' - Synonym missing." @@ -3983,8 +4010,8 @@ "$unit($unit) in $region($region): '$order($command)' - Ungültiges Synonym." - "$unit($unit) in $region($region): '$order($command)' - invalid synonym." - "$unit($unit) in $region($region): '$order($command)' - invalid synonym." + "$unit($unit) in $region($region): '$order($command)' - Invalid synonym." + "$unit($unit) in $region($region): '$order($command)' - Invalid synonym." @@ -3993,8 +4020,8 @@ "$unit($unit) in $region($region): '$order($command)' - Ungültiges Prefix." - "$unit($unit) in $region($region): '$order($command)' - invalid prefix." - "$unit($unit) in $region($region): '$order($command)' - invalid prefix." + "$unit($unit) in $region($region): '$order($command)' - Invalid prefix." + "$unit($unit) in $region($region): '$order($command)' - Invalid prefix." @@ -4065,7 +4092,7 @@ "$unit($unit) in $region($region): '$order($command)' - Wie sollen wir uns tarnen?" - "$unit($unit) in $region($region): '$order($command)' - What should we disguise us as?" + "$unit($unit) in $region($region): '$order($command)' - What should we disguise as?" @@ -4092,7 +4119,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit transportiert uns nicht." - "$unit($unit) in $region($region): '$order($command)' - the unit is not transporting us." + "$unit($unit) in $region($region): '$order($command)' - The unit is not transporting us." @@ -4163,6 +4190,7 @@ "$unit($unit) in $region($region): '$order($command)' - Das kann die Einheit nicht." + "$unit($unit) in $region($region): '$order($command)' - The unit cannot do this." @@ -4171,6 +4199,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man keine Schiffe bauen." + "$unit($unit) in $region($region): '$order($command)' - Ships cannot be built here." @@ -4179,6 +4208,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man keine Gebäude errichten." + "$unit($unit) in $region($region): '$order($command)' - Buildings cannot be built here." @@ -4187,6 +4217,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit kann nicht unterrichten." + "$unit($unit) in $region($region): '$order($command)' - The unit cannot teach." @@ -4195,6 +4226,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man nicht unterrichten." + "$unit($unit) in $region($region): '$order($command)' - You cannot teach here." @@ -4203,6 +4235,7 @@ "$unit($unit) in $region($region): '$order($command)' - Pferde müssen leider draußen bleiben." + "$unit($unit) in $region($region): '$order($command)' - Horses are not allowed inside." @@ -4211,6 +4244,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man niemanden angreifen." + "$unit($unit) in $region($region): '$order($command)' - You cannot attack here." @@ -4227,6 +4261,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man nicht zaubern." + "$unit($unit) in $region($region): '$order($command)' - You cannot cast spells here." @@ -4235,6 +4270,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier kann man nichts übergeben." + "$unit($unit) in $region($region): '$order($command)' - You cannot transfer items here." @@ -4243,6 +4279,7 @@ "$unit($unit) in $region($region): '$order($command)' - Nur eine Einzelperson kann das Ticket benutzen." + "$unit($unit) in $region($region): '$order($command)' - Only a single person can use the ticket." @@ -4251,6 +4288,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dieser Gegenstand funktioniert nur in der Eingangshalle." + "$unit($unit) in $region($region): '$order($command)' - This item only functions in the entry hall." @@ -4286,7 +4324,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Partei kann keine weiteren Wyrme besitzen." - "$unit($unit) in $region($region): '$order($command)' - The faction cannot contain any more wyrms." + "$unit($unit) in $region($region): '$order($command)' - The faction cannot have any more wyrms." @@ -4339,7 +4377,7 @@ - "$unit($unit) in $region($region): '$order($command)' - Um soetwas kann man nicht beten." + "$unit($unit) in $region($region): '$order($command)' - Um so etwas kann man nicht beten." "$unit($unit) in $region($region): '$order($command)' - You cannot pray for this." @@ -4348,7 +4386,7 @@ - "$unit($unit) in $region($region): '$order($command)' - Soetwas kann man nicht opfern." + "$unit($unit) in $region($region): '$order($command)' - So etwas kann man nicht opfern." "$unit($unit) in $region($region): '$order($command)' - You cannot sacrifice this." @@ -4358,7 +4396,7 @@ "$unit($unit) in $region($region): '$order($command)' - Auraangabe fehlerhaft oder zuwenig Aura." - "$unit($unit) in $region($region): '$order($command)' - Invalid aura specification or too little aura." + "$unit($unit) in $region($region): '$order($command)' - Invalid aura specification or not enough aura." @@ -4482,7 +4520,7 @@ "$unit($unit) in $region($region): '$order($command)' - $building($building) ist kein Steinkreis." - "$unit($unit) in $region($region): '$order($command)' - $building($building) is not a stonecircle." + "$unit($unit) in $region($region): '$order($command)' - $building($building) is not a stone circle." @@ -4523,7 +4561,7 @@ "$unit($unit) in $region($region): '$order($command)' - Soll eine Einheit oder ein Schiff verfolgt werden?" "$unit($unit) in $region($region): '$order($command)' - Is this unit or ship supposed to be followed?" - "$unit($unit) in $region($region): '$order($command)' - Is this unit or ship supposed to be followed?" + "$unit($unit) in $region($region): '$order($command)' - Is a unit or a ship supposed to be followed?" @@ -4533,7 +4571,7 @@ "$unit($unit) in $region($region): '$order($command)' - Soll eine Einheit oder ein Schiff eine neue Nummer bekommen?" "$unit($unit) in $region($region): '$order($command)' - Is this unit or ship supposed to get a new number?" - "$unit($unit) in $region($region): '$order($command)' - Is this unit or ship supposed to get a new number?" + "$unit($unit) in $region($region): '$order($command)' - Is a unit or a ship supposed to get a new number?" @@ -4543,7 +4581,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier können nur Orks rekrutiert werden." "$unit($unit) in $region($region): '$order($command)' - You can recruit only Orcs here." - "$unit($unit) in $region($region): '$order($command)' - You can recruit only Orcs here." + "$unit($unit) in $region($region): '$order($command)' - You can recruit only orcs here." @@ -4601,8 +4639,8 @@ "$unit($unit) in $region($region): '$order($command)' - Dieser Typ Einheit kann keine Gebäude betreten." - "$unit($unit) in $region($region): '$order($command)' - this type of unit cannot enter a building." - "$unit($unit) in $region($region): '$order($command)' - this type of unit cannot enter a building." + "$unit($unit) in $region($region): '$order($command)' - This type of unit cannot enter a building." + "$unit($unit) in $region($region): '$order($command)' - This type of unit cannot enter a building." @@ -4651,7 +4689,7 @@ "$unit($unit) in $region($region): '$order($command)' - Ein Vertrauter wird beschworen, verschwindet jedoch wieder, als er keine Verbindung zu seinem Element herstellen kann." - "$unit($unit) in $region($region): '$order($command)' - A familiar is summoned, but disappears again when it cannot get in contact with its natural element." + "$unit($unit) in $region($region): '$order($command)' - A familiar is summoned, but it disappears again when it cannot get in contact with its natural element." @@ -4671,7 +4709,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dafür braucht ein Einheit mindestens Kräuterkunde 7." "$unit($unit) in $region($region): '$order($command)' - A skill of herbalism 7 or higher is required." - "$unit($unit) in $region($region): '$order($command)' - A skill of herbalism 7 or higher is required." + "$unit($unit) in $region($region): '$order($command)' - A herbalism skill of 7 or higher is required." @@ -4681,7 +4719,7 @@ "$unit($unit) in $region($region): '$order($command)' - Einheiten in den hinteren Reihen können nicht angreifen." "$unit($unit) in $region($region): '$order($command)' - Units cannot attack from the second row." - "$unit($unit) in $region($region): '$order($command)' - Units cannot attack from the second row." + "$unit($unit) in $region($region): '$order($command)' - Units from the backmost rows cannot attack." @@ -4689,8 +4727,8 @@ - "$unit($unit) in $region($region): '$order($command)' - unbekannter Kampfstatus." - "$unit($unit) in $region($region): '$order($command)' - unknown combat status." + "$unit($unit) in $region($region): '$order($command)' - Unbekannter Kampfstatus." + "$unit($unit) in $region($region): '$order($command)' - Unknown combat status." @@ -4777,7 +4815,7 @@ "$unit($unit) in $region($region): '$order($command)' - Im astralen Nebel konnte niemand entdeckt werden." - "$unit($unit) in $region($region): '$order($command)' - Noone could be seen in the astral fog." + "$unit($unit) in $region($region): '$order($command)' - No one could be seen in the astral fog." @@ -4796,7 +4834,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dieser Zauber kann nur im Astralraum gezaubert werden." - "$unit($unit) in $region($region): '$order($command)' - This spell can only be cast in the astral plane." + "$unit($unit) in $region($region): '$order($command)' - This spell can only be cast on the astral plane." @@ -4877,7 +4915,7 @@ "$unit($unit) in $region($region): '$order($command)' - Auraangabe fehlerhaft." - "$unit($unit) in $region($region): '$order($command)' - wrong Aura values." + "$unit($unit) in $region($region): '$order($command)' - Wrong aura values." @@ -4886,7 +4924,7 @@ "$unit($unit) in $region($region): '$order($command)' - Zu dieser Einheit kann keine Aura übertragen werden." - "$unit($unit) in $region($region): '$order($command)' - You cannot pass aura on to this unit." + "$unit($unit) in $region($region): '$order($command)' - You cannot transfer aura to this unit." @@ -4935,7 +4973,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Stimmung in der Region ist so schlecht, dass niemand auf den Zauber reagiert." - "$unit($unit) in $region($region): '$order($command)' - The mood in this region is so bad that nobody reacts t the spell." + "$unit($unit) in $region($region): '$order($command)' - The mood in this region is so bad that nobody reacts to the spell." @@ -4947,6 +4985,7 @@ "$unit($unit) in $region($region): '$order($command)' - $unit($target) wusste trotz intensivem Verhör nichts über $region($tregion) zu berichten." + "$unit($unit) in $region($region): '$order($command)' - Despite intense questioning, $unit($target) did not have anything to tell about $region($tregion)." @@ -4956,7 +4995,7 @@ "$unit($unit) in $region($region): '$order($command)' - So viele Persoenen übersteigen die Kräfte des Magiers." - "$unit($unit) in $region($region): '$order($command)' -This many people exceed the powers of the magician." + "$unit($unit) in $region($region): '$order($command)' - This many people exceed the powers of the magician." @@ -4967,7 +5006,7 @@ "$unit($unit) in $region($region): '$order($command)' - $unit($target) hat unaufkündbare Bindungen an seine alte Partei." - "$unit($unit) in $region($region): '$order($command)' - $unit($target) have unbreakable prior commitments to their faction." + "$unit($unit) in $region($region): '$order($command)' - $unit($target) have unbreakable commitments to their faction." @@ -5022,7 +5061,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die maximale Aura reicht nicht für diesen Zauber." - "$unit($unit) in $region($region): '$order($command)' - Magician's maximum Aura is not high enough for this spell." + "$unit($unit) in $region($region): '$order($command)' - Magician's maximum aura is not high enough for this spell." @@ -5067,7 +5106,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dorthin führt kein Weg." - "$unit($unit) in $region($region): '$order($command)' - No way is leading in this direction." + "$unit($unit) in $region($region): '$order($command)' - There is no route leading there." @@ -5139,7 +5178,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dieser Zauber kann nur auf Land gelegt werden." - "$unit($unit) in $region($region): '$order($command)' - This spell works only ashore." + "$unit($unit) in $region($region): '$order($command)' - This spell only works on dry land." @@ -5148,7 +5187,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Zauber scheint ungewöhnlich schwach zu sein. Irgendetwas hat die magischen Energien abgeleitet." - "$unit($unit) in $region($region): '$order($command)' - the spell seems exceptionally weak. Something has interfred with the magical energies." + "$unit($unit) in $region($region): '$order($command)' - The spell seems exceptionally weak. Something has interfred with the magical energies." @@ -5229,7 +5268,7 @@ "$unit($unit) in $region($region): '$order($command)' - Diesen Spruch kann der Vertraute nicht zaubern." - "$unit($unit) in $region($region): '$order($command)' - the familiar cannot cast this spell." + "$unit($unit) in $region($region): '$order($command)' - The familiar cannot cast this spell." @@ -5256,7 +5295,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dieser Zauber ist nur im Kampf sinnvoll." - "$unit($unit) in $region($region): '$order($command)' - this spell makes only sense in combat." + "$unit($unit) in $region($region): '$order($command)' - This spell only makes sense in combat." @@ -5328,7 +5367,7 @@ "$unit($unit) in $region($region): '$order($command)' - Diese Rasse kann eine Burg nicht belagern." - "$unit($unit) in $region($region): '$order($command)' - This race cannot siege a castle." + "$unit($unit) in $region($region): '$order($command)' - This race cannot besiege a castle." @@ -5337,7 +5376,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Trank bekommt der Einheit nicht." - "$unit($unit) in $region($region): '$order($command)' - The unit disagreed with the potion." + "$unit($unit) in $region($region): '$order($command)' - The potion does not agree with the unit." @@ -5346,7 +5385,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Nestwärme kann nur von Insektenvölkern benutzt werden." - "$unit($unit) in $region($region): '$order($command)' - this potion can only be used by insects." + "$unit($unit) in $region($region): '$order($command)' - This potion can only be used by insects." @@ -5463,7 +5502,7 @@ "$unit($unit) in $region($region): '$order($command)' - Unbekannte Option." - "$unit($unit) in $region($region): '$order($command)' - Unknown Option." + "$unit($unit) in $region($region): '$order($command)' - Unknown option." @@ -5598,7 +5637,7 @@ "$unit($unit) in $region($region): '$order($command)' - Unbekannter Hilfe-Modus." - "$unit($unit) in $region($region): '$order($command)' - Unknown Help- Mode." + "$unit($unit) in $region($region): '$order($command)' - Unknown help mode." @@ -5607,7 +5646,7 @@ "$unit($unit) in $region($region): '$order($command)' - Unbekannte Meldungs-Option." - "$unit($unit) in $region($region): '$order($command)' - Unknown Report-Option." + "$unit($unit) in $region($region): '$order($command)' - Unknown report option." @@ -5616,7 +5655,7 @@ "$unit($unit) in $region($region): '$order($command)' - Um in Wüsten Straßen bauen zu können, muß zuerst eine Karawanserei errichtet werden." - "$unit($unit) in $region($region): '$order($command)' - You've got to build a caravansary before building roads through deserts." + "$unit($unit) in $region($region): '$order($command)' - You must build a caravansary before building roads through deserts." @@ -5625,7 +5664,7 @@ "$unit($unit) in $region($region): '$order($command)' - Um in Sümpfen Straßen bauen zu können, muß zuerst ein Damm errichtet werden." - "$unit($unit) in $region($region): '$order($command)' - You've got to build a dam before building roads through swamps." + "$unit($unit) in $region($region): '$order($command)' - You must build a dam before building roads through swamps." @@ -5634,7 +5673,7 @@ "$unit($unit) in $region($region): '$order($command)' - So viele Leute kann die Partei nicht aufnehmen." - "$unit($unit) in $region($region): '$order($command)' - The faction cannot hire so many strangers." + "$unit($unit) in $region($region): '$order($command)' - The faction cannot hire so many people." @@ -5697,7 +5736,7 @@ "$unit($unit) in $region($region): '$order($command)' - Pferde kann man nur in einer Pferdezucht züchten." - "$unit($unit) in $region($region): '$order($command)' - You can breed horses only in a stable." + "$unit($unit) in $region($region): '$order($command)' - You can only breed horses in a stable." @@ -5715,7 +5754,7 @@ "$unit($unit) in $region($region): '$order($command)' - Personen können nur an Menschen übergeben werden." - "$unit($unit) in $region($region): '$order($command)' - Characters can be given only to Human parties." + "$unit($unit) in $region($region): '$order($command)' - Characters can be given only to human parties." @@ -5733,7 +5772,7 @@ "$unit($unit) in $region($region): '$order($command)' - Nur Elfen können diese Bögen herstellen." - "$unit($unit) in $region($region): '$order($command)' - Only Elves can make these bows." + "$unit($unit) in $region($region): '$order($command)' - Only elves can make these bows." @@ -5742,7 +5781,7 @@ "$unit($unit) in $region($region): '$order($command)' - Nur die EMail-Adresse angeben!" - "$unit($unit) in $region($region): '$order($command)' - Submit only email-address, please!" + "$unit($unit) in $region($region): '$order($command)' - Please provide only an email address!" @@ -5796,7 +5835,7 @@ "$unit($unit) in $region($region): '$order($command)' - Nachricht zu lang - gekürzt." - "$unit($unit) in $region($region): '$order($command)' - Message has been cut (too long).." + "$unit($unit) in $region($region): '$order($command)' - Message has been cut (too long)." @@ -5805,7 +5844,7 @@ "$unit($unit) in $region($region): '$order($command)' - Man muß angeben, ob eine Burg, ein Schiff, eine Region oder eine Einheit beschrieben werden soll." - "$unit($unit) in $region($region): '$order($command)' - Specify if description is for a castle, a ship, a region or a unit." + "$unit($unit) in $region($region): '$order($command)' - Specify if description is for a castle, a ship, a region, or a unit." @@ -5814,7 +5853,7 @@ "$unit($unit) in $region($region): '$order($command)' - Man muß angeben, ob eine Burg, ein Schiff, eine Einheit, eine Region oder eine Partei benannt werden soll." - "$unit($unit) in $region($region): '$order($command)' - Specify if a castle, a ship, a region or a unit is supposed to be named." + "$unit($unit) in $region($region): '$order($command)' - Specify if a castle, a ship, a region, or a unit is supposed to be named." @@ -5904,7 +5943,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit will nicht transportiert werden." - "$unit($unit) in $region($region): '$order($command)' - The unit doen not want to be transported." + "$unit($unit) in $region($region): '$order($command)' - The unit does not want to be transported." @@ -5922,7 +5961,7 @@ "$unit($unit) in $region($region): '$order($command)' - In Gletschern können keine Insekten rekrutiert werden." - "$unit($unit) in $region($region): '$order($command)' - Insects cannot be recruited in glaciers." + "$unit($unit) in $region($region): '$order($command)' - Insects cannot be recruited in glacier regions." @@ -5985,7 +6024,7 @@ "$unit($unit) in $region($region): '$order($command)' - Hier gibt es keine Mallornbäume." - "$unit($unit) in $region($region): '$order($command)' - There are no Mallorn trees here." + "$unit($unit) in $region($region): '$order($command)' - There are no mallorn trees here." @@ -5994,7 +6033,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit fährt nicht mit uns." - "$unit($unit) in $region($region): '$order($command)' - The unit does not have a RIDE-order." + "$unit($unit) in $region($region): '$order($command)' - The unit does not have travel with us." @@ -6012,7 +6051,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit hat nicht genügend Materialien für den Schiffbau." - "$unit($unit) in $region($region): '$order($command)' - the unit is lacking materials to build the ship." + "$unit($unit) in $region($region): '$order($command)' - The unit is lacking materials for building the ship." @@ -6038,8 +6077,8 @@ - "$unit($unit) in $region($region): '$order($command)' - Es wurde keine EMail-Adresse angegeben." - "$unit($unit) in $region($region): '$order($command)' - No email-address was supplied." + "$unit($unit) in $region($region): '$order($command)' - Es wurde keine Emailadresse angegeben." + "$unit($unit) in $region($region): '$order($command)' - No email address was supplied." @@ -6075,7 +6114,7 @@ "$unit($unit) in $region($region): '$order($command)' - Einheit muß zuerst die Region bewachen." - "$unit($unit) in $region($region): '$order($command)' - first, the unit must guard the region." + "$unit($unit) in $region($region): '$order($command)' - The unit must first guard the region." @@ -6084,7 +6123,7 @@ "$unit($unit) in $region($region): '$order($command)' - Einheit ist nicht bewaffnet und kampffähig." - "$unit($unit) in $region($region): '$order($command)' - The unit is not armed and fighting fit." + "$unit($unit) in $region($region): '$order($command)' - The unit is not armed and ready to fight." @@ -6138,7 +6177,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit nimmt niemanden an." - "$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody." + "$unit($unit) in $region($region): '$order($command)' - This unit does not accept anybody." @@ -6177,7 +6216,7 @@ "$unit($unit) in $region($region): '$order($command)' - Es kann hier kein Kontakt zur Astralwelt aufgenommen werden." - "$unit($unit) in $region($region): '$order($command)' - There is no connection to the astral plane." + "$unit($unit) in $region($region): '$order($command)' - There is no connection to the astral plane here." @@ -6207,7 +6246,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Richtung wurde nicht erkannt." - "$unit($unit) in $region($region): '$order($command)' - Direction was not recognized." + "$unit($unit) in $region($region): '$order($command)' - The given direction was not recognized." @@ -6226,7 +6265,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Region wird von Nichtalliierten bewacht." - "$unit($unit) in $region($region): '$order($command)' - This region is guarded by a non allied faction." + "$unit($unit) in $region($region): '$order($command)' - This region is guarded by a non-allied faction." @@ -6496,7 +6535,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit ist nicht der Eigentümer." - "$unit($unit) in $region($region): '$order($command)' - The unit is not he owner." + "$unit($unit) in $region($region): '$order($command)' - The unit is not the owner." @@ -6505,7 +6544,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit ist nicht bewaffnet und kampffähig." - "$unit($unit) in $region($region): '$order($command)' - The unit is not armed and fighting fit." + "$unit($unit) in $region($region): '$order($command)' - The unit is not armed and ready to fight." @@ -6559,7 +6598,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit hat nicht genug Wagenlenker oder zuviel andere Fracht, um die Wagen aufzuladen." - "$unit($unit) in $region($region): '$order($command)' - The unit does not have enough coachmen or too much freights to lad the wagons." + "$unit($unit) in $region($region): '$order($command)' - The unit does not have enough coachmen or has too much freights to lad the wagons." @@ -6706,6 +6745,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Bauern sind schlecht gelaunt." + "$unit($unit) in $region($region): '$order($command)' - The peasant morale is low." @@ -6732,7 +6772,7 @@ "$unit($unit) in $region($region): '$order($command)' - Der Fluch verhindert das." - "$unit($unit) in $region($region): '$order($command)' - The escape prevented that from happening." + "$unit($unit) in $region($region): '$order($command)' - A curse prevents this from happening." @@ -6950,7 +6990,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit kann nicht unterrichtet werden." - "$unit($unit) in $region($region): '$order($command)' - this unit cannot be taught." + "$unit($unit) in $region($region): '$order($command)' - This unit cannot be taught." @@ -7041,7 +7081,7 @@ "$unit($unit) in $region($region): '$order($command)' - Die Einheit steht nicht im benötigten Gebäude, $localize($building)." - "$unit($unit) in $region($region): '$order($command)' - The unit must be in a $localize($building) to produce this." + "$unit($unit) in $region($region): '$order($command)' - The unit must be in a $localize($building) to produce this." @@ -7051,7 +7091,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dazu braucht man das Talent $skill($skill)." - "$unit($unit) in $region($region): '$order($command)' - this requires the skill $skill($skill)." + "$unit($unit) in $region($region): '$order($command)' - This requires the skill $skill($skill)." @@ -7234,7 +7274,7 @@ "$unit($unit) in $region($region): '$order($command)' - Um in Gletschern Straßen bauen zu können, muß zuerst ein Tunnel errichtet werden." "$unit($unit) in $region($region): '$order($command)' - You've got to build a tunnel before building roads through glaciers." - "$unit($unit) in $region($region): '$order($command)' - You've got to build a tunnel before building roads through glaciers." + "$unit($unit) in $region($region): '$order($command)' - You must build a tunnel before building roads through glaciers." @@ -7409,7 +7449,7 @@ "$unit($unit) konnte durch einen Heiltrank überleben." - "$unit($unit) was saved by a haling potion." + "$unit($unit) was saved by a healing potion." @@ -7492,6 +7532,7 @@ "$unit($mage) murmelt eine düster klingende Formel. Ein plötzlicher Tumult entsteht, der sich jedoch schnell wieder legt." + "$unit($mage) mumbles arcane words. There is a sudden hubbub, but order is restored quickly." @@ -7499,6 +7540,7 @@ "$unit($mage) murmelt eine düster klingende Formel. Ein plötzlicher Tumult entsteht und bringt die Kampfaufstellung durcheinander." + "$unit($mage) mumbles arcane words. There is a sudden hubbub and the battle order is disturbed." @@ -7506,6 +7548,7 @@ "$unit($mage) stimmt einen seltsamen Gesang an. Ein plötzlicher Tumult entsteht, der sich jedoch schnell wieder legt." + "$unit($mage) intones a mysterious chant. There is a sudden hubbub, but order is restored quickly." @@ -7513,7 +7556,7 @@ "$unit($mage) stimmt einen seltsamen Gesang an. Ein plötzlicher Tumult entsteht und bringt die Kampfaufstellung durcheinander." - "$unit($mage) begins a mysterious chant. great confusion sweeps through the ranks of the enemy." + "$unit($mage) begins a mysterious chant. Great confusion sweeps through the ranks of the enemy." @@ -7522,6 +7565,7 @@ "$unit($mage) läßt die Mauern von $building($building) in einem unheimlichen magischen Licht erglühen." + "$unit($mage) causes the walls of $building($building) to glow in an eerie magic light." @@ -7554,7 +7598,7 @@ "$unit($mage) läßt die Erde in $region($region) erzittern." - "$unit($mage) shakes the earth in $region($region)." + "$unit($mage) makes the earth shake in $region($region)." @@ -7581,6 +7625,7 @@ "$unit($mage) verliert sich in die Träume von $unit($unit) und erhält einen Eindruck von $region($region)." + "$unit($mage) is lost in the dreams of $unit($unit) and gets a glimps into $region($region)." @@ -7590,6 +7635,7 @@ "$unit($mage) verschafft $unit($unit) ein schönes Nachtleben in $region($region)." + "$unit($mage) causes $unit($unit) to have a wonderful night in $region($region)." @@ -7598,6 +7644,7 @@ "$unit($mage) sorgt für schlechten Schlaf in $region($region)." + "$unit($mage) disturbs everyone's dreams in $region($region)." @@ -7617,7 +7664,7 @@ "$unit($mage) erschafft in $region($region) eine verheerende Feuersbrunst. $int($amount) Bäume fallen den Flammen zum Opfer." - "$unit($mage) creates a flaming inferno in $region($region). $int($amount) trees fall vistim to the flames." + "$unit($mage) creates a flaming inferno in $region($region). $int($amount) trees fall victim to the flames." @@ -7626,6 +7673,7 @@ "Mit einem Ritual bindet $unit($mage) die magischen Kräfte der Erde in die Mauern von $building($building)." + "A magic ritual by $unit($mage) binds magic energies to the walls of $building($building)." @@ -7643,6 +7691,7 @@ "$unit($mage) ruft das Feuer der Sonne auf $region($region) hinab. Eis schmilzt und verwandelt sich in Morast. Reißende Ströme spülen die mageren Felder weg und ersäufen Mensch und Tier. Was an Bauten nicht den Fluten zum Opfer fiel, verschlingt der Morast. Die sengende Hitze verändert die Region für immer." + "$unit($mage) calls the torching power of the sun upon $region($region). Ice melts and turns the lands into swamps. Powerful rivers wash away the fertile soil and drown people and animals alike. What buildings have not succumbed to the floods sink into the mire. The torrid sun changes the region forever." @@ -7651,6 +7700,7 @@ "$unit($mage) ruft das Feuer der Sonne auf $region($region) hinab. Die Felder verdorren und Pferde verdursten. Die Hungersnot kostet vielen Bauern das Leben. Vertrocknete Bäume recken ihre kahlen Zweige in den blauen Himmel, von dem erbarmungslos die sengende Sonne brennt." + "$unit($mage) calls the torching power of the sun upon $region($region). The crops wither, horses die of thirst. A famine claims the lives of many peasants. The trees die and their bald branches cannot protect from the torrid sun that mercilessly burns the grounds." @@ -7659,6 +7709,7 @@ "$unit($mage) ruft das Feuer der Sonne auf $region($region) hinab. Die Felder verdorren und Pferde verdursten. Die Hungersnot kostet vielen Bauern das Leben. Vertrocknete Bäume recken ihre kahlen Zweige in den blauen Himmel, von dem erbarmungslos die sengende Sonne brennt. Die Dürre verändert die Region für immer." + "$unit($mage) calls the torching power of the sun upon $region($region). The crops wither, horses die of thirst. A famine claims the lives of many peasants. The trees die and their bald branches cannot protect from the torrid sun that mercilessly burns the grounds. The drought permanently alters the region." @@ -7667,6 +7718,7 @@ "$unit($mage) ruft das Feuer der Sonne auf $region($region) hinab. Das Eis zerbricht und eine gewaltige Flutwelle verschlingt die Region." + "$unit($mage) calls the torching power of the sun upon $region($region). The ice melts and and the region is consumed by a tidal wave." @@ -7683,14 +7735,14 @@ "In der Luft liegt ein wunderschönes Lied, dessen friedfertiger Stimmung sich niemand entziehen kann. Einige Leute werfen sogar ihre Waffen weg." - "A wondrous song fills the air and enchants the public. The song's peaceful melody makes several listeners drop their weapon." + "A wondrous song fills the air and enchants the public. The song's peaceful melody makes several listeners drop their weapons." "Die Gesangskunst von $unit($mage) begeistert die Leute. Die friedfertige Stimmung des Lieds überträgt sich auf alle Zuhörer. Einige werfen ihre Waffen weg." - "The marvelous singing of $unit($mage) enchants the public. The song's peaceful melody makes several listeners drop their weapon." + "The marvelous singing of $unit($mage) enchants the public. The song's peaceful melody makes several listeners drop their weapons." @@ -7718,6 +7770,7 @@ "$unit($mage) zaubert $spell($spell). $int($amount) Krieger verloren Erinnerungen, $int($dead) wurden getötet." + "$unit($mage) casts $spell($spell). $int($amount) warriors lose their memories, $int($dead) were killed." @@ -7737,6 +7790,7 @@ "$unit($mage) ruft $int($amount) $race($race, 0) zu Hilfe." + "$unit($mage) calls upon the help of $int($amount) $race($race, 0)." @@ -7774,7 +7828,7 @@ "$unit($unit) in $region($region): '$order($command)' - Dorthin führt kein Weg." - "$unit($unit) in $region($region): '$order($command)' - There is no way leading there." + "$unit($unit) in $region($region): '$order($command)' - There is no route leading there." @@ -8097,7 +8151,7 @@ "Der Waldbrand in $region($region) griff auch auf $region($next) über, und $int($trees) verbrannten." - "The fire in $region($region) spread to $region($next) and $int($trees) were burnt." + "The fire in $region($region) spread to $region($next) and $int($trees) were burned." @@ -8289,6 +8343,7 @@ "Plötzlich stolpert $unit($unit) über einige $localize($name). Nach kurzem Zögern entschließen die $localize($name), sich Deiner Partei anzuschließen." + "$unit($unit) stumbles upon $localize($name). After short hesitation, $localize($name) agrees to join your faction." @@ -8340,6 +8395,7 @@ "Der Versuch, die Greifenschwingen zu benutzen, schlug fehl. $unit($unit) konnte die Ebene der Herausforderung nicht verlassen." + "The attempt to use wings of the gryphon failed. $unit($unit) could not leave the Plane of Challenge." @@ -8347,6 +8403,7 @@ "$unit($unit) springt in die ewigen Feuer des Kraters." + "$unit($unit) jumps into the eternal flame of the caldera." @@ -8355,6 +8412,7 @@ "$unit($unit) springt in die ewigen Feuer des Kraters." + "$unit($unit) jumps into the eternal flame of the caldera." @@ -8363,6 +8421,7 @@ "In $region($region) erklingt die Stimme des Torwächters: 'Nur wer ohne materielle Güter und noch lernbegierig ist, der darf die Ebene der Herausforderung betreten. Und vergiß nicht mein Trinkgeld.'. $unit($unit) erhielt keinen Einlaß." + "$region($region) reverberates from the voice of the gate keeper: 'Only those who forgo material riches and who are willing to learn my enter the Plane of Challenge. And don't forget about my tip!'. $unit($unit) was not admitted." @@ -8371,6 +8430,7 @@ "In $region($region) öffnet sich ein Portal. Eine Stimme ertönt, und spricht: 'Willkommen in der Ebene der Herausforderung'. $unit($unit) durchschreitet das Tor zu einer anderen Welt." + "A portal opens in $region($region). A voice calls: 'Welcome to the Plane of Challenge'. $unit($unit) walks through the gate to another world." @@ -8431,7 +8491,7 @@ "$unit($unit) in $region($region): '$order($command)' - Es kann maximal $int($amount) Magier pro Partei geben." - "$unit($unit) in $region($region): '$order($command)' - There may not be more tha $int($amount) magicians in your faction." + "$unit($unit) in $region($region): '$order($command)' - There may not be more than $int($amount) magicians in your faction." @@ -8475,7 +8535,7 @@ "$unit($unit) in $region($region): '$order($command)' - In dieser Region gibt es keine Brücken und Straßen mehr zu bauen." - "$unit($unit) in $region($region): '$order($command)' - the roads and bridges in this region are complete." + "$unit($unit) in $region($region): '$order($command)' - The roads and bridges in this region are complete." @@ -8515,7 +8575,8 @@ - "$unit($unit) in $region($region): '$order($command)' - Dieser Zauber kann nciht auf Untote gezaubert werden." + "$unit($unit) in $region($region): '$order($command)' - Dieser Zauber kann nicht auf Untote gezaubert werden." + "$unit($unit) in $region($region): '$order($command)' - This spell cannot be cast upon undead." From 039ee159cb93816f603dcce05bd8c8f5ae04213c Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Wed, 14 Jan 2015 16:13:08 +0100 Subject: [PATCH 2/7] a bunch of messages in the NR where not localized --- res/core/de/strings.xml | 37 +++++++++ res/core/messages.xml | 32 ++++++++ src/report.c | 172 +++++++++++++++++++--------------------- 3 files changed, 150 insertions(+), 91 deletions(-) diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml index c233a507f..e2003f997 100644 --- a/res/core/de/strings.xml +++ b/res/core/de/strings.xml @@ -364,6 +364,43 @@ und im and to the + + Schemen der Regionen + Schemes of + + + sind erkennbar. + can be discerned. + + + Im + To the + + + und im + , and to the + + + , im + , to the + + + Die Region wird von + The region is guarded by + + + unbekannten Einheiten + unknown units + + + bewacht. + . + + + (im Bau) + (under construction) + + Einheit Unit diff --git a/res/core/messages.xml b/res/core/messages.xml index cbc5dd780..68f83f44b 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -924,6 +924,38 @@ "Auf dem Markt wird $resource($p1,0) feilgeboten." "The local market offers $resource($p1,0)." + + + + + + "Auf der Einheit $if($eq($left,1),"liegt","liegen") $int($left) Wirkung$if($eq($left,1),"","en") $resource($potion,1)." + "There are $int($left) use($eq($left,1),"s","") of $resource($potion,1) left." + + + + + + "Die Region ist im Besitz von $faction($faction)." + "The region is owned by $faction($faction)." + + + + + + + "$if($transparent," befindet sich"," versperrt") ${object} $if($transparent,""," die Sicht")." + "$if($transparent," there is"," sight is blocked by ") ${object}." + + + + + + + ", belagert von $int($soldiers) Personen$if($lt($diff,0),""," (abgeschnitten)")" + ", besieged by $int($soldiers) soldiers$if($lt($diff,0),""," (cut off)")" + + diff --git a/src/report.c b/src/report.c index efdb80268..98ba9c042 100644 --- a/src/report.c +++ b/src/report.c @@ -634,10 +634,10 @@ int indent) for (; a; a = a->next) { char buf[4096]; - + message *msg; + if (fval(a->type, ATF_CURSE)) { curse *c = (curse *)a->data.v; - message *msg; if (c->type->cansee) { self = c->type->cansee(viewer, obj, typ, c, self); @@ -654,13 +654,10 @@ int indent) else if (a->type == &at_effect && self) { effect_data *data = (effect_data *)a->data.v; if (data->value > 0) { - sprintf(buf, "Auf der Einheit lieg%s %d Wirkung%s %s.", - (data->value == 1 ? "t" : "en"), - data->value, - (data->value == 1 ? "" : "en"), - LOC(default_locale, resourcename(data->type->itype->rtype, 0))); - rnl(F); - rparagraph(F, buf, indent, 2, 0); + msg = msg_message("nr_potion_effect", "potion left", data->type->itype->rtype, data->value); + nr_render(msg, viewer->locale, buf, sizeof(buf), viewer); + rparagraph(F, buf, indent, 2, 0); + msg_release(msg); } } } @@ -828,37 +825,37 @@ static void prices(FILE * F, const region * r, const faction * f) for (dmd = r->land->demands; dmd; dmd = dmd->next) if (dmd->value > 0) { - m = msg_message("nr_market_price", "product price", - dmd->type->itype->rtype, dmd->value * dmd->type->price); - bytes = (int)nr_render(m, f->locale, bufp, size, f); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - msg_release(m); - n--; - if (n == 0) { - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_end"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } - else if (n == 1) { - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_final"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } - else { - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_next"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } + m = msg_message("nr_market_price", "product price", + dmd->type->itype->rtype, dmd->value * dmd->type->price); + bytes = (int)nr_render(m, f->locale, bufp, size, f); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + msg_release(m); + n--; + if (n == 0) { + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_end"), size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } + else if (n == 1) { + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_final"), size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } + else { + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_next"), size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } } } /* Schreibe Paragraphen */ @@ -1099,10 +1096,12 @@ static void describe(FILE * F, const seen_region * sr, faction * f) if (rule_region_owners()) { const faction *owner = region_get_owner(r); + message *msg; + if (owner != NULL) { - // TODO: localization - bytes = _snprintf(bufp, size, " Die Region ist im Besitz von %s.", - factionname(owner)); + msg = msg_message("nr_region_owner", "faction", owner); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + msg_release(msg); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); } @@ -1207,7 +1206,9 @@ static void describe(FILE * F, const seen_region * sr, faction * f) if (rl) { bufp = buf; size = sizeof(buf) - 1; - bytes = (int)strlcpy(bufp, "Schemen der Regionen ", size); + + // this localization might not work for every language but is fine for de and en + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_schemes_prefix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); rl2 = rl; @@ -1222,7 +1223,7 @@ static void describe(FILE * F, const seen_region * sr, faction * f) WARN_STATIC_BUFFER(); } } - bytes = (int)strlcpy(bufp, " sind erkennbar.", size); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_schemes_postfix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); free_regionlist(rl); @@ -1249,17 +1250,20 @@ static void describe(FILE * F, const seen_region * sr, faction * f) rnl(F); for (e = edges; e; e = e->next) { bool first = true; + message *msg; + bufp = buf; size = sizeof(buf) - 1; for (d = 0; d != MAXDIRECTIONS; ++d) { if (!e->exist[d]) continue; + // this localization might not work for every language but is fine for de and en if (first) - bytes = (int)strlcpy(bufp, "Im ", size); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_borderlist_prefix"), size); else if (e->lastd == d) - bytes = (int)strlcpy(bufp, " und im ", size); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_borderlist_lastfix"), size); else - bytes = (int)strlcpy(bufp, ", im ", size); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_borderlist_infix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); bytes = (int)strlcpy(bufp, LOC(f->locale, directions[d]), size); @@ -1267,21 +1271,13 @@ static void describe(FILE * F, const seen_region * sr, faction * f) WARN_STATIC_BUFFER(); first = false; } - if (!e->transparent) - bytes = (int)strlcpy(bufp, " versperrt ", size); - else - bytes = (int)strlcpy(bufp, " befindet sich ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, e->name, size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - if (!e->transparent) - bytes = (int)strlcpy(bufp, " die Sicht.", size); - else - bytes = (int)strlcpy(bufp, ".", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); + // TODO name is localized? Works for roads anyway... + msg = msg_message("nr_borderlist_postfix", "transparent object", e->transparent, e->name); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + msg_release(msg); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + *bufp = 0; rparagraph(F, buf, 0, 0, 0); } @@ -1420,16 +1416,18 @@ static void durchreisende(FILE * F, const region * r, const faction * f) ++counter; if (u->ship != NULL) { #ifdef GERMAN_FLUFF_ENABLED - if (counter == 1) { - bytes = (int)strlcpy(bufp, "Die ", size); - } - else { - bytes = (int)strlcpy(bufp, "die ", size); - } - if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); - break; - } + if (strcmp("de", f->locale->name)==0) { + if (counter == 1) { + bytes = (int)strlcpy(bufp, "Die ", size); + } + else { + bytes = (int)strlcpy(bufp, "die ", size); + } + if (wrptr(&bufp, &size, bytes) != 0) { + WARN_STATIC_BUFFER(); + break; + } + } #endif bytes = (int)strlcpy(bufp, shipname(u->ship), size); } @@ -1827,7 +1825,7 @@ static void guards(FILE * F, const region * r, const faction * see) size_t size = sizeof(buf) - 1; int bytes; - bytes = (int)strlcpy(bufp, "Die Region wird von ", size); + bytes = (int)strlcpy(bufp, LOC(see->locale, "nr_guarding_prefix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); @@ -1846,12 +1844,12 @@ static void guards(FILE * F, const region * r, const faction * see) bytes = (int)strlcpy(bufp, factionname(guardians[i]), size); } else { - bytes = (int)strlcpy(bufp, "unbekannten Einheiten", size); + bytes = (int)strlcpy(bufp, LOC(see->locale, "nr_guarding_unknown"), size); } if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); } - bytes = (int)strlcpy(bufp, " bewacht.", size); + bytes = (int)strlcpy(bufp, LOC(see->locale, "nr_guarding_postfix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); rnl(F); @@ -1984,6 +1982,7 @@ const faction * f) const char *name, *bname, *billusion = NULL; const struct locale *lang = NULL; char buffer[8192], *bufp = buffer; + message *msg; size_t size = sizeof(buffer) - 1; rnl(F); @@ -2014,26 +2013,17 @@ const faction * f) } if (b->size < b->type->maxsize) { - bytes = (int)strlcpy(bufp, " (im Bau)", size); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_building_inprogress"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); } if (b->besieged > 0 && sr->mode >= see_lighthouse) { - bytes = (int)strlcpy(bufp, ", belagert von ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, itoa10(b->besieged), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, " Personen ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - if (b->besieged >= b->size * SIEGEFACTOR) { - bytes = (int)strlcpy(bufp, "(abgeschnitten)", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } + msg = msg_message("nr_building_besieged", "soldiers diff", b->besieged, b->besieged - b->size * SIEGEFACTOR); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + msg_release(msg); } i = 0; if (b->display && b->display[0]) { From 3433ffd1bc79f214f9d818bf3fb4572efa68aa3b Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Wed, 14 Jan 2015 16:10:13 +0100 Subject: [PATCH 3/7] cr_report should also check if region messages can be heard (bug #1973) --- src/creport.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/creport.c b/src/creport.c index 7d0963165..3b26768e6 100644 --- a/src/creport.c +++ b/src/creport.c @@ -1440,12 +1440,14 @@ static void cr_output_region(FILE * F, report_context * ctx, seen_region * sr) } } } - cr_output_messages(F, r->msgs, f); - { - message_list *mlist = r_getmessages(r, f); - if (mlist) - cr_output_messages(F, mlist, f); - } + if (sr->mode == see_unit || sr->mode == see_travel) { + cr_output_messages(F, r->msgs, f); + { + message_list *mlist = r_getmessages(r, f); + if (mlist) + cr_output_messages(F, mlist, f); + } + } /* buildings */ for (b = rbuildings(r); b; b = b->next) { int fno = -1; From 5e4ea5a145f893e402881dac785655748c4c9c9b Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Fri, 30 Jan 2015 20:43:40 +0100 Subject: [PATCH 4/7] fixed formatting errors --- src/report.c | 165 ++++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 80 deletions(-) diff --git a/src/report.c b/src/report.c index 98ba9c042..4f385470f 100644 --- a/src/report.c +++ b/src/report.c @@ -634,8 +634,8 @@ int indent) for (; a; a = a->next) { char buf[4096]; - message *msg; - + message *msg; + if (fval(a->type, ATF_CURSE)) { curse *c = (curse *)a->data.v; @@ -654,10 +654,11 @@ int indent) else if (a->type == &at_effect && self) { effect_data *data = (effect_data *)a->data.v; if (data->value > 0) { - msg = msg_message("nr_potion_effect", "potion left", data->type->itype->rtype, data->value); - nr_render(msg, viewer->locale, buf, sizeof(buf), viewer); - rparagraph(F, buf, indent, 2, 0); - msg_release(msg); + msg = msg_message("nr_potion_effect", "potion left", + data->type->itype->rtype, data->value); + nr_render(msg, viewer->locale, buf, sizeof(buf), viewer); + rparagraph(F, buf, indent, 2, 0); + msg_release(msg); } } } @@ -823,41 +824,43 @@ static void prices(FILE * F, const region * r, const faction * f) if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); - for (dmd = r->land->demands; dmd; dmd = dmd->next) + for (dmd = r->land->demands; dmd; dmd = dmd->next){ if (dmd->value > 0) { - m = msg_message("nr_market_price", "product price", - dmd->type->itype->rtype, dmd->value * dmd->type->price); - bytes = (int)nr_render(m, f->locale, bufp, size, f); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - msg_release(m); - n--; - if (n == 0) { - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_end"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } - else if (n == 1) { - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_final"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } - else { - bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_next"), size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - bytes = (int)strlcpy(bufp, " ", size); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - } + m = msg_message("nr_market_price", "product price", + dmd->type->itype->rtype, dmd->value * dmd->type->price); + bytes = (int)nr_render(m, f->locale, bufp, size, f); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + msg_release(m); + n--; + if (n == 0) { + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_end"), + size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } else if (n == 1) { + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_final"), + size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } else { + bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_trade_next"), + size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + bytes = (int)strlcpy(bufp, " ", size); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + } } } + } /* Schreibe Paragraphen */ *bufp = 0; rparagraph(F, buf, 0, 0, 0); @@ -1096,12 +1099,12 @@ static void describe(FILE * F, const seen_region * sr, faction * f) if (rule_region_owners()) { const faction *owner = region_get_owner(r); - message *msg; + message *msg; if (owner != NULL) { - msg = msg_message("nr_region_owner", "faction", owner); - bytes = (int)nr_render(msg, f->locale, bufp, size, f); - msg_release(msg); + msg = msg_message("nr_region_owner", "faction", owner); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + msg_release(msg); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); } @@ -1207,7 +1210,7 @@ static void describe(FILE * F, const seen_region * sr, faction * f) bufp = buf; size = sizeof(buf) - 1; - // this localization might not work for every language but is fine for de and en + // this localization might not work for every language but is fine for de and en bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_schemes_prefix"), size); if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); @@ -1250,14 +1253,14 @@ static void describe(FILE * F, const seen_region * sr, faction * f) rnl(F); for (e = edges; e; e = e->next) { bool first = true; - message *msg; + message *msg; bufp = buf; size = sizeof(buf) - 1; for (d = 0; d != MAXDIRECTIONS; ++d) { if (!e->exist[d]) continue; - // this localization might not work for every language but is fine for de and en + // this localization might not work for every language but is fine for de and en if (first) bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_borderlist_prefix"), size); else if (e->lastd == d) @@ -1271,12 +1274,13 @@ static void describe(FILE * F, const seen_region * sr, faction * f) WARN_STATIC_BUFFER(); first = false; } - // TODO name is localized? Works for roads anyway... - msg = msg_message("nr_borderlist_postfix", "transparent object", e->transparent, e->name); - bytes = (int)nr_render(msg, f->locale, bufp, size, f); - msg_release(msg); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); + // TODO name is localized? Works for roads anyway... + msg = msg_message("nr_borderlist_postfix", "transparent object", + e->transparent, e->name); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + msg_release(msg); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); *bufp = 0; rparagraph(F, buf, 0, 0, 0); @@ -1416,18 +1420,18 @@ static void durchreisende(FILE * F, const region * r, const faction * f) ++counter; if (u->ship != NULL) { #ifdef GERMAN_FLUFF_ENABLED - if (strcmp("de", f->locale->name)==0) { - if (counter == 1) { - bytes = (int)strlcpy(bufp, "Die ", size); - } - else { - bytes = (int)strlcpy(bufp, "die ", size); - } - if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); - break; - } - } + if (strcmp("de", f->locale->name)==0) { + if (counter == 1) { + bytes = (int)strlcpy(bufp, "Die ", size); + } + else { + bytes = (int)strlcpy(bufp, "die ", size); + } + if (wrptr(&bufp, &size, bytes) != 0) { + WARN_STATIC_BUFFER(); + break; + } + } #endif bytes = (int)strlcpy(bufp, shipname(u->ship), size); } @@ -2019,11 +2023,12 @@ const faction * f) } if (b->besieged > 0 && sr->mode >= see_lighthouse) { - msg = msg_message("nr_building_besieged", "soldiers diff", b->besieged, b->besieged - b->size * SIEGEFACTOR); - bytes = (int)nr_render(msg, f->locale, bufp, size, f); - if (wrptr(&bufp, &size, bytes) != 0) - WARN_STATIC_BUFFER(); - msg_release(msg); + msg = msg_message("nr_building_besieged", "soldiers diff", b->besieged, + b->besieged - b->size * SIEGEFACTOR); + bytes = (int)nr_render(msg, f->locale, bufp, size, f); + if (wrptr(&bufp, &size, bytes) != 0) + WARN_STATIC_BUFFER(); + msg_release(msg); } i = 0; if (b->display && b->display[0]) { @@ -2562,21 +2567,21 @@ static void update_find(void) if (initial) for (r = regions; r; r = r->next) { - unit *u; - for (u = r->units; u; u = u->next) { - faction *lastf = u->faction; - unit *u2; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->faction == lastf || u2->faction == u->faction) - continue; - if (seefaction(u->faction, r, u2, 0)) { - faction *fv = visible_faction(u->faction, u2); - lastf = fv; - add_find(u->faction, u2, fv); + unit *u; + for (u = r->units; u; u = u->next) { + faction *lastf = u->faction; + unit *u2; + for (u2 = r->units; u2; u2 = u2->next) { + if (u2->faction == lastf || u2->faction == u->faction) + continue; + if (seefaction(u->faction, r, u2, 0)) { + faction *fv = visible_faction(u->faction, u2); + lastf = fv; + add_find(u->faction, u2, fv); + } } } } - } initial = false; } From 3fc434e1b9c13afec5c4ec9e45eaaa196060dc0a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 1 Feb 2015 10:27:00 +0100 Subject: [PATCH 5/7] bug 2072: make peasant growth not spam messages. --- src/laws.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/laws.c b/src/laws.c index 753ce0b8f..817679689 100755 --- a/src/laws.c +++ b/src/laws.c @@ -330,8 +330,9 @@ static void peasants(region * r) } luck = peasant_luck_effect(peasants, luck, maxp, .5); +#ifdef STORCH_SPAM_BUG_2072 ADDMSG(&r->msgs, msg_message("peasantluck_success", "births", luck)); - +#endif peasants += births + luck; } From 03cddee6b7e68d22208305a0096d0d3ca7cfc598 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 1 Feb 2015 10:39:36 +0100 Subject: [PATCH 6/7] Small plural/singular fix in German message. --- res/core/messages.xml | 3 +-- src/report.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index 171c99b47..a2797727e 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -3212,8 +3212,7 @@ - "$if($eq($dead,1),"Ein Bauer","$int($dead) Bauern") verhungert." - "$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")." + "$if($eq($dead,1),"Ein Bauer verhungert","$int($dead) Bauern verhungern")." "$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")." diff --git a/src/report.c b/src/report.c index 635e0bf1d..f037ced56 100644 --- a/src/report.c +++ b/src/report.c @@ -2416,6 +2416,7 @@ const char *charset) /* Nachrichten an REGION in der Region */ if (sr->mode == see_unit || sr->mode == see_travel) { + // TODO: Bug 2073 message_list *mlist = r_getmessages(r, f); rp_messages(F, r->msgs, f, 0, true); if (mlist) From 01b46b143bcac8bbf113fe4eba0eede123e5e8b8 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 1 Feb 2015 12:57:54 +0100 Subject: [PATCH 7/7] add a configuration switch to disable force_leave (bug 2059) for now. --- src/laws.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/laws.c b/src/laws.c index 817679689..f7721c37f 100755 --- a/src/laws.c +++ b/src/laws.c @@ -4430,7 +4430,9 @@ void init_processor(void) add_proc_unit(p, follow_unit, "Folge auf Einheiten setzen"); p += 10; /* rest rng again before economics */ - add_proc_region(p, force_leave, "kick non-allies out of buildings/ships"); + if (get_param_int(global.parameters, "rules.owners.force_leave", 0)) { + add_proc_region(p, force_leave, "kick non-allies out of buildings/ships"); + } add_proc_region(p, economics, "Zerstoeren, Geben, Rekrutieren, Vergessen"); add_proc_order(p, K_PROMOTION, &promotion_cmd, 0, "Heldenbefoerderung");