Merge branch 'master' into sdl2.0

Makefile

@@ -36,7 +36,7 @@ else
     MINGW_DIR:=/mingw64
   else
     ifeq ($(SYSNAME),Darwin)
-      OS:=osx
+      OS:=macos
       GPERF:=/usr/bin/gperf
     else
       ifeq ($(SYSNAME),BeOS)
@@ -84,7 +84,7 @@ beos_MIMESET_CMD:=mimeset -f tuxpaint
 MIMESET_CMD:=$($(OS)_MIMESET_CMD)
 
 windows_SO_TYPE:=dll
-osx_SO_TYPE:=dylib
+macos_SO_TYPE:=dylib
 beos_SO_TYPE:=so
 linux_SO_TYPE:=so
 SO_TYPE:=$($(OS)_SO_TYPE)
@@ -96,25 +96,25 @@ windows_EXE_EXT:=.exe
 EXE_EXT:=$($(OS)_EXE_EXT)
 
 windows_BUNDLE:=
-osx_BUNDLE=./TuxPaint.app
+macos_BUNDLE=./TuxPaint.app
 beos_BUNDLE:=
 linux_BUNDLE:=
 BUNDLE:=$($(OS)_BUNDLE)
 
 windows_ARCH_LIBS:=obj/win32_print.o obj/resource.o
-osx_ARCH_LIBS:=src/macos_print.m obj/macos.o
+macos_ARCH_LIBS:=src/macos_print.m obj/macos.o
 beos_ARCH_LIBS:=obj/BeOS_print.o
 linux_ARCH_LIBS:=obj/postscript_print.o
 ARCH_LIBS:=$($(OS)_ARCH_LIBS)
 
 windows_ARCH_CFLAGS:=
-osx_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
+macos_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
 beos_ARCH_CFLAGS:=
 linux_ARCH_CFLAGS:=
 ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
 
 windows_ARCH_LDFLAGS:=
-osx_ARCH_LDFLAGS:=-L/opt/local/lib
+macos_ARCH_LDFLAGS:=-L/opt/local/lib
 beos_ARCH_LDFLAGS:=
 linux_ARCH_LDFLAGS:=
 ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
@@ -128,13 +128,13 @@ FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi)
 FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi)
 
 windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant
-osx_ARCH_LINKS:=$(FRIBIDI_LIB) -limagequant
+macos_ARCH_LINKS:=$(FRIBIDI_LIB) -limagequant
 beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) -limagequant
 linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -limagequant
 ARCH_LINKS:=$($(OS)_ARCH_LINKS)
 
 windows_ARCH_HEADERS:=src/win32_print.h
-osx_ARCH_HEADERS:=src/macos.h
+macos_ARCH_HEADERS:=src/macos.h
 beos_ARCH_HEADERS:=src/BeOS_print.h
 linux_ARCH_HEADERS:=
 ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
@@ -142,7 +142,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
 # Where things will go when ultimately installed:
 # For macOS, the prefix is relative to DESTDIR.
 windows_PREFIX:=/usr/local
-osx_PREFIX:=Resources
+macos_PREFIX:=Resources
 linux_PREFIX:=/usr/local
 PREFIX:=$($(OS)_PREFIX)
 
@@ -150,7 +150,7 @@ PREFIX:=$($(OS)_PREFIX)
 # PKG_ROOT is the old name for this, and should be undefined.
 # macOS is set up as a bundle, with all files under 'Contents'.
 # "TuxPaint-1" is the OLPC XO name. Installing to ./ is bad!
-ifeq ($(OS),osx)
+ifeq ($(OS),macos)
   DESTDIR:=$(BUNDLE)/Contents/
 else ifeq ($(PREFIX),./)
   DESTDIR:=TuxPaint-1
@@ -474,7 +474,7 @@ trans:
 ######
 
 windows_ARCH_INSTALL:=
-osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
+macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
 linux_ARCH_INSTALL:=install-xdg
 ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
 
@@ -495,7 +495,7 @@ install:	install-bin install-data install-man install-doc \
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo
-	@if [ "x$(OS)" = "xosx" ]; then \
+	@if [ "x$(OS)" = "xmacos" ]; then \
 		echo "All done! Now you can double click $(BUNDLE) to run the"; \
 		echo "program!!! TuxPaint.dmg has also been created for"; \
 		echo "distribution."; \
