From 42e0effe9b7efe790162ea2682046216d12f255d Mon Sep 17 00:00:00 2001
From: Jacques Chion <jacques.chion@orange.fr>
Date: Thu, 23 Sep 2021 11:38:29 +0200
Subject: [PATCH 1/2] update rainbow

---
 src/po/fr.po | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/po/fr.po b/src/po/fr.po
index 673dd3dcd..ae350e420 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-23 00:17-0700\n"
-"PO-Revision-Date: 2021-09-18 11:00+0200\n"
+"PO-Revision-Date: 2021-09-23 11:33+0200\n"
 "Last-Translator: Chion Jacques <jacques.chion@orange.fr>\n"
 "Language-Team: <fr@li.org>\n"
 "Language: fr\n"
@@ -1054,8 +1054,6 @@ msgid "Fretwork"
 msgstr "Frise"
 
 #: ../../magic/src/fretwork.c:188
-#, fuzzy
-#| msgid "Click and drag to draw repetitive patterns. "
 msgid "Click and drag to draw repetitive patterns."
 msgstr "Clique et promène la souris pour dessiner des motifs répétitifs."
 
@@ -1374,10 +1372,8 @@ msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #: ../../magic/src/rainbow.c:140
-#, fuzzy
-#| msgid "Rainbow"
 msgid "Smooth Rainbow"
-msgstr "Arc-en-ciel"
+msgstr "Arc-en-ciel lent"
 
 #: ../../magic/src/rainbow.c:153
 msgid "You can draw in rainbow colors!"
@@ -1401,11 +1397,11 @@ msgstr "Clique pour remplir le dessin avec des gouttes de pluie."
 
 #: ../../magic/src/realrainbow.c:99
 msgid "Real Rainbow"
-msgstr "Vrai arc-en-ciel réel"
+msgstr "Arc-en-ciel réel"
 
 #: ../../magic/src/realrainbow.c:101
 msgid "ROYGBIV Rainbow"
-msgstr "arc-en-ciel réel"
+msgstr "Arc-en-ciel simple"
 
 #: ../../magic/src/realrainbow.c:114
 msgid ""

From 4b83412ea7b31c503da2a1279362d90bc61eeecc Mon Sep 17 00:00:00 2001
From: Mark Kim <markuskimius@gmail.com>
Date: Thu, 23 Sep 2021 17:07:40 -0400
Subject: [PATCH 2/2] IM debugging updates

- Control debugging via debug.h (previously im.c had its own
  defined constant to control this.)
- Remove reference to an undefined symbol im_event_fp within a DEBUG
  block.

Also:
- Explicitly include i18n.h required by im.c (though it appears to be
  getting included by another file indirectly.)  This should be a no-op
  change.
---
 src/im.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/im.c b/src/im.c
index ac7d5862b..f960ab9cd 100644
--- a/src/im.c
+++ b/src/im.c
@@ -43,6 +43,12 @@
 #include <wchar.h>
 
 #include "im.h"
+#include "i18n.h"
+#include "debug.h"
+
+#ifdef DEBUG
+#include <assert.h>
+#endif
 
 
 /* ***************************************************************************
@@ -94,7 +100,9 @@ static const char *const im_tip_text[NUM_IM_TIPS] = {
 * CONSTANTS
 */
 
-/* #define IM_DEBUG       1 */
+#ifdef DEBUG
+#define IM_DEBUG         1
+#endif
 
 #define MAX_SECTIONS     8      /* Maximum numbers of sections in *.im file */
 #define MAX_UNICODE_SEQ 16      /* Output of state machine, including NUL */
@@ -1876,8 +1884,7 @@ void im_init(IM_DATA * im, int lang)
 
 #ifdef DEBUG
   assert(0 <= im->lang && im->lang < NUM_LANGS);
-  if (im_event_fp)
-    printf("Initializing IM for %s...\n", lang_prefixes[im->lang]);
+  printf("Initializing IM for %s...\n", lang_prefixes[im->lang]);
 #endif
 
   /* Initialize the individual IM */