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

Turns out: We did not have a singular form of sapling.

This commit is contained in:
Enno Rehling 2017-03-05 18:57:28 +01:00
parent f699c32f0e
commit cdb65dfd36
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/core/de/strings.xml
View File

@ -6604,11 +6604,21 @@
</string> </string>
<string name="sapling"> <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="de">Schößlinge</text>
<text locale="en">saplings</text> <text locale="en">saplings</text>
</string> </string>
<string name="mallornsapling"> <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="de">Mallornschößlinge</text>
<text locale="en">mallorn saplings</text> <text locale="en">mallorn saplings</text>
</string> </string>

4
src/creport.c
View File

@ -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); stream_printf(out, "%d;Schoesslinge\n", saplings);
} }
if (fval(r, RF_MALLORN) && (trees > 0 || saplings > 0)) { if (fval(r, RF_MALLORN) && (trees > 0 || saplings > 0)) {
sputs("1;Mallorn\n", out); sputs("1;Mallorn", out);
} }
for (n = 0; n < size; ++n) { for (n = 0; n < size; ++n) {
if (result[n].level >= 0 && result[n].number >= 0) { 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) { if (pos != cbuf) {
sputs(cbuf, out); swrite(cbuf, 1, pos - cbuf, out);
} }
} }