From cdb65dfd36dce5365a2ad45a02f3f0fec82b0d6b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 5 Mar 2017 18:57:28 +0100
Subject: [PATCH] Turns out: We did not have a singular form of sapling.

---
 res/core/de/strings.xml | 10 ++++++++++
 src/creport.c           |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index 5dc649aa1..d69c0919f 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -6604,11 +6604,21 @@
   </string>
 
   <string name="sapling">
+    <text locale="de">Schößling</text>
+    <text locale="en">sapling</text>
+  </string>
+
+  <string name="sapling_p">
     <text locale="de">Schößlinge</text>
     <text locale="en">saplings</text>
   </string>
 
   <string name="mallornsapling">
+    <text locale="de">Mallornschößling</text>
+    <text locale="en">mallorn sapling</text>
+  </string>
+
+  <string name="mallornsapling_p">
     <text locale="de">Mallornschößlinge</text>
     <text locale="en">mallorn saplings</text>
   </string>
diff --git a/src/creport.c b/src/creport.c
index b9088f020..bb2d68d1d 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -1178,7 +1178,7 @@ void cr_output_resources(stream *out, const faction * f, const region *r, bool s
         stream_printf(out, "%d;Schoesslinge\n", saplings);
     }
     if (fval(r, RF_MALLORN) && (trees > 0 || saplings > 0)) {
-        sputs("1;Mallorn\n", out);
+        sputs("1;Mallorn", out);
     }
     for (n = 0; n < size; ++n) {
         if (result[n].level >= 0 && result[n].number >= 0) {
@@ -1196,7 +1196,7 @@ void cr_output_resources(stream *out, const faction * f, const region *r, bool s
         }
     }
     if (pos != cbuf) {
-        sputs(cbuf, out);
+        swrite(cbuf, 1, pos - cbuf, out);
     }
 }