@@ -715,7 +715,7 @@ STARTER_BACK_NAME=$(or $(wildcard $(subst starters/.thumbs,starters,$(@:-t.png=-
 
 # FIXME: Need to be able to update a thumbnail if the source image is modified -bjk 2019.09.14
 $(THUMB_STARTERS):
-	@echo -n "."
+	@printf "."
 	@mkdir -p starters/.thumbs
 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
 	then \
@@ -776,7 +776,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
 
 # FIXME: Need to be able to update a thumbnail if the source image is modified -bjk 2019.09.14
 $(THUMB_TEMPLATES):
-	@echo -n "."
+	@printf "."
 	@mkdir -p templates/.thumbs
 	@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
 
@@ -1255,7 +1255,7 @@ MAGIC_SDL_LIBS:=-L/usr/local/lib $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME)
 MAGIC_ARCH_LINKS:=-lintl $(PNG)
 
 windows_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
-osx_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
+macos_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
 beos_PLUGIN_LIBS:="$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS) $(MAGIC_SDL_CPPFLAGS)"
 linux_PLUGIN_LIBS:=
 PLUGIN_LIBS:=$($(OS)_PLUGIN_LIBS)

docs/CHANGES.txt

@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2020.November.21 (0.9.25)
+2020.December.8 (0.9.25)
   * New Features
     ------------
     * Export drawings:
@@ -134,6 +134,9 @@ $Id$
     * Catalan translation
       Pere Pujal i Carabantes <pere@fornol.no-ip.org>
 
+    * French translation
+      Chion Jacques <jacques.chion@orange.fr> 
+
     * Galician translation
       Miguel Bouzada <mbouzada@gmail.com>
 

src/parse.gperf

@@ -163,6 +163,7 @@ version,             IMM(version)
 wheelmouse,          POSBOOL(wheely)
 windowed,            NEGBOOL(fullscreen)
 windowsize,          MULTI(parsertmp_windowsize)
+buttonsize,          MULTI(button_size)
 mouse-accessibility, POSBOOL(mouseaccessibility)
 onscreen-keyboard,   POSBOOL(onscreen_keyboard)
 onscreen-keyboard-layout,         MULTI(onscreen_keyboard_layout)

src/parse.h

@@ -43,6 +43,7 @@ struct cfginfo
   const char *parsertmp_locale;
   const char *parsertmp_sysconfig;
   const char *parsertmp_windowsize;
+  const char *button_size;
   const char *print_delay;
   const char *printcommand;
 //  const char *promptless_save;

src/po/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-15 16:42-0700\n"
-"PO-Revision-Date: 2017-12-03 07:56+0100\n"
+"PO-Revision-Date: 2020-12-08 10:39+0100\n"
 "Last-Translator: Chion Jacques <jacques.chion@orange.fr>\n"
 "Language-Team: <fr@li.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #. Response to Black (0, 0, 0) color selected
 #: ../colors.h:86
@@ -323,23 +323,23 @@ msgstr "Un octogone a huit côtés égaux."
 
 #: ../shapes.h:320 ../shapes.h:321
 msgid "A star with 3 points."
-msgstr "Étoile à 3 branches"
+msgstr "Étoile à 3 branches."
 
 #: ../shapes.h:322 ../shapes.h:323
 msgid "A star with 4 points."
-msgstr "Étoile à 4 branches"
+msgstr "Étoile à 4 branches."
 
 #: ../shapes.h:324 ../shapes.h:325
 msgid "A star with 5 points."
-msgstr "Étoile à 5 branches"
+msgstr "Étoile à 5 branches."
 
 #: ../shapes.h:372
 msgid "Draw shapes from the center."
-msgstr ""
+msgstr "Dessine des objets depuis le centre."
 
 #: ../shapes.h:373
 msgid "Draw shapes from a corner."
-msgstr ""
+msgstr "Dessine des objets depuis un coin."
 
 #. Title of tool selector (buttons down the left)
 #: ../titles.h:56
@@ -472,16 +472,13 @@ msgstr ""
 "Clique pour commencer à dessiner une ligne. Puis continue pour la compléter."
 
 #: ../tools.h:125
-#, fuzzy
-#| msgid ""
-#| "Pick a shape. Click to pick the center, drag, then let go when it is the "
-#| "size you want. Move around to rotate it, and click to draw it."
 msgid ""
 "Pick a shape. Click to start drawing, drag, and let go when it is the size "
 "you want. Move around to rotate it, and click to draw it."
 msgstr ""
-"Choisis une forme. Clique en son centre, choisis sa place et sa taille tout "
-"en appuyant, fais-la tourner, et clique enfin pour la dessiner."
+"Choisis une forme. Clique pour démarrer le dessin, fais glisser, et continue "
+"jusqu'à la taille désirée. Déplace-toi pour la faire tourner, et clique pour "
+"dessiner."
 
 #: ../tools.h:129
 msgid ""
@@ -537,7 +534,7 @@ msgstr ""
 #. Response to 'open' action (while file dialog is being constructed)
 #: ../tools.h:154
 msgid "Open…"
-msgstr "Ouvrir.."
+msgstr "Ouvrir ..."
 
 #. Response to 'save' action
 #: ../tools.h:157
@@ -547,7 +544,7 @@ msgstr "Ton image a été sauvegardée !"
 #. Response to 'print' action (while printing, or print dialog is being used)
 #: ../tools.h:160
 msgid "Printing…"
-msgstr "Impression.."
+msgstr "Impression ..."
 
 #. Response to 'quit' (exit) action
 #: ../tools.h:163
@@ -667,34 +664,26 @@ msgstr "N'oublie pas d'utiliser le bouton gauche de la souris !"
 
 #. Confirmation of successful (we hope) image export
 #: ../tuxpaint.c:2190
-#, fuzzy
-#| msgid "Your picture has been printed!"
 msgid "Your picture has been exported!"
-msgstr "Ton image a été imprimée !"
+msgstr "Ton image a été exportée !"
 
 #: ../tuxpaint.c:2191
-#, fuzzy
-#| msgid "Your picture has been printed!"
 msgid "Your slideshow GIF has been exported!"
-msgstr "Ton image a été imprimée !"
+msgstr "Ton image GIF a été exportée !"
 
 #. We got an error exporting
 #: ../tuxpaint.c:2195
-#, fuzzy
-#| msgid "Sorry! Your picture could not be printed!"
 msgid "Sorry! Your picture could not be exported!"
-msgstr "Désolé, ton image n'a pas pu être imprimée !"
+msgstr "Désolé, ton image n'a pas pu être exportée !"
 
 #: ../tuxpaint.c:2196
-#, fuzzy
-#| msgid "Sorry! Your picture could not be printed!"
 msgid "Sorry! Your slideshow GIF could not be exported!"
-msgstr "Désolé, ton image n'a pas pu être imprimée !"
+msgstr "Désolé, ton image GIF n'a pas pu être exportée !"
 
 #. Slideshow instructions
 #: ../tuxpaint.c:2200
 msgid "Choose the pictures you want, then click “Play”."
-msgstr "Choisis les images que tu veux, puis clique sur “Départ”"
+msgstr "Choisis les images que tu veux, puis clique sur “Départ”."
 
 #. Sound has been muted (silenced) via keyboard shortcut
 #: ../tuxpaint.c:2407
@@ -709,7 +698,7 @@ msgstr "Son activé."
 #. Wait while Text tool finishes loading fonts
 #: ../tuxpaint.c:3167
 msgid "Please wait…"
-msgstr "Attends s'il te plaît .."
+msgstr "Attends s'il te plaît ..."
 
 #. Open dialog: 'Erase' button, to erase/deleted the selected picture
 #: ../tuxpaint.c:7923
@@ -724,7 +713,7 @@ msgstr "Diapos"
 #. Open dialog: 'Export' button, to copy an image to an easily-accessible location
 #: ../tuxpaint.c:7929
 msgid "Export"
-msgstr ""
+msgstr "Exporter"
 
 #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
 #: ../tuxpaint.c:7932
@@ -739,7 +728,7 @@ msgstr "Départ"
 #. Slideshow: 'GIF Export' button, to create an animated GIF
 #: ../tuxpaint.c:7938
 msgid "GIF Export"
-msgstr ""
+msgstr "Exporter en GIF"
 
 #. Slideshow: 'Next' button, to load next slide (image)
 #: ../tuxpaint.c:7941
@@ -782,14 +771,14 @@ msgstr "Non, c'est une nouvelle image !"
 #. Instructions for 'Open' file dialog
 #: ../tuxpaint.c:14454
 msgid "Choose the picture you want, then click “Open”."
-msgstr "Choisis une image, et clique ensuite sur “Ouvrir”"
+msgstr "Choisis une image, et clique ensuite sur “Ouvrir”."
 
 #. None selected? Too dangerous to automatically select all (like we do for slideshow playback).
 #. Only 1 selected?  No point in saving as GIF.
 #.
 #: ../tuxpaint.c:15880
 msgid "Select 2 or more drawings to turn into an animated GIF."
-msgstr ""
+msgstr "Sélectionner 2 ou plusieurs dessins pour créer une image animée GIF."
 
 #: ../tuxpaint.c:23539
 msgid "Select a color from your drawing."
@@ -1259,7 +1248,7 @@ msgstr ""
 
 #: ../../magic/src/puzzle.c:103
 msgid "Puzzle"
-msgstr "Puzzle "
+msgstr "Puzzle"
 
 #: ../../magic/src/puzzle.c:110
 msgid "Click the part of your picture where would you like a puzzle."
@@ -1573,7 +1562,7 @@ msgstr "Clique et promène la souris pour dessiner un effet Xor"
 #
 #: ../../magic/src/xor.c:101
 msgid "Click to draw a XOR effect on the whole picture"
-msgstr "Clique pour avoir un effet Xor sur l'ensemble de l'image."
+msgstr "Clique pour avoir un effet Xor sur l'ensemble de l'image"
 
 #~ msgid "Black & White"
 #~ msgstr "Gris"