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

ship report crash, fix error number

This commit is contained in:
Enno Rehling 2020-03-28 09:05:52 +01:00
parent 112126b07b
commit a60859ad08
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/translations/messages.en.po
View File

@ -2723,9 +2723,6 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit did no
msgid "error182"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ship cannot leave in this direction.\""
msgid "error321"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ships need to be on the same coast for this.\""
msgid "analyse_ship_nospell"
msgstr "\"It appears to $unit($mage) that $ship($ship) is not charmed.\""
@ -2789,6 +2786,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit is alr
msgid "error323"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ship is under a spell.\""
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ships need to be on the same coast for this.\""
msgid "dissolve_units_2"
msgstr "\"$unit($unit) in $region($region): $int($number) $race($race,$number) turned into $if($eq($number,1),\"a tree\", \"trees\").\""

2
src/report.c
View File

@ -1734,7 +1734,7 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
stname, n, ship_capacity(sh) / 100);
}
else {
sbs_printf(&sbs, "%s, %d %s", sh->number, shipname(sh), stname);
sbs_printf(&sbs, "%s, %d %s", shipname(sh), sh->number, stname);
}
if (!ship_finished(sh)) {