Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=1107 

"Meldung in beiden Reporten doppelt"
... and translation while I'm at it.
This commit is contained in:
Enno Rehling 2007-01-31 21:28:32 +00:00
parent 03d96be44f
commit 486616cdfa
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/kernel/build.c
View File

@ -1210,16 +1210,13 @@ enter_building(unit * u, order * ord, int id, boolean report)
} }
if (!mayenter(r, u, b)) { if (!mayenter(r, u, b)) {
if (report) { if (report) {
sprintf(buf, "Der Eintritt in %s wurde verwehrt", ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "entrance_denied", "building", b));
buildingname(b));
mistake(u, ord, buf, MSG_MOVE);
} }
return false; return false;
} }
if (!slipthru(r, u, b)) { if (!slipthru(r, u, b)) {
if (report) { if (report) {
sprintf(buf, "%s wird belagert", buildingname(b)); ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "entrance_besieged", "building", b));
mistake(u, ord, buf, MSG_MOVE);
} }
return false; return false;
} }

20
src/res/messages.xml
View File

@ -3605,6 +3605,26 @@
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - The unit cannot transport us to this place."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - The unit cannot transport us to this place."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit cannot transport us to this place."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit cannot transport us to this place."</text>
</message> </message>
<message name="entrance_besieged" section="events">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<arg name="building" type="building"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - $building($building) wird belagert."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - $building($building) is under siege."</text>
</message>
<message name="entrance_denied" section="events">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<arg name="building" type="building"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Der Eintritt in $building($building) wurde verwehrt."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - Entrance to $building($building) was denied."</text>
</message>
<message name="error229" section="errors"> <message name="error229" section="errors">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>