Merge branch 'master' of ssh://git.code.sf.net/p/tuxpaint/tuxpaint

This commit is contained in:
Bill Kendrick 2021-09-25 23:49:39 -07:00
commit 5b6b1a39c5
2 changed files with 14 additions and 11 deletions

View file

@ -43,6 +43,12 @@
#include <wchar.h> #include <wchar.h>
#include "im.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 * 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_SECTIONS 8 /* Maximum numbers of sections in *.im file */
#define MAX_UNICODE_SEQ 16 /* Output of state machine, including NUL */ #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 #ifdef DEBUG
assert(0 <= im->lang && im->lang < NUM_LANGS); 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 #endif
/* Initialize the individual IM */ /* Initialize the individual IM */

View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: fr\n" "Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-23 00:17-0700\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" "Last-Translator: Chion Jacques <jacques.chion@orange.fr>\n"
"Language-Team: <fr@li.org>\n" "Language-Team: <fr@li.org>\n"
"Language: fr\n" "Language: fr\n"
@ -1054,8 +1054,6 @@ msgid "Fretwork"
msgstr "Frise" msgstr "Frise"
#: ../../magic/src/fretwork.c:188 #: ../../magic/src/fretwork.c:188
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. "
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." msgstr "Clique et promène la souris pour dessiner des motifs répétitifs."
@ -1374,10 +1372,8 @@ msgid "Rainbow"
msgstr "Arc-en-ciel" msgstr "Arc-en-ciel"
#: ../../magic/src/rainbow.c:140 #: ../../magic/src/rainbow.c:140
#, fuzzy
#| msgid "Rainbow"
msgid "Smooth Rainbow" msgid "Smooth Rainbow"
msgstr "Arc-en-ciel" msgstr "Arc-en-ciel lent"
#: ../../magic/src/rainbow.c:153 #: ../../magic/src/rainbow.c:153
msgid "You can draw in rainbow colors!" 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 #: ../../magic/src/realrainbow.c:99
msgid "Real Rainbow" msgid "Real Rainbow"
msgstr "Vrai arc-en-ciel réel" msgstr "Arc-en-ciel réel"
#: ../../magic/src/realrainbow.c:101 #: ../../magic/src/realrainbow.c:101
msgid "ROYGBIV Rainbow" msgid "ROYGBIV Rainbow"
msgstr "arc-en-ciel réel" msgstr "Arc-en-ciel simple"
#: ../../magic/src/realrainbow.c:114 #: ../../magic/src/realrainbow.c:114
msgid "" msgid ""