haufenweise mehr englischer Text, so das der Erstreport jetzt vollkommen auf englisch ist, auch im NR.

This commit is contained in:
Enno Rehling 2002-07-23 07:23:28 +00:00
parent 6bf5145ae3
commit 13198542cd
14 changed files with 330 additions and 97 deletions

View File

@ -121,7 +121,7 @@ read_datenames(const char *filename)
fgets(line,255,namesFP);
l = strlen(line)-1;
if(line[l] == '\n') line[l] = 0;
agename = strdup(line);
agename = strdup(mkname("calendar", line));
fgets(line,255,namesFP);
seasons = strtol(line, NULL, 10);
@ -131,7 +131,7 @@ read_datenames(const char *filename)
fgets(line,255,namesFP);
l = strlen(line)-1;
if(line[l] == '\n') line[l] = 0;
seasonnames[i] = strdup(line);
seasonnames[i] = strdup(mkname("calendar", line));
}
fgets(line,255,namesFP);
@ -147,9 +147,9 @@ read_datenames(const char *filename)
if(line[l] == '\n') line[l] = 0;
np = strtok(line,":");
weeknames[i] = strdup(np);
weeknames[i] = strdup(mkname("calendar", np));
np = strtok(NULL,":");
weeknames2[i] = strdup(np);
weeknames2[i] = strdup(mkname("calendar", np));
}
fgets(line,255,namesFP);
@ -165,7 +165,7 @@ read_datenames(const char *filename)
if(line[l] == '\n') line[l] = 0;
np = strtok(line,":");
monthnames[i] = strdup(np);
monthnames[i] = strdup(mkname("calendar", np));
month_season[i] = atoi(strtok(NULL,":"));
storms[i] = atoi(strtok(NULL,":"));
}
@ -202,10 +202,10 @@ gamedate(const struct locale * lang)
month = r/weeks_per_month;
week = r%weeks_per_month;
sprintf(buf, LOC(lang, "nr_calendar"),
weeknames[week],
monthnames[month],
year,
agename);
LOC(lang, weeknames[week]),
LOC(lang, monthnames[month]),
LOC(lang, year),
LOC(lang, agename));
return buf;
}
@ -226,10 +226,10 @@ gamedate_season(const struct locale * lang)
month = r/weeks_per_month;
week = r%weeks_per_month;
sprintf(buf, LOC(lang, "nr_calendar_season"),
weeknames[week],
monthnames[month],
LOC(lang, weeknames[week]),
LOC(lang, monthnames[month]),
year,
agename,
LOC(lang, agename),
LOC(lang, seasonnames[month_season[month]]));
return buf;
@ -955,6 +955,7 @@ prices(FILE * F, const region * r, const faction * f)
{
const luxury_type *sale=NULL;
struct demand * dmd;
message * m;
int n = 0;
if (r->land==NULL || r->land->demands==NULL) return;
@ -964,24 +965,35 @@ prices(FILE * F, const region * r, const faction * f)
}
assert(sale!=NULL);
sprintf(buf, "Auf dem Markt wird für %s %d Silber verlangt.",
LOC(f->locale, resourcename(sale->itype->rtype, GR_PLURAL)),
sale->price);
m = msg_message("nr_market_sale", "product price",
sale->itype->rtype, sale->price);
nr_render(m, f->locale, buf, sizeof(buf), f);
msg_release(m);
if(n > 0) scat(" Geboten wird für ");
if(n > 0) {
scat(" ");
scat(LOC(f->locale, "nr_trade_intro"));
scat(" ");
for (dmd=r->land->demands;dmd;dmd=dmd->next) if(dmd->value > 0) {
char sbuf[80];
sprintf(sbuf, "%s %d Silber", LOC(f->locale,
resourcename(dmd->type->itype->rtype, GR_PLURAL)),
dmd->value * dmd->type->price);
m = msg_message("nr_market_price", "product price",
dmd->type->itype->rtype, dmd->value * dmd->type->price);
nr_render(m, f->locale, sbuf, sizeof(sbuf), f);
msg_release(m);
scat(sbuf);
n--;
if (n == 0) scat(".");
else if (n == 1) scat(" und für ");
else scat(", für ");
if (n == 0) scat(LOC(f->locale, "nr_trade_end"));
else if (n == 1) {
scat(" ");
scat(LOC(f->locale, "nr_trade_final"));
scat(" ");
} else {
scat(LOC(f->locale, "nr_trade_next"));
scat(" ");
}
}
}
/* Schreibe Paragraphen */
rparagraph(F, buf, 0, 0);
@ -1135,14 +1147,14 @@ describe(FILE * F, const region * r, int partial, faction * f)
scat(" ");
if (fval(r, RF_MALLORN)) {
if (trees == 1)
scat(LOC(f->locale, "mallorntree"));
scat(LOC(f->locale, "nr_mallorntree"));
else
scat(LOC(f->locale, "mallorntree_p"));
scat(LOC(f->locale, "nr_mallorntree_p"));
}
else if (trees == 1)
scat(LOC(f->locale, "tree"));
scat(LOC(f->locale, "nr_tree"));
else
scat(LOC(f->locale, "tree_p"));
scat(LOC(f->locale, "nr_tree_p"));
}
}
#else
@ -1153,14 +1165,14 @@ describe(FILE * F, const region * r, int partial, faction * f)
scat(" ");
if (fval(r, RF_MALLORN)) {
if (trees == 1)
scat(LOC(f->locale, "mallorntree"));
scat(LOC(f->locale, "nr_mallorntree"));
else
scat(LOC(f->locale, "mallorntree_p"));
scat(LOC(f->locale, "nr_mallorntree_p"));
}
else if (trees == 1)
scat(LOC(f->locale, "tree"));
scat(LOC(f->locale, "nr_tree"));
else
scat(LOC(f->locale, "tree_p"));
scat(LOC(f->locale, "nr_tree_p"));
}
#endif
@ -1226,7 +1238,8 @@ describe(FILE * F, const region * r, int partial, faction * f)
icat(rpeasants(r));
if(fval(r, RF_ORCIFIED)) {
scat(rpeasants(r)==1?" Ork":" Orks");
scat(" ");
scat(LOC(f->locale, rpeasants(r)==1?"rc_orc":"rc_orc_p"));
} else {
scat(" ");
scat(LOC(f->locale, resourcename(oldresourcetype[R_PEASANTS], rpeasants(r)!=1)));
@ -1282,11 +1295,14 @@ describe(FILE * F, const region * r, int partial, faction * f)
if(!r2) continue;
nrd--;
if (dh) {
if (nrd == 0) scat(" und im ");
else scat(", im ");
if (nrd == 0) {
scat(" ");
scat(LOC(f->locale, "nr_nb_final"));
} else {
scat(LOC(f->locale, "nr_nb_next"));
}
scat(LOC(f->locale, directions[d]));
scat(" ");
if (!dh) scat("der Region liegt ");
sprintf(dbuf, trailinto(r2, f->locale),
f_regionid(r2, f));
scat(dbuf);
@ -1519,7 +1535,7 @@ order_template(FILE * F, faction * f)
rps_nowrap(F, "");
rnl(F);
sprintf(buf, "%s %s \"hier_passwort_eintragen\"", LOC(f->locale, "ERESSEA"), factionid(f));
sprintf(buf, "%s %s \"%s\"", LOC(f->locale, "ERESSEA"), factionid(f), LOC(f->locale, "enterpasswd"));
rps_nowrap(F, buf);
rnl(F);
@ -1893,8 +1909,11 @@ report(FILE *F, faction * f, const faction_list * addresses,
else
printf(" - Schreibe Report\n");
sprintf(buf, "Report für %s, %s", global.gamename, pzTime);
m = msg_message("nr_header_date", "game date", global.gamename, pzTime);
nr_render(m, f->locale, buf, sizeof(buf), f);
msg_release(m);
centre(F, buf, true);
centre(F, gamedate_season(f->locale), true);
rnl(F);
sprintf(buf, "%s, %s/%s (%s)", factionname(f),

View File

@ -22,6 +22,9 @@
/* kernel includes */
#include <item.h>
/* util includes */
#include <functions.h>
/* libc includes */
#include <assert.h>
@ -127,6 +130,10 @@ register_mallornseed(void)
it_mallornseed.rtype->flags |= RTF_LIMITED;
it_mallornseed.rtype->itype->flags |= ITF_NOBUILDBESIEGED;
it_mallornseed.rtype->flags |= RTF_POOLED;
register_function((pf_generic)limit_seeds, "limit_seeds");
register_function((pf_generic)produce_seeds, "produce_seeds");
register_function((pf_generic)limit_mallornseeds, "limit_mallornseeds");
register_function((pf_generic)produce_mallornseeds, "produce_mallornseeds");
a = a_add(&it_mallornseed.rtype->attribs, a_new(&at_resourcelimit));
{

View File

@ -117,7 +117,7 @@ addplayer(region *r, const char *email, const char * password, const struct race
f->unique_id = ++max_unique_id;
sprintf(buf, "Partei %s", factionid(f));
sprintf(buf, "%s %s", LOC(loc, "factiondefault"), factionid(f));
set_string(&f->name, buf);
fset(f, FL_UNNAMED);

View File

@ -2597,6 +2597,9 @@ resname(resource_t res, int index)
void
register_resources(void)
{
register_function((pf_generic)limit_oldtypes, "limit_oldtypes");
register_function((pf_generic)mod_elves_only, "mod_elves_only");
register_function((pf_generic)res_changeitem, "changeitem");
register_function((pf_generic)res_changeperson, "changeperson");
register_function((pf_generic)res_changepeasants, "changepeasants");

View File

@ -64,12 +64,12 @@
const char *magietypen[MAXMAGIETYP] =
{
"Kein Magiegebiet",
"Illaun",
"Tybied",
"Cerddor",
"Gwyrrd",
"Draig"
"nomagic",
"illaun",
"tybied",
"cerddor",
"gwyrrd",
"draig"
};
attrib_type at_reportspell = {

View File

@ -299,6 +299,10 @@ arg_set(void * args[], const message_type * mtype, const char * buffer, void * v
if (!strcmp(buffer, mtype->pnames[i])) break;
}
if (i!=mtype->nparameters) args[i] = v;
else {
fprintf(stderr, "invalid parameter %s for message type %s\n", buffer, mtype->name);
assert(!"program aborted.");
}
}
struct message *

View File

@ -26,6 +26,7 @@
/* kernel includes */
#include "unit.h"
#include "region.h"
#include "faction.h"
#include "magic.h"
#include "race.h"
@ -712,7 +713,7 @@ name_unit(unit *u)
if (u->race->generate_name) {
set_string(&u->name, (u->race->generate_name(u)));
} else {
sprintf(name, "Nummer %s", itoa36(u->no));
sprintf(name, "%s %s", LOC(u->faction->locale, "unitdefault"), itoa36(u->no));
set_string(&u->name, name);
fset(u, FL_UNNAMED);
}

View File

@ -620,7 +620,7 @@ spskill(const struct locale * lang, const struct unit * u, skill_t sk, int *dh,
if (sk == SK_MAGIC){
if (find_magetype(u) != M_GRAU){
sbuf += sprintf(sbuf, "%s ", magietypen[find_magetype(u)]);
sbuf += sprintf(sbuf, "%s ", LOC(lang, magietypen[find_magetype(u)]));
}
}
@ -725,7 +725,7 @@ spy_message(int spy, unit *u, unit *target)
int found = 0;
scat("Magiegebiet: ");
scat(magietypen[find_magetype(target)]);
scat(LOC(u->faction->locale, magietypen[find_magetype(target)]));
if (get_mage(target)) {
scat(", Sprüche: ");

View File

@ -268,7 +268,7 @@
<message name="nr_calendar_season">
<text locale="de">Wir schreiben %s des Monats %s im Jahre %d %s. Es ist %s.</text>
<text locale="en">It's %s of the month of %s in the %d. year of %s. It's %s.</text>
<text locale="en">It is %s of the month of %s in the %d. year of %s. It is %s.</text>
</message>
<message name="status_aggressive">
@ -7294,6 +7294,24 @@
<text locale="en">"Your password is ${password}."</text>
</message>
<message name="nr_market_sale">
<type>
<arg name="price" type="int"></arg>
<arg name="product" type="resource"></arg>
</type>
<text locale="de">"Auf dem Markt wird für $resource($product,0) $int($price) verlangt."</text>
<text locale="en">"The local market offers $resource($product,0) at a price of $int($price)."</text>
</message>
<message name="nr_market_price">
<type>
<arg name="price" type="int"></arg>
<arg name="product" type="resource"></arg>
</type>
<text locale="de">"$resource($product,0) $int($price) Silber"</text>
<text locale="en">"$resource($product,0) for $int($price) silver"</text>
</message>
<message name="nr_vicinitystart">
<type>
<arg name="dir" type="int"></arg>
@ -7303,6 +7321,15 @@
<text locale="en">"To the $direction($dir) lies $trail($region,$locale("en"))"</text>
</message>
<message name="nr_header_date">
<type>
<arg name="game" type="string"></arg>
<arg name="date" type="string"></arg>
</type>
<text locale="de">"Report für $game, $date"</text>
<text locale="en">"Report for $game, $date"</text>
</message>
<message name="nr_score">
<type>
<arg name="score" type="int"></arg>

View File

@ -51,6 +51,44 @@
<text locale="en">flame</text>
</string>
<string name="nr_trade_intro">
<text locale="de">Geboten wird für</text>
<text locale="en">Traders can sell</text>
</string>
<string name="nr_trade_final">
<text locale="de">und für</text>
<text locale="en">and</text>
</string>
<string name="nr_trade_end">
<text locale="de">.</text>
<text locale="en">.</text>
</string>
<string name="nr_trade_next">
<text locale="de">, für</text>
<text locale="en">,</text>
</string>
<string name="nr_nb_next">
<text locale="de">, im </text>
<text locale="en">, to the </text>
</string>
<string name="nr_nb_final">
<text locale="de">und im </text>
<text locale="en">and to the </text>
</string>
<string name="unitdefault">
<text locale="de">Einheit</text>
<text locale="en">Unit</text>
</string>
<string name="factiondefault">
<text locale="de">Partei</text>
<text locale="en">Faction</text>
</string>
<string name="enterpasswd">
<text locale="de">hier_passwort_eintragen</text>
<text locale="en">insert_your_password_here</text>
</string>
<string name="prefix_ice">
<text locale="de">Eis</text>
<text locale="en">ice</text>
@ -5098,6 +5136,133 @@
</string>
</namespace>
<namespace name="calendar">
<string name="winter">
<text locale="de">Winter</text>
<text locale="en">winter</text>
</string>
<string name="summer">
<text locale="de">Sommer</text>
<text locale="en">summer</text>
</string>
<string name="spring">
<text locale="de">Frühling</text>
<text locale="en">spring</text>
</string>
<string name="fall">
<text locale="de">Herbst</text>
<text locale="en">fall</text>
</string>
<string name="firstweek">
<text locale="de">die erste Woche</text>
<text locale="en">the first week</text>
</string>
<string name="secondweek">
<text locale="de">die zweite Woche</text>
<text locale="en">the second week</text>
</string>
<string name="thirdweek">
<text locale="de">die letzte Woche</text>
<text locale="en">the last week</text>
</string>
<string name="firstweek_d">
<text locale="de">der ersten Woche</text>
<text locale="en">of the first week</text>
</string>
<string name="secondweek_d">
<text locale="de">der zweiten Woche</text>
<text locale="en">of the second week</text>
</string>
<string name="thirdweek_d">
<text locale="de">der letzten Woche</text>
<text locale="en">of the third week</text>
</string>
<string name="month_1">
<text locale="de">Feldsegen</text>
<text locale="en">harvest moon</text>
</string>
<string name="month_2">
<text locale="de">Nebetage</text>
<text locale="en">impenetrable fog</text>
</string>
<string name="month_3">
<text locale="de">Sturmmond</text>
<text locale="en">storm moon</text>
</string>
<string name="month_4">
<text locale="de">Herdfeuer</text>
<text locale="en">hearth fire</text>
</string>
<string name="month_5">
<text locale="de">Eiswind</text>
<text locale="en">icewind</text>
</string>
<string name="month_6">
<text locale="de">Schneeban</text>
<text locale="en">snowbane</text>
</string>
<string name="month_7">
<text locale="de">Blütenregen</text>
<text locale="en">flowerrain</text>
</string>
<string name="month_8">
<text locale="de">Mond der milden Winde</text>
<text locale="en">mild winds</text>
</string>
<string name="month_9">
<text locale="de">Sonnenfeuer</text>
<text locale="en">sunfire</text>
</string>
<string name="secondage">
<text locale="de">des zweiten Zeitalters</text>
<text locale="en">the second age</text>
</string>
</namespace>
<namespace name="school">
<string name="nomagic">
<text locale="de">Kein Magiegebiet</text>
<text locale="en">no magic school yet</text>
</string>
<string name="illaun">
<text locale="de">Illaun</text>
<text locale="en">Illaun</text>
</string>
<string name="tybied">
<text locale="de">Tybied</text>
<text locale="en">Tybied</text>
</string>
<string name="gwyrrd">
<text locale="de">Gwyrrd</text>
<text locale="en">Gwyrrd</text>
</string>
<string name="cerrdor">
<text locale="de">Cerrdor</text>
<text locale="en">Cerrdor</text>
</string>
<string name="draig">
<text locale="de">Draig</text>
<text locale="en">Draig</text>
</string>
</namespace>
<string name="nr_tree">
<text locale="de">Baum</text>
<text locale="en">tree</text>
</string>
<string name="nr_tree_p">
<text locale="de">Bäume</text>
<text locale="en">trees</text>
</string>
<string name="nr_mallorntree">
<text locale="de">Mallornbaum</text>
<text locale="en">mallorn tree</text>
</string>
<string name="nr_mallorntree_p">
<text locale="de">Mallornäume</text>
<text locale="en">mallorn trees</text>
</string>
</strings>

View File

@ -774,7 +774,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - The party could not be found."</text>
<text>"$unit($unit) in $region($region): '$command' - The faction could not be found."</text>
</nr>
</locale>
</message>
@ -813,7 +813,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - This region is guarded by a non allied party."</text>
<text>"$unit($unit) in $region($region): '$command' - This region is guarded by a non allied faction."</text>
</nr>
</locale>
</message>
@ -1541,7 +1541,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Your party cannot hire so many strangers."</text>
<text>"$unit($unit) in $region($region): '$command' - Your faction cannot hire so many strangers."</text>
</nr>
</locale>
</message>
@ -1554,7 +1554,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - The party cannot hire so many strangers."</text>
<text>"$unit($unit) in $region($region): '$command' - The faction cannot hire so many strangers."</text>
</nr>
</locale>
</message>
@ -1567,7 +1567,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - The party cannot hire so many strangers."</text>
<text>"$unit($unit) in $region($region): '$command' - The faction cannot hire so many strangers."</text>
</nr>
</locale>
</message>
@ -1879,7 +1879,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Too many magicians in the party."</text>
<text>"$unit($unit) in $region($region): '$command' - Too many magicians in the faction."</text>
</nr>
</locale>
</message>
@ -1892,7 +1892,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Too many alchemists in the party."</text>
<text>"$unit($unit) in $region($region): '$command' - Too many alchemists in the faction."</text>
</nr>
</locale>
</message>
@ -1905,7 +1905,7 @@
</type>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - The party has a different magic sphere."</text>
<text>"$unit($unit) in $region($region): '$command' - The faction has a different magic sphere."</text>
</nr>
</locale>
</message>
@ -3416,7 +3416,7 @@
</type>
<locale name="en">
<nr section="none">
<text>"Your party is immune against assaults for $int($turns) more weeks."</text>
<text>"Your faction is immune against assaults for $int($turns) more weeks."</text>
</nr>
</locale>
</message>

View File

@ -573,10 +573,10 @@
<text locale="en">eye of dragons</text>
</string>
<string name="fairyboot">
<text locale="en">fairyboot</text>
<text locale="en">fairy boots</text>
</string>
<string name="fairyboot_p">
<text locale="en">fairyboot</text>
<text locale="en">fairy boots</text>
</string>
<string name="firesword">
<text locale="en">flaming sword</text>

View File

@ -1,11 +1,18 @@
<strings>
<string name="newbie_info_1">
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an eressea@eressea.amber.kn-bremen.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an eressea-server@eressea.upb.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
<text locale="en">Remember to send your orders to eressea-server@eressea.upb.de with the subject ERESSEA ORDERS.</text>
</string>
<string name="newbie_info_2">
<text locale="de">Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden.</text>
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea.</text>
</string>
<string name="newbie_info_3">
<text locale="de">Mit der ersten Auswertung bekommst du einen Computerreport, den du mit vielen der Tools auf http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION COMPUTER.</text>
<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
</string>
<string name="defaultorder">
<text locale="de">ARBEITE</text>
<text locale="en">WORK</text>
</string>
</strings>

View File

@ -1,20 +1,20 @@
des zweiten Zeitalters
secondage
4
Winter
Frühling
Sommer
Herbst
winter
spring
summer
fall
3
die erste Woche:der ersten Woche
die zweite Woche:der zweiten Woche
die letzte Woche:der letzten Woche
firstweek:firstweek_d
secondweek:secondweek_d
thirdweek:thirdweek_d
9
Feldsegen:2:30
Nebeltage:3:60
Sturmmond:3:80
Herdfeuer:0:50
Eiswind:0:30
Schneebann:0:60
Blütenregen:1:60
Mond der milden Winde:1:10
Sonnenfeuer:2:10
month_1:2:30
month_2:3:60
month_3:3:80
month_4:0:50
month_5:0:30
month_6:0:60
month_7:1:60
month_8:1:10
month_9:2:10