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

eliminate duplicate string definition

This commit is contained in:
Enno Rehling 2017-03-05 09:52:17 +01:00
parent 040485504d
commit caa8159428
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6570,15 +6570,6 @@
</string>
</namespace>
<string name="nr_tree">
<text locale="de">Baum</text>
<text locale="en">tree</text>
</string>
<string name="nr_tree_p">
<text locale="de">Bäume</text>
<text locale="en">trees</text>
</string>
<string name="nr_mallorntree">
<text locale="de">Mallornbaum</text>
<text locale="en">mallorn tree</text>

4
src/report.c
View File

@ -987,10 +987,10 @@ static void describe(struct stream *out, const region * r, faction * f)
}
}
else if (trees == 1) {
bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_tree"), size);
bytes = (int)strlcpy(bufp, LOC(f->locale, "tree"), size);
}
else {
bytes = (int)strlcpy(bufp, LOC(f->locale, "nr_tree_p"), size);
bytes = (int)strlcpy(bufp, LOC(f->locale, "tree_p"), size);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();