From 3fc434e1b9c13afec5c4ec9e45eaaa196060dc0a Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 1 Feb 2015 10:27:00 +0100
Subject: [PATCH 1/2] bug 2072: make peasant growth not spam messages.

---
 src/laws.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/laws.c b/src/laws.c
index 753ce0b8f..817679689 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -330,8 +330,9 @@ static void peasants(region * r)
         }
 
         luck = peasant_luck_effect(peasants, luck, maxp, .5);
+#ifdef STORCH_SPAM_BUG_2072
         ADDMSG(&r->msgs, msg_message("peasantluck_success", "births", luck));
-
+#endif
         peasants += births + luck;
     }
 

From 03cddee6b7e68d22208305a0096d0d3ca7cfc598 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 1 Feb 2015 10:39:36 +0100
Subject: [PATCH 2/2] Small plural/singular fix in German message.

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

diff --git a/res/core/messages.xml b/res/core/messages.xml
index 171c99b47..a2797727e 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -3212,8 +3212,7 @@
     <type>
       <arg name="dead" type="int"/>
     </type>
-    <text locale="de">"$if($eq($dead,1),"Ein Bauer","$int($dead) Bauern") verhungert."</text>
-    <text locale="fr">"$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")."</text>
+    <text locale="de">"$if($eq($dead,1),"Ein Bauer verhungert","$int($dead) Bauern verhungern")."</text>
     <text locale="en">"$if($eq($dead,1),"One peasant starves","$int($dead) peasants starve")."</text>
   </message>
   <message name="volcanooutbreaknn" section="events">
diff --git a/src/report.c b/src/report.c
index 635e0bf1d..f037ced56 100644
--- a/src/report.c
+++ b/src/report.c
@@ -2416,6 +2416,7 @@ const char *charset)
       /* Nachrichten an REGION in der Region */
 
       if (sr->mode == see_unit || sr->mode == see_travel) {
+          // TODO: Bug 2073
           message_list *mlist = r_getmessages(r, f);
           rp_messages(F, r->msgs, f, 0, true);
           if (mlist)