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=1023 

l10n mistake flown -> fled
This commit is contained in:
Enno Rehling 2006-10-07 16:10:42 +00:00
parent 11aba3dd92
commit 8aea7fdb41
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/battle.c
View File

@ -2592,10 +2592,10 @@ aftermath(battle * b)
for (s=b->sides;s;s=s->next) { for (s=b->sides;s;s=s->next) {
message * seen = msg_message("battle::army_report", message * seen = msg_message("battle::army_report",
"index abbrev dead flown survived", "index abbrev dead fled survived",
army_index(s), sideabkz(s, false), s->dead, s->flee, s->alive); army_index(s), sideabkz(s, false), s->dead, s->flee, s->alive);
message * unseen = msg_message("battle::army_report", message * unseen = msg_message("battle::army_report",
"index abbrev dead flown survived", "index abbrev dead fled survived",
army_index(s), "-?-", s->dead, s->flee, s->alive); army_index(s), "-?-", s->dead, s->flee, s->alive);
for (bf=b->factions;bf;bf=bf->next) { for (bf=b->factions;bf;bf=bf->next) {

2
src/common/kernel/battle.h
View File

@ -172,7 +172,7 @@ extern "C" {
} * person; } * person;
unsigned int flags; unsigned int flags;
struct { struct {
int number; /* number of people who have flown */ int number; /* number of people who fled */
int hp; /* accumulated hp of fleeing people */ int hp; /* accumulated hp of fleeing people */
struct region *region; /* destination of fleeing people */ struct region *region; /* destination of fleeing people */
struct item * items; /* items they take */ struct item * items; /* items they take */

6
src/res/messages.xml
View File

@ -6265,11 +6265,11 @@
<arg name="index" type="int"/> <arg name="index" type="int"/>
<arg name="abbrev" type="string"/> <arg name="abbrev" type="string"/>
<arg name="dead" type="int"/> <arg name="dead" type="int"/>
<arg name="flown" type="int"/> <arg name="fled" type="int"/>
<arg name="survived" type="int"/> <arg name="survived" type="int"/>
</type> </type>
<text locale="de">"Heer $int($index)($abbrev): $int($dead) Tote, $int($flown) Geflohene, $int($survived) Überlebende."</text> <text locale="de">"Heer $int($index)($abbrev): $int($dead) Tote, $int($fled) Geflohene, $int($survived) Überlebende."</text>
<text locale="en">"Army $int($index)($abbrev): $int($dead) dead, $int($flown) flown, $int($survived) survivors."</text> <text locale="en">"Army $int($index)($abbrev): $int($dead) dead, $int($fled) fled, $int($survived) survivors."</text>
</message> </message>
<message name="spellfail::nolevel" section="magic"> <message name="spellfail::nolevel" section="magic">
<type> <type>