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

- Eisen, Steine, Laen nur noch sichtbar, wenn man sie auch abbauen kann. 

(Bei nächster Auswertung kontrollieren!)
- Bäume englisch im Report
This commit is contained in:
Christian Schlittchen 2002-03-31 17:20:08 +00:00
parent 86912c69de
commit 0ed7434f3c
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/gamecode/report.c
View File

@ -1072,14 +1072,14 @@ describe(FILE * F, region * r, int partial, faction * f)
scat(" "); scat(" ");
if (fval(r, RF_MALLORN)) { if (fval(r, RF_MALLORN)) {
if (trees == 1) if (trees == 1)
scat("Mallornbaum"); scat(LOC(f->locale, "mallorntree"));
else else
scat("Mallornbäume"); scat(LOC(f->locale, "mallorntree_p"));
} }
else if (trees == 1) else if (trees == 1)
scat("Baum"); scat(LOC(f->locale, "tree"));
else else
scat("Bäume"); scat(LOC(f->locale, "tree_p"));
} }
} }
#else #else
@ -1090,18 +1090,18 @@ describe(FILE * F, region * r, int partial, faction * f)
scat(" "); scat(" ");
if (fval(r, RF_MALLORN)) { if (fval(r, RF_MALLORN)) {
if (trees == 1) if (trees == 1)
scat("Mallornbaum"); scat(LOC(f->locale, "mallorntree"));
else else
scat("Mallornbäume"); scat(LOC(f->locale, "mallorntree_p"));
} }
else if (trees == 1) else if (trees == 1)
scat("Baum"); scat(LOC(f->locale, "tree"));
else else
scat("Bäume"); scat(LOC(f->locale, "tree_p"));
} }
#endif #endif
/* Eisen */ /* iron & stone */
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH
if (partial == 0 && f != (faction *) NULL) { if (partial == 0 && f != (faction *) NULL) {
struct rawmaterial * res; struct rawmaterial * res;
@ -1128,17 +1128,12 @@ describe(FILE * F, region * r, int partial, faction * f)
} }
} }
} }
if (level>=0) { if (level>=0 && visible >= 0) {
char * pos = buf+strlen(buf); char * pos = buf+strlen(buf);
if (visible<0) {
snprintf(pos, sizeof(buf)-(pos-buf), ", %s",
LOC(f->locale, res->type->name));
} else {
snprintf(pos, sizeof(buf)-(pos-buf), ", %d %s/%d", snprintf(pos, sizeof(buf)-(pos-buf), ", %d %s/%d",
visible, LOC(f->locale, res->type->name), res->level + itype->construction->minskill - 1); visible, LOC(f->locale, res->type->name), res->level + itype->construction->minskill - 1);
} }
} }
}
#else #else
if (partial == 0 && f != (faction *) NULL) { if (partial == 0 && f != (faction *) NULL) {
int maxmining = 0; int maxmining = 0;
@ -1161,8 +1156,8 @@ describe(FILE * F, region * r, int partial, faction * f)
} }
#endif #endif
} }
/* Bauern & Geld */
/* peasants & silver */
if (rpeasants(r)) { if (rpeasants(r)) {
scat(", "); scat(", ");
icat(rpeasants(r)); icat(rpeasants(r));

20
src/res/de/strings.xml
View File

@ -136,6 +136,26 @@
<text locale="en">black </text> <text locale="en">black </text>
</string> </string>
<string name="tree">
<text locale="de">Baum</text>
<text locale="en">tree</text>
</string>
<string name="tree_p">
<text locale="de">Bäume</text>
<text locale="en">trees</text>
</string>
<string name="mallorntree">
<text locale="de">Mallornbaum</text>
<text locale="en">mallorn tree</text>
</string>
<string name="mallorntree_p">
<text locale="de">Mallornbäume</text>
<text locale="en">mallorn trees</text>
</string>
<comment>Küsten</comment> <comment>Küsten</comment>
<string name="Nordwestküste"> <string name="Nordwestküste">
<text locale="de">Nordwestküste</text> <text locale="de">Nordwestküste</text>