From bd1b568da278d8d12a7252ca9ad3b7be6799529c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 12 Sep 2015 14:13:45 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A4fix=20Erz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/prefixes.json       | 3 ++-
 res/core/de/strings.xml  | 5 +++++
 scripts/tests/common.lua | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/prefixes.json b/conf/prefixes.json
index 156bba332..afe6069a8 100644
--- a/conf/prefixes.json
+++ b/conf/prefixes.json
@@ -27,6 +27,7 @@
         "flame",
         "ice",
         "star",
-        "black"
+        "black",
+        "arch"
     ]
 }
diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index d008a17ff..1e5dbb034 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -6833,6 +6833,11 @@
       <text locale="en">black </text>
     </string>
 
+    <string name="arch">
+      <text locale="de">Erz</text>
+      <text locale="en">arch</text>
+    </string>
+
     <string name="star">
       <text locale="de">Sternen</text>
       <text locale="en">star </text>
diff --git a/scripts/tests/common.lua b/scripts/tests/common.lua
index 9c2549261..decd0c14b 100644
--- a/scripts/tests/common.lua
+++ b/scripts/tests/common.lua
@@ -1110,4 +1110,10 @@ function test_prefix()
     set_order(u1, "PRAEFIX")
     process_orders()
     assert_not_nil(u1:show():find("Elf"))
+
+    set_order(u1, "PRAEFIX Erz")
+    process_orders()
+    assert_not_nil(u1:show():find("Erzelf"))
+    u1.faction.locale = "en"
+    assert_not_nil(u1:show():find("archelf"))
 end