diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index b32885048..74163a148 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -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)); diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml index b49acd4a3..983bd64e0 100644 --- a/src/res/de/strings.xml +++ b/src/res/de/strings.xml @@ -136,6 +136,26 @@ black + + Baum + tree + + + + Bäume + trees + + + + Mallornbaum + mallorn tree + + + + Mallornbäume + mallorn trees + + Küsten Nordwestküste