From 2c6ae9baef473bd4f7e08ba00be3a3b16a595e16 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 22 Jan 2017 12:43:48 +0100
Subject: [PATCH] remove ERESSEA keyword from "bad password" message.

---
 res/core/messages.xml | 5 ++---
 src/kernel/save.c     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index 41569d9f3..130b58d03 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -3306,11 +3306,10 @@
   </message>
   <message name="wrongpasswd" section="events">
     <type>
-      <arg name="faction" type="int"/>
       <arg name="password" type="string"/>
     </type>
-    <text locale="de">"ERESSEA $int36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text>
-    <text locale="en">"ERESSEA $int36($faction) \"${password}\" - Your orders had the wrong password."</text>
+    <text locale="de">"Deine Befehle hatten ein falsches Passwort (${password})."</text>
+    <text locale="en">"Your orders had the wrong password (${password})."</text>
   </message>
   <message name="changepasswd" section="events">
     <type>
diff --git a/src/kernel/save.c b/src/kernel/save.c
index 9825a5b55..5b5a5898f 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -235,8 +235,7 @@ static faction *factionorders(void)
 
         if (!checkpasswd(f, (const char *)pass)) {
             log_debug("Invalid password for faction %s", itoa36(fid));
-            ADDMSG(&f->msgs, msg_message("wrongpasswd", "faction password",
-                f->no, pass));
+            ADDMSG(&f->msgs, msg_message("wrongpasswd", "password", pass));
             return 0;
         }
         /* Die Partei hat sich zumindest gemeldet, so dass sie noch