From 53241bc95ffce8ce4cc47576948472583d6370e3 Mon Sep 17 00:00:00 2001
From: CTD <C_T_D@GMX.DE>
Date: Fri, 13 Feb 2015 16:22:52 +0100
Subject: [PATCH 1/2] Guard chance repaired
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
---
 src/buildno.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/buildno.h b/src/buildno.h
index decff2fd0..be62c19a5 100644
--- a/src/buildno.h
+++ b/src/buildno.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 4
-#define VERSION_BUILD 4
+#define VERSION_BUILD 5

From d637571a52e3a0625de61133bb816eb97dd0a87b Mon Sep 17 00:00:00 2001
From: Steffen Mecke <stm2@users.sf.net>
Date: Mon, 9 Feb 2015 08:56:43 +0100
Subject: [PATCH 2/2] fix spy and volcano messages

---
 res/core/messages.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index 16396b77c..ddd17856c 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -3156,7 +3156,7 @@
       <arg name="regionn" type="region"/>
     </type>
     <text locale="de">"Der Vulkan in $region($regionv) bricht aus. Die Lavamassen verwüsten $region($regionn)."</text>
-    <text locale="en">"The volcano in $region($regionv) erupts. The lava devastates $region($region)."</text>
+    <text locale="en">"The volcano in $region($regionv) erupts. The lava devastates $region($regionn)."</text>
   </message>
   <message name="volcano_dead" section="events">
     <type>
@@ -3461,16 +3461,16 @@
       <arg name="target" type="unit"/>
       <arg name="status" type="string"/>
     </type>
-    <text locale="de">"$unit($spy) gelang es, Informationen über $unit($target) herauszubekommen: Kampfstatus $status."</text>
-    <text locale="en">"$unit($spy) managed to gather information about $unit($target): combat status ($status)."</text>
+    <text locale="de">"$unit($spy) gelang es, Informationen über $unit($target) herauszubekommen: Kampfstatus ${status}."</text>
+    <text locale="en">"$unit($spy) managed to gather information about $unit($target): combat status ${status}."</text>
   </message>
   <message name="spyreport_mage" section="events">
     <type>
       <arg name="target" type="unit"/>
       <arg name="type" type="string"/>
     </type>
-    <text locale="de">"$unit($target) ist ein $type-Magier."</text>
-    <text locale="en">"$unit($target) is a $type-magician"</text>
+    <text locale="de">"$unit($target) ist ein ${type}-Magier."</text>
+    <text locale="en">"$unit($target) is a ${type}-magician"</text>
   </message>
   <message name="spyreport_skills" section="events">
     <type>