From a8e543c3f3d759e551eb1708c49da92842e4d64c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 25 Mar 2007 20:00:14 +0000
Subject: [PATCH] Error message when password is wrong.

---
 src/common/kernel/save.c |  4 ++--
 src/res/messages.xml     | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index e6547cfb2..3f308544a 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -562,8 +562,8 @@ factionorders(void)
     
     if (checkpasswd(f, pass, true) == false) {
       log_warning(("Invalid password for faction %s\n", fid));
-      ADDMSG(&f->msgs, msg_message("msg_errors", "string",
-                                   "Das Passwort wurde falsch eingegeben"));
+      ADDMSG(&f->msgs, msg_message("wrongpasswd", "faction password",
+                                   f->no, pass));
       return 0;
     }
     /* Die Partei hat sich zumindest gemeldet, so daß sie noch
diff --git a/src/res/messages.xml b/src/res/messages.xml
index ebb377132..c980b11a0 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -512,9 +512,9 @@
       <arg name="unit" type="unit"/>
       <arg name="index" type="int"/>
     </type>
-    <text locale="de">"$int36(${unit}.id($unit))/$int($index) erzielt einen kritischen Treffer."</text>
-    <text locale="fr">"$int36(${unit}.id($unit))/$int($index) does critical damage."</text>
-    <text locale="en">"$int36(${unit}.id($unit))/$int($index) does critical damage."</text>
+    <text locale="de">"$int36($unit.id($unit))/$int($index) erzielt einen kritischen Treffer."</text>
+    <text locale="fr">"$int36($unit.id($unit))/$int($index) does critical damage."</text>
+    <text locale="en">"$int36($unit.id($unit))/$int($index) does critical damage."</text>
   </message>
   <message name="teach_asgood" section="errors">
     <type>
@@ -688,8 +688,7 @@
       <arg name="ship" type="ship"/>
     </type>
     <text locale="de">"Die Mannschaft krank vom vergifteten Wasser, Planken, Ruder und Segel zerfressen von den Wassern des verfluchten Meeres, ergibt sich die $ship($ship) in ihr Schicksal und sinkt."</text>
-    <text locale="fr">"The sailors sick due to the poisened ocean, planks, rudder und sails corroded by the waters of the cursed ocean, the $ship($ship) finally succumbs to her destiny and sinks."</text>
-    <text locale="en">"The sailors sick due to the poisened ocean, planks, rudder und sails corroded by the waters of the cursed ocean, the $ship($ship) finally succumbs to her destiny and sinks."</text>
+    <text locale="en">"Her sailors sick from the poisened ocean, planks, rudder und sails corroded by the waters of the cursed ocean, the $ship($ship) finally succumbs to her destiny and sinks."</text>
   </message>
   <message name="skillpotion_use" section="events">
     <type>
@@ -2687,6 +2686,14 @@
     <text locale="fr">"$unit($unit) ate $int($amount) peasants."</text>
     <text locale="en">"$unit($unit) ate $int($amount) peasants."</text>
   </message>
+  <message name="wrongpasswd" section="events">
+    <type>
+      <arg name="faction" type="int"/>
+      <arg name="password" type="string"/>
+    </type>
+    <text locale="de">"ERESSEA $atoi36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text>
+    <text locale="en">"ERESSEA $atoi36($faction) \"${password}\" - Your orders had the wrong password."</text>
+  </message>
   <message name="changepasswd" section="events">
     <type>
       <arg name="value" type="string"/>