From a2e071d35ba4e8899d0d8760e1c53371a2e94e9f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 8 Feb 2015 13:09:04 +0100
Subject: [PATCH 1/3] Fix broken syntax in message about effects on units. Add
 some missing descriptions. Bump version number.

---
 res/core/de/strings.xml | 8 ++++++++
 res/core/messages.xml   | 2 +-
 src/buildno.h           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index e2003f997..999d59270 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -4345,6 +4345,14 @@
     </string>
   </namespace>
   <namespace name="spellinfo">
+    <string name="create_ror">
+      <text locale="de">Erzeugt einen Ring der Regeneration.</text>
+      <text locale="en">Creates a ring of regeneration.</text>
+    </string>
+    <string name="create_focus">
+      <text locale="de">Erzeugt einen Aurafokus.</text>
+      <text locale="en">Creates an aurafocus crystal.</text>
+    </string>
     <string name="acidrain">
       <text locale="de">Tötet die Feinde mit Säure.</text>
       <text locale="en">Kills enemies with acid.</text>
diff --git a/res/core/messages.xml b/res/core/messages.xml
index c8eba5cfb..16396b77c 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -889,7 +889,7 @@
       <arg name="left" type="int"/>
     </type>
     <text locale="de">"Auf der Einheit $if($eq($left,1),"liegt","liegen") $int($left) Wirkung$if($eq($left,1),"","en") $resource($potion,1)."</text>
-    <text locale="en">"There are $int($left) use($eq($left,1),"s","") of $resource($potion,1) left."</text>
+    <text locale="en">"There $if($eq($left,1),"is","are") $int($left) $if($eq($left,1),"use","uses") of $resource($potion,1) left."</text>
   </message>
   <message name="nr_region_owner" section="nr">
     <type>
diff --git a/src/buildno.h b/src/buildno.h
index 69c61645e..a213d5520 100644
--- a/src/buildno.h
+++ b/src/buildno.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 4
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2

From 39806eaef53c5c97910a42be1dfcb2f43e96ac59 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 8 Feb 2015 13:37:44 +0100
Subject: [PATCH 2/3] disable broken test_luck_message for now.

---
 src/laws.test.c | 2 +-
 src/tests.c     | 4 ++++
 src/tests.h     | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/laws.test.c b/src/laws.test.c
index 75c19a798..b7a8e4693 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -781,7 +781,7 @@ CuSuite *get_laws_suite(void)
     SUITE_ADD_TEST(suite, test_force_leave_ships);
     SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean);
     SUITE_ADD_TEST(suite, test_peasant_luck_effect);
-    SUITE_ADD_TEST(suite, test_luck_message);
+    DISABLE_TEST(suite, test_luck_message);
 
     return suite;
 }
diff --git a/src/tests.c b/src/tests.c
index 10eefd9c4..f560dc59a 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -272,3 +272,7 @@ void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_ty
 
     va_end(args);
 }
+
+void disabled_test(void *suite, const char *name) {
+    fprintf(stderr, "%s: SKIP\n", name);
+}
diff --git a/src/tests.h b/src/tests.h
index e517a6fb7..15c27f315 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -47,6 +47,10 @@ extern "C" {
     void assert_messages(struct CuTest * tc, struct mlist *msglist, const struct message_type **types,
         int num_msgs, bool exact_match, ...);
 
+    void disabled_test(void *suite, const char *name);
+
+#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, #TEST)
+
 #ifdef __cplusplus
 }
 #endif

From 30f5fbd4caf6332d469c3cc77e7bfaafa4748fbf Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 8 Feb 2015 13:42:04 +0100
Subject: [PATCH 3/3] work around gcc being nervous when static functions are
 unused.

---
 src/tests.c | 3 ++-
 src/tests.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tests.c b/src/tests.c
index f560dc59a..b1dbc876b 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -273,6 +273,7 @@ void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_ty
     va_end(args);
 }
 
-void disabled_test(void *suite, const char *name) {
+void disabled_test(void *suite, void (*test)(CuTest *), const char *name) {
+    (void)test;
     fprintf(stderr, "%s: SKIP\n", name);
 }
diff --git a/src/tests.h b/src/tests.h
index 15c27f315..3da238fdc 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -47,9 +47,9 @@ extern "C" {
     void assert_messages(struct CuTest * tc, struct mlist *msglist, const struct message_type **types,
         int num_msgs, bool exact_match, ...);
 
-    void disabled_test(void *suite, const char *name);
+    void disabled_test(void *suite, void (*)(struct CuTest *), const char *name);
 
-#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, #TEST)
+#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, TEST, #TEST)
 
 #ifdef __cplusplus
 }