From 70580c0ace9b7d8a759767a836c32c0c86276a1f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 26 Apr 2001 17:10:35 +0000
Subject: [PATCH] dev-version:

* Kosmetischer Bugfix Schiffahrt
  keine doppelten Durchreisen mehr.
---
 src/common/kernel/movement.c |  5 ++---
 src/res/de/messages.xml      | 19 +++++++++++++++++++
 src/res/en/strings.txt       |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index d425be8e0..34d12f7ac 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -1498,13 +1498,12 @@ sail(region * starting_point, unit * u, region * next_point, boolean move_on_lan
 		/* Falls kein Problem, eines weiter ziehen */
 
 		route[step] = dir;
+		last_point = current_point;
+		current_point = next_point;
 		tt[++step] = current_point;	/* travelthrough */
 		u->ship->moved = 1;
 		m++;
 
-		last_point = current_point;
-		current_point = next_point;
-
 		/* Falls eine Küstenregion, dann in rv[] aufnehmen (die letzte
 		 * Küste wird nachher nicht aufgelistet werden, wenn das
 		 * Schiff dort seine Runde beendent!). */
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index ed1b50458..8d7cdcf9a 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -2924,6 +2924,25 @@
 	</locale>
 </message>
 
+<message name="race_cantwork">
+	<type>
+		<arg name="unit" type="unit"></arg>
+		<arg name="region" type="region"></arg>
+		<arg name="command" type="string"></arg>
+		<arg name="race" type="race"></arg>
+	</type>
+	<locale name="de">
+		<nr section="errors">
+			<text>"$unit($unit) in $region($region): '$command' - $race($race,0) können nicht arbeiten."</text>
+		</nr>
+	</locale>
+	<locale name="en">
+		<nr section="errors">
+			<text>"$unit($unit) in $region($region): '$command' - $race($race,0) cannot work."</text>
+		</nr>
+	</locale>
+</message>
+
 <message name="error226">
 	<type>
 		<arg name="unit" type="unit"></arg>
diff --git a/src/res/en/strings.txt b/src/res/en/strings.txt
index 5db4d396d..724554c45 100644
--- a/src/res/en/strings.txt
+++ b/src/res/en/strings.txt
@@ -564,7 +564,7 @@ nr_size;en;size
 nr_spells;en;spells
 nr_combatspells;en;combat spells
 nr_nospells;en;none
-nr_Addresslist;en;Addresses
+nr_addresslist;en;Addresses
 
 ##  Küsten
 Nordwestküste;en;northwest coast