From 0ed7434f3ca45903d13caec766aae0cda800bbad Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 31 Mar 2002 17:20:08 +0000
Subject: [PATCH] =?UTF-8?q?-=20Eisen,=20Steine,=20Laen=20nur=20noch=20sich?=
 =?UTF-8?q?tbar,=20wenn=20man=20sie=20auch=20abbauen=20kann.=20=20=20(Bei?=
 =?UTF-8?q?=20n=C3=A4chster=20Auswertung=20kontrollieren!)=20-=20B=C3=A4um?=
 =?UTF-8?q?e=20englisch=20im=20Report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/report.c | 31 +++++++++++++------------------
 src/res/de/strings.xml       | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 18 deletions(-)

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 @@
 		<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>