Merge pull request #123 from badgerman/master

small problems found in the last preview before the 3.4 release

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">

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;
     }
 

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)