forked from github/server
- 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:
parent
86912c69de
commit
0ed7434f3c
|
@ -1072,14 +1072,14 @@ describe(FILE * F, region * r, int partial, faction * f)
|
|||
scat(" ");
|
||||
if (fval(r, RF_MALLORN)) {
|
||||
if (trees == 1)
|
||||
scat("Mallornbaum");
|
||||
scat(LOC(f->locale, "mallorntree"));
|
||||
else
|
||||
scat("Mallornbäume");
|
||||
scat(LOC(f->locale, "mallorntree_p"));
|
||||
}
|
||||
else if (trees == 1)
|
||||
scat("Baum");
|
||||
scat(LOC(f->locale, "tree"));
|
||||
else
|
||||
scat("Bäume");
|
||||
scat(LOC(f->locale, "tree_p"));
|
||||
}
|
||||
}
|
||||
#else
|
||||
|
@ -1090,18 +1090,18 @@ describe(FILE * F, region * r, int partial, faction * f)
|
|||
scat(" ");
|
||||
if (fval(r, RF_MALLORN)) {
|
||||
if (trees == 1)
|
||||
scat("Mallornbaum");
|
||||
scat(LOC(f->locale, "mallorntree"));
|
||||
else
|
||||
scat("Mallornbäume");
|
||||
scat(LOC(f->locale, "mallorntree_p"));
|
||||
}
|
||||
else if (trees == 1)
|
||||
scat("Baum");
|
||||
scat(LOC(f->locale, "tree"));
|
||||
else
|
||||
scat("Bäume");
|
||||
scat(LOC(f->locale, "tree_p"));
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Eisen */
|
||||
/* iron & stone */
|
||||
#if NEW_RESOURCEGROWTH
|
||||
if (partial == 0 && f != (faction *) NULL) {
|
||||
struct rawmaterial * res;
|
||||
|
@ -1128,15 +1128,10 @@ describe(FILE * F, region * r, int partial, faction * f)
|
|||
}
|
||||
}
|
||||
}
|
||||
if (level>=0) {
|
||||
if (level>=0 && visible >= 0) {
|
||||
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",
|
||||
visible, LOC(f->locale, res->type->name), res->level + itype->construction->minskill - 1);
|
||||
}
|
||||
snprintf(pos, sizeof(buf)-(pos-buf), ", %d %s/%d",
|
||||
visible, LOC(f->locale, res->type->name), res->level + itype->construction->minskill - 1);
|
||||
}
|
||||
}
|
||||
#else
|
||||
|
@ -1161,8 +1156,8 @@ describe(FILE * F, region * r, int partial, faction * f)
|
|||
}
|
||||
#endif
|
||||
}
|
||||
/* Bauern & Geld */
|
||||
|
||||
/* peasants & silver */
|
||||
if (rpeasants(r)) {
|
||||
scat(", ");
|
||||
icat(rpeasants(r));
|
||||
|
|
|
@ -136,6 +136,26 @@
|
|||
<text locale="en">black </text>
|
||||
</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>
|
||||
<string name="Nordwestküste">
|
||||
<text locale="de">Nordwestküste</text>
|
||||
|
|
Loading…
Reference in New Issue