From a60859ad089d23500643de701e5f0927f8ca5dd9 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 28 Mar 2020 09:05:52 +0100
Subject: [PATCH] ship report crash, fix error number

---
 res/translations/messages.en.po | 6 +++---
 src/report.c                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/translations/messages.en.po b/res/translations/messages.en.po
index 7309f91ca..67d1d2de0 100644
--- a/res/translations/messages.en.po
+++ b/res/translations/messages.en.po
@@ -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\").\""
 
diff --git a/src/report.c b/src/report.c
index 63d72bd49..1560f42e2 100644
--- a/src/report.c
+++ b/src/report.c
@@ -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)) {