From 8aea7fdb41813212f263e0a50833532cae0b7d2b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 7 Oct 2006 16:10:42 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1023 l10n mistake flown -> fled --- src/common/kernel/battle.c | 4 ++-- src/common/kernel/battle.h | 2 +- src/res/messages.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index d65141e92..bcef511ad 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -2592,10 +2592,10 @@ aftermath(battle * b) for (s=b->sides;s;s=s->next) { 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); 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); for (bf=b->factions;bf;bf=bf->next) { diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h index 0197471a7..2651db42d 100644 --- a/src/common/kernel/battle.h +++ b/src/common/kernel/battle.h @@ -172,7 +172,7 @@ extern "C" { } * person; unsigned int flags; struct { - int number; /* number of people who have flown */ + int number; /* number of people who fled */ int hp; /* accumulated hp of fleeing people */ struct region *region; /* destination of fleeing people */ struct item * items; /* items they take */ diff --git a/src/res/messages.xml b/src/res/messages.xml index 528919d6f..4881d9bf8 100644 --- a/src/res/messages.xml +++ b/src/res/messages.xml @@ -6265,11 +6265,11 @@ - + - "Heer $int($index)($abbrev): $int($dead) Tote, $int($flown) Geflohene, $int($survived) Überlebende." - "Army $int($index)($abbrev): $int($dead) dead, $int($flown) flown, $int($survived) survivors." + "Heer $int($index)($abbrev): $int($dead) Tote, $int($fled) Geflohene, $int($survived) Überlebende." + "Army $int($index)($abbrev): $int($dead) dead, $int($fled) fled, $int($survived) survivors."