notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Being more consistent w/ use of gettext()/_noop()

Browse source 
...in Magic tools (for names & descriptions / tool-tips).
This commit is contained in:
Bill Kendrick 2024-10-07 21:44:08 -07:00
parent 0a2f406765
commit 244ab1d6f2
58 changed files with 212 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/CHANGES.txt
View file

@ -6,7 +6,7 @@ Copyright (c) 2002-2024
Various contributors (see below, and AUTHORS.txt) Various contributors (see below, and AUTHORS.txt)
https://tuxpaint.org/ https://tuxpaint.org/
2024.October.6 (0.9.34) 2024.October.7 (0.9.34)
* New Magic Tools: * New Magic Tools:
---------------- ----------------
* "Comic Dots", draws repeating dots (using a multiply blend) * "Comic Dots", draws repeating dots (using a multiply blend)
@ -107,6 +107,9 @@ https://tuxpaint.org/
* Localization Updates: * Localization Updates:
--------------------- ---------------------
* Catalan translation
Pere Pujal i Carabantes <perepujal@gmail.com>
* French translation * French translation
Jacques Chion <jacques.chion@orange.fr> Jacques Chion <jacques.chion@orange.fr>
@ -133,6 +136,10 @@ https://tuxpaint.org/
Closes https://sourceforge.net/p/tuxpaint/bugs/293 Closes https://sourceforge.net/p/tuxpaint/bugs/293
Pere Pujal i Carabantes <perepujal@gmail.com> Pere Pujal i Carabantes <perepujal@gmail.com>
* Being more consistent with use of `gettext()` vs `gettext_noop()`
in Magic tools (for names & descriptions / tool-tips).
Bill Kendrick <bill@newbreedsoftware.com>
2024.July.17 (0.9.33) 2024.July.17 (0.9.33)
* New Magic Tools: * New Magic Tools:
---------------- ----------------

6
magic/src/alien.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -147,7 +147,7 @@ SDL_Surface *alien_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *alien_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *alien_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(alien_names[which]))); return (strdup(gettext(alien_names[which])));
} }
int alien_get_group(magic_api * api ATTRIBUTE_UNUSED, int which) int alien_get_group(magic_api * api ATTRIBUTE_UNUSED, int which)
@ -163,7 +163,7 @@ int alien_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *alien_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *alien_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(alien_descs[which][mode - 1]))); return (strdup(gettext(alien_descs[which][mode - 1])));
} }
//Do the effect for one pixel //Do the effect for one pixel

2
magic/src/ascii.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 27, 2024 Last updated: October 7, 2024
*/ */
//#define DEBUG //#define DEBUG

6
magic/src/blind.c
View file

@ -24,7 +24,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -124,7 +124,7 @@ SDL_Surface *blind_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *blind_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *blind_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Blind")); return strdup(gettext("Blind"));
} }
int blind_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int blind_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -140,7 +140,7 @@ int blind_get_order(int which ATTRIBUTE_UNUSED)
char *blind_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *blind_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return return
strdup(gettext_noop strdup(gettext
("Click towards the edge of your picture to pull window blinds over it. Move perpendicularly to open or close the blinds.")); ("Click towards the edge of your picture to pull window blinds over it. Move perpendicularly to open or close the blinds."));
} }

20
magic/src/blocks_etc.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -134,11 +134,11 @@ SDL_Surface *blocks_etc_get_icon(magic_api * api, int which)
char *blocks_etc_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *blocks_etc_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == TOOL_BLOCKS) if (which == TOOL_BLOCKS)
return (strdup(gettext_noop("Blocks"))); return (strdup(gettext("Blocks")));
else if (which == TOOL_CHALK) else if (which == TOOL_CHALK)
return (strdup(gettext_noop("Chalk"))); return (strdup(gettext("Chalk")));
else if (which == TOOL_DRIP) else if (which == TOOL_DRIP)
return (strdup(gettext_noop("Drip"))); return (strdup(gettext("Drip")));
return (NULL); return (NULL);
} }
@ -176,33 +176,33 @@ char *blocks_etc_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, in
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to make the picture blocky."))); return (strdup(gettext("Click and drag the mouse around to make the picture blocky.")));
} }
else else
{ {
return (strdup(gettext_noop("Click to make the entire picture blocky."))); return (strdup(gettext("Click to make the entire picture blocky.")));
} }
} }
else if (which == TOOL_CHALK) else if (which == TOOL_CHALK)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to turn the picture into a chalk drawing."))); return (strdup(gettext("Click and drag the mouse around to turn the picture into a chalk drawing.")));
} }
else else
{ {
return (strdup(gettext_noop("Click to turn the entire picture into a chalk drawing."))); return (strdup(gettext("Click to turn the entire picture into a chalk drawing.")));
} }
} }
else if (which == TOOL_DRIP) else if (which == TOOL_DRIP)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to make the picture drip."))); return (strdup(gettext("Click and drag the mouse around to make the picture drip.")));
} }
else else
{ {
return (strdup(gettext_noop("Click to make the entire picture drip."))); return (strdup(gettext("Click to make the entire picture drip.")));
} }
} }

6
magic/src/blur.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -135,7 +135,7 @@ SDL_Surface *blur_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *blur_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *blur_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(blur_names[which]))); return (strdup(gettext(blur_names[which])));
} }
// Return our group // Return our group
@ -153,7 +153,7 @@ int blur_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *blur_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *blur_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(blur_descs[which][mode - 1]))); return (strdup(gettext(blur_descs[which][mode - 1])));
} }
//Do the effect for one pixel //Do the effect for one pixel

10
magic/src/bricks.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -133,7 +133,7 @@ char *bricks_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUS
{ {
/* Both are named "Bricks", at the moment: */ /* Both are named "Bricks", at the moment: */
return (strdup(gettext_noop("Bricks"))); return (strdup(gettext("Bricks")));
} }
// Return our group (both the same): // Return our group (both the same):
@ -154,13 +154,13 @@ char *bricks_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mo
if (brick_two_tools) if (brick_two_tools)
{ {
if (which == TOOL_LARGEBRICKS) if (which == TOOL_LARGEBRICKS)
return (strdup(gettext_noop("Click and drag to draw large bricks."))); return (strdup(gettext("Click and drag to draw large bricks.")));
else if (which == TOOL_SMALLBRICKS) else if (which == TOOL_SMALLBRICKS)
return (strdup(gettext_noop("Click and drag to draw small bricks."))); return (strdup(gettext("Click and drag to draw small bricks.")));
} }
else else
{ {
return (strdup(gettext_noop("Click and drag to draw bricks."))); return (strdup(gettext("Click and drag to draw bricks.")));
} }
return (NULL); return (NULL);

6
magic/src/calligraphy.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -129,7 +129,7 @@ SDL_Surface *calligraphy_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our name, localized: // Return our name, localized:
char *calligraphy_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *calligraphy_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Calligraphy"))); return (strdup(gettext("Calligraphy")));
} }
// Return our group // Return our group
@ -148,7 +148,7 @@ int calligraphy_get_order(int which ATTRIBUTE_UNUSED)
char *calligraphy_get_description(magic_api * api ATTRIBUTE_UNUSED, char *calligraphy_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to draw in calligraphy."))); return (strdup(gettext("Click and drag the mouse around to draw in calligraphy.")));
} }

8
magic/src/cartoon.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: December 29, 2023 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -109,7 +109,7 @@ SDL_Surface *cartoon_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *cartoon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *cartoon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Cartoon"))); return (strdup(gettext("Cartoon")));
} }
// Return our groups // Return our groups
@ -129,11 +129,11 @@ char *cartoon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIB
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to turn the picture into a cartoon."))); return (strdup(gettext("Click and drag the mouse around to turn the picture into a cartoon.")));
} }
else else
{ {
return (strdup(gettext_noop("Click to turn the entire picture into a cartoon."))); return (strdup(gettext("Click to turn the entire picture into a cartoon.")));
} }
} }

6
magic/src/checkerboard.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -113,7 +113,7 @@ SDL_Surface *checkerboard_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *checkerboard_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *checkerboard_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Checkerboard")); return strdup(gettext("Checkerboard"));
} }
int checkerboard_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int checkerboard_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -129,7 +129,7 @@ int checkerboard_get_order(int which ATTRIBUTE_UNUSED)
char *checkerboard_get_description(magic_api * api ATTRIBUTE_UNUSED, char *checkerboard_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click and drag to fill the canvas with a checkerboard pattern.")); return strdup(gettext("Click and drag to fill the canvas with a checkerboard pattern."));
} }
int checkerboard_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int checkerboard_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

6
magic/src/clone.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -142,7 +142,7 @@ SDL_Surface *clone_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *clone_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *clone_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Clone"))); return (strdup(gettext("Clone")));
} }
// Return our groups: // Return our groups:
@ -161,7 +161,7 @@ int clone_get_order(int which ATTRIBUTE_UNUSED)
char *clone_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *clone_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup return (strdup
(gettext_noop (gettext
("Click once to pick a spot to begin cloning. Click again and drag to clone that part of the picture."))); ("Click once to pick a spot to begin cloning. Click again and drag to clone that part of the picture.")));
return (NULL); return (NULL);

8
magic/src/comicdot.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 29, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -131,7 +131,7 @@ SDL_Surface *comicdot_get_icon(magic_api * api, int which)
char *comicdot_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *comicdot_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Comic Dots"))); return (strdup(gettext("Comic Dots")));
} }
int comicdot_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int comicdot_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -147,9 +147,9 @@ int comicdot_get_order(int which)
char *comicdot_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *comicdot_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return (strdup(gettext_noop("Click and drag to draw an a dot pattern on your picture"))); return (strdup(gettext("Click and drag to draw an a dot pattern on your picture")));
else else
return (strdup(gettext_noop("Click to apply a dot pattern on your entire picture"))); return (strdup(gettext("Click to apply a dot pattern on your entire picture")));
} }
static void do_comicdot(void *ptr, int which, static void do_comicdot(void *ptr, int which,

6
magic/src/confetti.c
View file

@ -1,5 +1,5 @@
/* /*
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <time.h> //For time() #include <time.h> //For time()
@ -99,7 +99,7 @@ SDL_Surface *confetti_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *confetti_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *confetti_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Confetti")); return strdup(gettext("Confetti"));
} }
int confetti_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int confetti_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -114,7 +114,7 @@ int confetti_get_order(int which ATTRIBUTE_UNUSED)
char *confetti_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *confetti_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click to throw confetti!")); return strdup(gettext("Click to throw confetti!"));
} }
int confetti_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int confetti_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

6
magic/src/crescent.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 28, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -104,7 +104,7 @@ SDL_Surface *crescent_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *crescent_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *crescent_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Crescent"))); return (strdup(gettext("Crescent")));
} }
int crescent_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int crescent_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -119,7 +119,7 @@ int crescent_get_order(int which ATTRIBUTE_UNUSED)
char *crescent_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *crescent_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to draw a crescent shape. Use the size option to change the shape."))); return (strdup(gettext("Click and drag to draw a crescent shape. Use the size option to change the shape.")));
} }
void do_crescent(magic_api * api, SDL_Surface * canvas, int x, int y, SDL_Rect * update_rect, int final) void do_crescent(magic_api * api, SDL_Surface * canvas, int x, int y, SDL_Rect * update_rect, int final)

6
magic/src/distortion.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
/* Inclusion of header files: */ /* Inclusion of header files: */
@ -139,7 +139,7 @@ SDL_Surface *distortion_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *distortion_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *distortion_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Distortion"))); return (strdup(gettext("Distortion")));
} }
@ -164,7 +164,7 @@ int distortion_get_order(int which ATTRIBUTE_UNUSED)
char *distortion_get_description(magic_api * api ATTRIBUTE_UNUSED, char *distortion_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag the mouse to cause distortion in your picture."))); return (strdup(gettext("Click and drag the mouse to cause distortion in your picture.")));
} }
// Report whether we accept colors // Report whether we accept colors

8
magic/src/emboss.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -105,7 +105,7 @@ SDL_Surface *emboss_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *emboss_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *emboss_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Emboss"))); return (strdup(gettext("Emboss")));
} }
// Return our groups: // Return our groups:
@ -124,9 +124,9 @@ int emboss_get_order(int which ATTRIBUTE_UNUSED)
char *emboss_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *emboss_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return (strdup(gettext_noop("Click and drag the mouse to emboss the picture."))); return (strdup(gettext("Click and drag the mouse to emboss the picture.")));
else else
return (strdup(gettext_noop("Click to emboss the entire picture."))); return (strdup(gettext("Click to emboss the entire picture.")));
} }

6
magic/src/fisheye.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <math.h> #include <math.h>
@ -109,7 +109,7 @@ SDL_Surface *fisheye_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *fisheye_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *fisheye_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Fisheye")); return strdup(gettext("Fisheye"));
} }
int fisheye_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int fisheye_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -124,7 +124,7 @@ int fisheye_get_order(int which ATTRIBUTE_UNUSED)
char *fisheye_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *fisheye_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click on part of your picture to create a fisheye effect.")); return strdup(gettext("Click on part of your picture to create a fisheye effect."));
} }
int fisheye_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int fisheye_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

4
magic/src/flower.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -198,7 +198,7 @@ SDL_Surface *flower_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *flower_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *flower_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Flower"))); return (strdup(gettext("Flower")));
} }
// Return our groups: // Return our groups:

6
magic/src/foam.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -129,7 +129,7 @@ SDL_Surface *foam_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *foam_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *foam_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Foam"))); return (strdup(gettext("Foam")));
} }
// Return our groups // Return our groups
@ -147,7 +147,7 @@ int foam_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *foam_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *foam_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag the mouse to cover an area with foamy bubbles."))); return (strdup(gettext("Click and drag the mouse to cover an area with foamy bubbles.")));
} }
// Do the effect: // Do the effect:

6
magic/src/fold.c
View file

@ -1,7 +1,7 @@
/* /*
Folds the picture down from the corners. Folds the picture down from the corners.
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
//optimized version soon :) //optimized version soon :)
@ -113,7 +113,7 @@ SDL_Surface *fold_get_icon(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE
char *fold_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *fold_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (gettext_noop("Fold")); return (gettext("Fold"));
} }
int fold_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int fold_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -128,7 +128,7 @@ int fold_get_order(int which ATTRIBUTE_UNUSED)
char *fold_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *fold_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Choose a background color and click to turn the corner of the page over.")); return strdup(gettext("Choose a background color and click to turn the corner of the page over."));
} }
int fold_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int fold_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

10
magic/src/fractal.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 23, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -128,7 +128,7 @@ char *fractal_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
char tmp[128]; char tmp[128];
snprintf(tmp, sizeof(tmp), gettext_noop("Fractal #%d"), which + 1); snprintf(tmp, sizeof(tmp), gettext("Fractal #%d"), which + 1);
return strdup(tmp); return strdup(tmp);
} }
@ -150,16 +150,16 @@ char *fractal_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int m
{ {
if (fract_opt[which].angle != 0) if (fract_opt[which].angle != 0)
{ {
snprintf(tmp, sizeof(tmp), gettext_noop("Click and drag to sketch a shape. It will repeat, %1$s %2$d%% and rotating %3$d degrees."), (fract_opt[which].scale > 1.0 ? gettext_noop("scaling up") : gettext_noop("scaling down")), (int) (fract_opt[which].scale * 100), fract_opt[which].angle); snprintf(tmp, sizeof(tmp), gettext("Click and drag to sketch a shape. It will repeat, %1$s %2$d%% and rotating %3$d degrees."), (fract_opt[which].scale > 1.0 ? gettext("scaling up") : gettext("scaling down")), (int) (fract_opt[which].scale * 100), fract_opt[which].angle);
} }
else else
{ {
snprintf(tmp, sizeof(tmp), gettext_noop("Click and drag to sketch a shape. It will repeat, %1$s %2$d%%."), (fract_opt[which].scale > 1.0 ? gettext_noop("scaling up") : gettext_noop("scaling down")), (int) (fract_opt[which].scale * 100)); snprintf(tmp, sizeof(tmp), gettext("Click and drag to sketch a shape. It will repeat, %1$s %2$d%%."), (fract_opt[which].scale > 1.0 ? gettext("scaling up") : gettext("scaling down")), (int) (fract_opt[which].scale * 100));
} }
} }
else else
{ {
snprintf(tmp, sizeof(tmp), gettext_noop("Click and drag to sketch a shape. It will repeat, rotating %d degrees."), fract_opt[which].angle); snprintf(tmp, sizeof(tmp), gettext("Click and drag to sketch a shape. It will repeat, rotating %d degrees."), fract_opt[which].angle);
} }
return (strdup(tmp)); return (strdup(tmp));

8
magic/src/fretwork.c
View file

@ -1,7 +1,7 @@
/* /*
Draws fretwork Draws fretwork
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -219,15 +219,15 @@ int fretwork_get_order(int which ATTRIBUTE_UNUSED)
char *fretwork_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *fretwork_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Fretwork")); return strdup(gettext("Fretwork"));
} }
char *fretwork_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *fretwork_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return strdup(gettext_noop("Click and drag to draw repetitive patterns.")); return strdup(gettext("Click and drag to draw repetitive patterns."));
else else
return strdup(gettext_noop("Click to surround your picture with repetitive patterns.")); return strdup(gettext("Click to surround your picture with repetitive patterns."));
} }
int fretwork_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int fretwork_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

8
magic/src/glasstile.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
TODO: TODO:
* Support sizing options * Support sizing options
@ -110,7 +110,7 @@ SDL_Surface *glasstile_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *glasstile_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *glasstile_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Glass Tile"))); return (strdup(gettext("Glass Tile")));
} }
// Return our groups // Return our groups
@ -129,9 +129,9 @@ int glasstile_get_order(int which ATTRIBUTE_UNUSED)
char *glasstile_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *glasstile_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return (strdup(gettext_noop("Click and drag the mouse to put glass tile over your picture."))); return (strdup(gettext("Click and drag the mouse to put glass tile over your picture.")));
else else
return (strdup(gettext_noop("Click to cover your entire picture in glass tiles."))); return (strdup(gettext("Click to cover your entire picture in glass tiles.")));
} }
// Do the effect: // Do the effect:

6
magic/src/grass.c
View file

@ -24,7 +24,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -109,7 +109,7 @@ SDL_Surface *grass_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *grass_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *grass_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Grass"))); return (strdup(gettext("Grass")));
} }
// Return our groups: // Return our groups:
@ -127,7 +127,7 @@ int grass_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *grass_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *grass_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to draw grass. Don’t forget the dirt!"))); return (strdup(gettext("Click and drag to draw grass. Don’t forget the dirt!")));
} }

4
magic/src/halftone.c
View file

@ -1,6 +1,6 @@
/* halftone.c /* halftone.c
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
@ -136,7 +136,7 @@ char *halftone_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
const char *our_name_localized; const char *our_name_localized;
our_name_english = names[which]; our_name_english = names[which];
our_name_localized = gettext_noop(our_name_english); our_name_localized = gettext(our_name_english);
return (strdup(our_name_localized)); return (strdup(our_name_localized));
} }

12
magic/src/kalidescope.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -164,26 +164,26 @@ char *kalidescope_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, i
if (which == KAL_LR) if (which == KAL_LR)
{ {
return (strdup return (strdup
(gettext_noop (gettext
("Click and drag the mouse to draw with two brushes that are symmetric across the left and right of your picture."))); ("Click and drag the mouse to draw with two brushes that are symmetric across the left and right of your picture.")));
} }
else if (which == KAL_UD) else if (which == KAL_UD)
{ {
return (strdup return (strdup
(gettext_noop (gettext
("Click and drag the mouse to draw with two brushes that are symmetric across the top and bottom of your picture."))); ("Click and drag the mouse to draw with two brushes that are symmetric across the top and bottom of your picture.")));
} }
else if (which == KAL_PATTERN) else if (which == KAL_PATTERN)
{ {
return (strdup(gettext_noop("Click and drag the mouse to draw a pattern across the picture."))); return (strdup(gettext("Click and drag the mouse to draw a pattern across the picture.")));
} }
else if (which == KAL_TILES) else if (which == KAL_TILES)
{ {
return (strdup(gettext_noop("Click and drag the mouse to draw a pattern that is symmetric across the picture."))); return (strdup(gettext("Click and drag the mouse to draw a pattern that is symmetric across the picture.")));
} }
else else
{ /* KAL_BOTH */ { /* KAL_BOTH */
return (strdup(gettext_noop("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."))); return (strdup(gettext("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope).")));
} }
} }

6
magic/src/light.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -110,7 +110,7 @@ SDL_Surface *light_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *light_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *light_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Light"))); return (strdup(gettext("Light")));
} }
// Return our groups: // Return our groups:
@ -128,7 +128,7 @@ int light_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *light_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *light_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to draw a beam of light on your picture."))); return (strdup(gettext("Click and drag to draw a beam of light on your picture.")));
} }
// Do the effect: // Do the effect:

6
magic/src/metalpaint.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -102,7 +102,7 @@ SDL_Surface *metalpaint_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *metalpaint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *metalpaint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Metal Paint"))); return (strdup(gettext("Metal Paint")));
} }
// Return our groups: // Return our groups:
@ -121,7 +121,7 @@ int metalpaint_get_order(int which ATTRIBUTE_UNUSED)
char *metalpaint_get_description(magic_api * api ATTRIBUTE_UNUSED, char *metalpaint_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag the mouse to paint with a metallic color."))); return (strdup(gettext("Click and drag the mouse to paint with a metallic color.")));
} }
#define METALPAINT_CYCLE 32 #define METALPAINT_CYCLE 32

10
magic/src/mirror_f.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -114,9 +114,9 @@ TX_EXTERN SDL_Surface *mirror_f_get_icon(magic_api * api, int which)
TX_EXTERN char *mirror_f_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) TX_EXTERN char *mirror_f_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == TOOL_MIRROR) if (which == TOOL_MIRROR)
return (strdup(gettext_noop("Mirror"))); return (strdup(gettext("Mirror")));
else if (which == TOOL_FLIP) else if (which == TOOL_FLIP)
return (strdup(gettext_noop("Flip"))); return (strdup(gettext("Flip")));
return (NULL); return (NULL);
} }
@ -137,9 +137,9 @@ int mirror_f_get_order(int which)
TX_EXTERN char *mirror_f_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) TX_EXTERN char *mirror_f_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {
if (which == TOOL_MIRROR) if (which == TOOL_MIRROR)
return (strdup(gettext_noop("Click to make a mirror image."))); return (strdup(gettext("Click to make a mirror image.")));
else else
return (strdup(gettext_noop("Click to flip the picture upside-down."))); return (strdup(gettext("Click to flip the picture upside-down.")));
return (NULL); return (NULL);
} }

6
magic/src/mosaic.c
View file

@ -26,7 +26,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -154,7 +154,7 @@ SDL_Surface *mosaic_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *mosaic_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *mosaic_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(mosaic_names[which]))); return (strdup(gettext(mosaic_names[which])));
} }
// Return our groups: // Return our groups:
@ -172,7 +172,7 @@ int mosaic_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *mosaic_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *mosaic_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(mosaic_descs[which][mode - 1]))); return (strdup(gettext(mosaic_descs[which][mode - 1])));
} }
//Calculates the grey scale value for a rgb pixel //Calculates the grey scale value for a rgb pixel

6
magic/src/mosaic_shaped.c
View file

@ -30,7 +30,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -205,7 +205,7 @@ SDL_Surface *mosaic_shaped_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *mosaic_shaped_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *mosaic_shaped_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(mosaic_shaped_names[which]))); return (strdup(gettext(mosaic_shaped_names[which])));
} }
// Return our groups (all the same!) // Return our groups (all the same!)
@ -223,7 +223,7 @@ int mosaic_shaped_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *mosaic_shaped_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *mosaic_shaped_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(mosaic_shaped_descs[which][mode - 1]))); return (strdup(gettext(mosaic_shaped_descs[which][mode - 1])));
} }
//Calculates the grey scale value for a rgb pixel //Calculates the grey scale value for a rgb pixel

6
magic/src/negative.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -123,7 +123,7 @@ SDL_Surface *negative_get_icon(magic_api * api, int which)
// Return our name, localized: // Return our name, localized:
char *negative_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *negative_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(negative_names[which]))); return (strdup(gettext(negative_names[which])));
} }
// Return our group (both the same): // Return our group (both the same):
@ -156,7 +156,7 @@ char *negative_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int
return NULL; return NULL;
} }
return (strdup(gettext_noop(negative_descs[which][mode_idx]))); return (strdup(gettext(negative_descs[which][mode_idx])));
} }
static void negative_calc(void *ptr, int which, Uint8 r, Uint8 g, Uint8 b, Uint8 * new_r, Uint8 * new_g, Uint8 * new_b) static void negative_calc(void *ptr, int which, Uint8 r, Uint8 g, Uint8 b, Uint8 * new_r, Uint8 * new_g, Uint8 * new_b)

6
magic/src/noise.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -146,7 +146,7 @@ SDL_Surface *noise_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(noise_names[which]))); return (strdup(gettext(noise_names[which])));
} }
// Return our groups // Return our groups
@ -164,7 +164,7 @@ int noise_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(noise_descs[which][mode - 1]))); return (strdup(gettext(noise_descs[which][mode - 1])));
} }
//Do the effect for one pixel //Do the effect for one pixel

6
magic/src/perspective.c
View file

@ -32,7 +32,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -226,7 +226,7 @@ SDL_Surface *perspective_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *perspective_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *perspective_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(perspective_names[which]))); return (strdup(gettext(perspective_names[which])));
} }
// Return our group (the same): // Return our group (the same):
@ -244,7 +244,7 @@ int perspective_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *perspective_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *perspective_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop(perspective_descs[which]))); return (strdup(gettext(perspective_descs[which])));
} }

6
magic/src/pixels.c
View file

@ -25,7 +25,7 @@
FIXME: If --nomagicsizes set, offer at least a couple size variations. -bjk 2024.01.16 FIXME: If --nomagicsizes set, offer at least a couple size variations. -bjk 2024.01.16
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -114,7 +114,7 @@ SDL_Surface *pixels_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *pixels_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *pixels_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Pixels"))); return (strdup(gettext("Pixels")));
} }
// Return our group (both the same): // Return our group (both the same):
@ -132,7 +132,7 @@ int pixels_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *pixels_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *pixels_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to draw large pixels."))); return (strdup(gettext("Click and drag to draw large pixels.")));
return (NULL); return (NULL);
} }

8
magic/src/puzzle.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
@ -109,7 +109,7 @@ SDL_Surface *puzzle_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *puzzle_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *puzzle_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Puzzle"))); return (strdup(gettext("Puzzle")));
} }
int puzzle_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int puzzle_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -127,8 +127,8 @@ int puzzle_get_order(int which ATTRIBUTE_UNUSED)
char *puzzle_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *puzzle_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return strdup(gettext_noop("Click the part of your picture where would you like a puzzle.")); return strdup(gettext("Click the part of your picture where would you like a puzzle."));
return strdup(gettext_noop("Click to make a puzzle in fullscreen mode.")); return strdup(gettext("Click to make a puzzle in fullscreen mode."));
} }
void puzzle_release(magic_api * api ATTRIBUTE_UNUSED, void puzzle_release(magic_api * api ATTRIBUTE_UNUSED,

6
magic/src/rails.c
View file

@ -3,7 +3,7 @@
Draw train tracks. Draw train tracks.
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
#include "SDL_image.h" #include "SDL_image.h"
@ -169,7 +169,7 @@ SDL_Surface *rails_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *rails_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *rails_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Rails")); return strdup(gettext("Rails"));
} }
int rails_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int rails_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -184,7 +184,7 @@ int rails_get_order(int which ATTRIBUTE_UNUSED)
char *rails_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *rails_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click and drag to draw train track rails on your picture.")); return strdup(gettext("Click and drag to draw train track rails on your picture."));
} }
int rails_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int rails_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

6
magic/src/rain.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -157,7 +157,7 @@ SDL_Surface *rain_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *rain_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *rain_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(rain_names[which]))); return (strdup(gettext(rain_names[which])));
} }
// Return our groups // Return our groups
@ -175,7 +175,7 @@ int rain_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *rain_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *rain_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(rain_descs[which][mode - 1]))); return (strdup(gettext(rain_descs[which][mode - 1])));
} }
// Do the effect: // Do the effect:

10
magic/src/rainbow.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -153,15 +153,15 @@ char *rainbow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU
/* FIXME: Place these in an array */ /* FIXME: Place these in an array */
if (which == TOOL_RAINBOW) if (which == TOOL_RAINBOW)
{ {
return (strdup(gettext_noop("Rainbow"))); return (strdup(gettext("Rainbow")));
} }
else if (which == TOOL_SMOOTH_RAINBOW) else if (which == TOOL_SMOOTH_RAINBOW)
{ {
return (strdup(gettext_noop("Smooth Rainbow"))); return (strdup(gettext("Smooth Rainbow")));
} }
else /* TOOL_RAINBOW_CYCLE */ else /* TOOL_RAINBOW_CYCLE */
{ {
return (strdup(gettext_noop("Rainbow Cycle"))); return (strdup(gettext("Rainbow Cycle")));
} }
} }
@ -180,7 +180,7 @@ int rainbow_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *rainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *rainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("You can draw in rainbow colors!"))); return (strdup(gettext("You can draw in rainbow colors!")));
} }
// Do the effect: // Do the effect:

8
magic/src/realrainbow.c
View file

@ -7,7 +7,7 @@
Math assistance by Jeff Newmiller <jdnewmil@dcn.davis.ca.us> Math assistance by Jeff Newmiller <jdnewmil@dcn.davis.ca.us>
First created: 2009.04.02 First created: 2009.04.02
Last updated: January 16, 2024 Last updated: October 7, 2024
FIXME: FIXME:
* Color/alpha art needs improvement. * Color/alpha art needs improvement.
@ -103,9 +103,9 @@ SDL_Surface *realrainbow_get_icon(magic_api * api, int which)
char *realrainbow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *realrainbow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == 0) if (which == 0)
return (strdup(gettext_noop("Real Rainbow"))); return (strdup(gettext("Real Rainbow")));
else else
return (strdup(gettext_noop("ROYGBIV Rainbow"))); return (strdup(gettext("ROYGBIV Rainbow")));
} }
int realrainbow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int realrainbow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -122,7 +122,7 @@ char *realrainbow_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup return (strdup
(gettext_noop (gettext
("Click where you want your rainbow to start, drag to where you want it to end, and then let go to draw a rainbow."))); ("Click where you want your rainbow to start, drag to where you want it to end, and then let go to draw a rainbow.")));
} }

6
magic/src/reflection.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -112,7 +112,7 @@ SDL_Surface *reflection_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *reflection_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *reflection_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Reflection"))); return (strdup(gettext("Reflection")));
} }
int reflection_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int reflection_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -128,7 +128,7 @@ int reflection_get_order(int which ATTRIBUTE_UNUSED)
char *reflection_get_description(magic_api * api ATTRIBUTE_UNUSED, char *reflection_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag the mouse around to add a reflection to your picture."))); return (strdup(gettext("Click and drag the mouse around to add a reflection to your picture.")));
} }
void reflection_drag(magic_api * api, int which ATTRIBUTE_UNUSED, void reflection_drag(magic_api * api, int which ATTRIBUTE_UNUSED,

4
magic/src/ribbon.c
View file

@ -115,7 +115,7 @@ SDL_Surface *ribbon_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *ribbon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *ribbon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Ribbon"))); return (strdup(gettext("Ribbon")));
} }
// Return our group: // Return our group:
@ -133,7 +133,7 @@ int ribbon_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *ribbon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *ribbon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Add a flowing ribbon to your picture."))); return (strdup(gettext("Add a flowing ribbon to your picture.")));
} }
// Do the effect: // Do the effect:

6
magic/src/ripples.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -105,7 +105,7 @@ SDL_Surface *ripples_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *ripples_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *ripples_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Ripples"))); return (strdup(gettext("Ripples")));
} }
// Return our groups: // Return our groups:
@ -123,7 +123,7 @@ int ripples_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *ripples_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *ripples_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click to make ripples appear over your picture."))); return (strdup(gettext("Click to make ripples appear over your picture.")));
} }
// Affect the canvas on drag: // Affect the canvas on drag:

10
magic/src/rosette.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
// sound only plays on release // sound only plays on release
@ -126,9 +126,9 @@ SDL_Surface *rosette_get_icon(magic_api * api, int which)
char *rosette_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *rosette_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (!which) if (!which)
return strdup(gettext_noop("Rosette")); return strdup(gettext("Rosette"));
else else
return strdup(gettext_noop("Picasso")); return strdup(gettext("Picasso"));
} }
int rosette_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int rosette_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -144,9 +144,9 @@ int rosette_get_order(int which)
char *rosette_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *rosette_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {
if (!which) if (!which)
return strdup(gettext_noop("Click and start drawing your rosette.")); //just k'scope with 3 bits? return strdup(gettext("Click and start drawing your rosette.")); //just k'scope with 3 bits?
else else
return strdup(gettext_noop("You can draw just like Picasso!")); //what is this actually doing? return strdup(gettext("You can draw just like Picasso!")); //what is this actually doing?
} }
int rosette_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int rosette_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

6
magic/src/rotate.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 30, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -105,7 +105,7 @@ SDL_Surface *rotate_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *rotate_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *rotate_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Rotate"))); return (strdup(gettext("Rotate")));
} }
int rotate_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int rotate_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -120,7 +120,7 @@ int rotate_get_order(int which ATTRIBUTE_UNUSED)
char *rotate_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *rotate_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to rotate your drawing."))); return (strdup(gettext("Click and drag to rotate your drawing.")));
} }
float do_rotate(SDL_Surface * canvas, int x, int y, int smoothing_flag) float do_rotate(SDL_Surface * canvas, int x, int y, int smoothing_flag)

6
magic/src/sharpen.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -166,7 +166,7 @@ SDL_Surface *sharpen_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *sharpen_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *sharpen_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(sharpen_names[which]))); return (strdup(gettext(sharpen_names[which])));
} }
// Return our group (all the same): // Return our group (all the same):
@ -184,7 +184,7 @@ int sharpen_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *sharpen_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *sharpen_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(sharpen_descs[which][mode - 1]))); return (strdup(gettext(sharpen_descs[which][mode - 1])));
} }
//Calculates the grey scale value for a rgb pixel //Calculates the grey scale value for a rgb pixel

6
magic/src/shift.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -110,7 +110,7 @@ SDL_Surface *shift_get_icon(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUT
// Return our names, localized: // Return our names, localized:
char *shift_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *shift_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Shift"))); return (strdup(gettext("Shift")));
} }
// Return our group // Return our group
@ -128,7 +128,7 @@ int shift_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *shift_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *shift_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to shift your picture around on the canvas."))); return (strdup(gettext("Click and drag to shift your picture around on the canvas.")));
} }

10
magic/src/smudge.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
FIXME: "Wet Paint" doesn't smudge enough -bjk 2023.04.23 FIXME: "Wet Paint" doesn't smudge enough -bjk 2023.04.23
*/ */
@ -108,9 +108,9 @@ SDL_Surface *smudge_get_icon(magic_api * api, int which)
char *smudge_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *smudge_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == 0) if (which == 0)
return (strdup(gettext_noop("Smudge"))); return (strdup(gettext("Smudge")));
else /* if (which == 1) */ else /* if (which == 1) */
return (strdup(gettext_noop("Wet Paint"))); return (strdup(gettext("Wet Paint")));
} }
// Return our groups // Return our groups
@ -135,9 +135,9 @@ int smudge_get_order(int which)
char *smudge_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *smudge_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {
if (which == 0) if (which == 0)
return (strdup(gettext_noop("Click and drag the mouse around to smudge the picture."))); return (strdup(gettext("Click and drag the mouse around to smudge the picture.")));
else /* if (which == 1) */ else /* if (which == 1) */
return (strdup(gettext_noop("Click and drag the mouse around to draw with wet, smudgy paint."))); return (strdup(gettext("Click and drag the mouse around to draw with wet, smudgy paint.")));
} }
// Do the effect: // Do the effect:

6
magic/src/snow.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
TODO: TODO:
* Support sizes (for snowflakes, we'll need a new set of bitmap PNGs!) -bjk 2023.04.22 * Support sizes (for snowflakes, we'll need a new set of bitmap PNGs!) -bjk 2023.04.22
@ -164,7 +164,7 @@ SDL_Surface *snow_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *snow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *snow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(snow_names[which]))); return (strdup(gettext(snow_names[which])));
} }
int snow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int snow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -180,7 +180,7 @@ int snow_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *snow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which) char *snow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(snow_descs[which]))); return (strdup(gettext(snow_descs[which])));
} }
// Do the effect: // Do the effect:

6
magic/src/spraypaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: October 2, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -101,7 +101,7 @@ SDL_Surface *spraypaint_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *spraypaint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *spraypaint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Spray Paint"))); return (strdup(gettext("Spray Paint")));
} }
int spraypaint_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int spraypaint_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -116,7 +116,7 @@ int spraypaint_get_order(int which ATTRIBUTE_UNUSED)
char *spraypaint_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *spraypaint_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to add a random spray of color onto your image."))); return (strdup(gettext("Click and drag to add a random spray of color onto your image.")));
} }
static void do_spraypaint(magic_api * api, SDL_Surface * canvas, int x, int y, int max_intensity) static void do_spraypaint(magic_api * api, SDL_Surface * canvas, int x, int y, int max_intensity)

6
magic/src/stretch.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -116,7 +116,7 @@ SDL_Surface *stretch_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *stretch_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *stretch_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Stretch")); return strdup(gettext("Stretch"));
} }
int stretch_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int stretch_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -131,7 +131,7 @@ int stretch_get_order(int which ATTRIBUTE_UNUSED)
char *stretch_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *stretch_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click and drag to stretch part of your picture vertically or horizontally.")); return strdup(gettext("Click and drag to stretch part of your picture vertically or horizontally."));
} }
int stretch_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int stretch_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

14
magic/src/string.c
View file

@ -1,7 +1,7 @@
/* /*
Strings -- draws string art. Strings -- draws string art.
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
#include "SDL_image.h" #include "SDL_image.h"
@ -134,13 +134,13 @@ char *string_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUS
switch (which) switch (which)
{ {
case STRING_TOOL_FULL_BY_OFFSET: case STRING_TOOL_FULL_BY_OFFSET:
return strdup(gettext_noop("String edges")); return strdup(gettext("String edges"));
break; break;
case STRING_TOOL_TRIANGLE: case STRING_TOOL_TRIANGLE:
return strdup(gettext_noop("String corner")); return strdup(gettext("String corner"));
break; break;
default: default:
return strdup(gettext_noop("String 'V'")); return strdup(gettext("String 'V'"));
} }
} }
@ -171,14 +171,14 @@ char *string_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mo
{ {
case STRING_TOOL_FULL_BY_OFFSET: case STRING_TOOL_FULL_BY_OFFSET:
return return
strdup(gettext_noop strdup(gettext
("Click and drag to draw string art. Drag top-bottom to draw less or more lines, left or right to make a bigger hole.")); ("Click and drag to draw string art. Drag top-bottom to draw less or more lines, left or right to make a bigger hole."));
break; break;
case STRING_TOOL_TRIANGLE: case STRING_TOOL_TRIANGLE:
return strdup(gettext_noop("Click and drag to draw arrows made of string art.")); return strdup(gettext("Click and drag to draw arrows made of string art."));
break; break;
default: default:
return strdup(gettext_noop("Draw string art arrows with free angles.")); return strdup(gettext("Draw string art arrows with free angles."));
} }
} }

6
magic/src/tint.c
View file

@ -29,7 +29,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -153,7 +153,7 @@ SDL_Surface *tint_get_icon(magic_api * api, int which)
// Return our names, localized: // Return our names, localized:
char *tint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *tint_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(tint_names[which]))); return (strdup(gettext(tint_names[which])));
} }
// Return our group (both the same): // Return our group (both the same):
@ -171,7 +171,7 @@ int tint_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *tint_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *tint_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {
return (strdup(gettext_noop(tint_descs[which][mode - 1]))); return (strdup(gettext(tint_descs[which][mode - 1])));
} }
//Calculates the grey scale value for a rgb pixel //Calculates the grey scale value for a rgb pixel

6
magic/src/toothpaste.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -182,7 +182,7 @@ SDL_Surface *toothpaste_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *toothpaste_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *toothpaste_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
return (strdup(gettext_noop(toothpaste_names[which]))); return (strdup(gettext(toothpaste_names[which])));
} }
// Return our groups: // Return our groups:
@ -200,7 +200,7 @@ int toothpaste_get_order(int which)
// Return our descriptions, localized: // Return our descriptions, localized:
char *toothpaste_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *toothpaste_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop(toothpaste_descs[which]))); return (strdup(gettext(toothpaste_descs[which])));
} }
// Do the effect: // Do the effect:

6
magic/src/tornado.c
View file

@ -27,7 +27,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -150,7 +150,7 @@ SDL_Surface *tornado_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
// Return our names, localized: // Return our names, localized:
char *tornado_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *tornado_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Tornado"))); return (strdup(gettext("Tornado")));
} }
// Return our groups: // Return our groups:
@ -168,7 +168,7 @@ int tornado_get_order(int which ATTRIBUTE_UNUSED)
// Return our descriptions, localized: // Return our descriptions, localized:
char *tornado_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *tornado_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Click and drag to draw a tornado funnel on your picture."))); return (strdup(gettext("Click and drag to draw a tornado funnel on your picture.")));
} }
// Affect the canvas on drag: // Affect the canvas on drag:

10
magic/src/tv.c
View file

@ -26,7 +26,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -120,9 +120,9 @@ SDL_Surface *tv_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *tv_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *tv_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (which == TV_TOOL_TV_CLASSIC) if (which == TV_TOOL_TV_CLASSIC)
return strdup(gettext_noop("TV")); return strdup(gettext("TV"));
else else
return strdup(gettext_noop("TV (Bright)")); return strdup(gettext("TV (Bright)"));
} }
int tv_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int tv_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -138,9 +138,9 @@ int tv_get_order(int which)
char *tv_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *tv_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return strdup(gettext_noop("Click and drag to make parts of your picture look like they are on television.")); return strdup(gettext("Click and drag to make parts of your picture look like they are on television."));
else else
return strdup(gettext_noop("Click to make your picture look like it's on television.")); return strdup(gettext("Click to make your picture look like it's on television."));
} }
int tv_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int tv_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)

10
magic/src/waves.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -122,9 +122,9 @@ int waves_get_order(int which)
char *waves_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) char *waves_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {
if (!which) if (!which)
return (strdup(gettext_noop("Waves"))); return (strdup(gettext("Waves")));
else else
return strdup(gettext_noop("Wavelets")); return strdup(gettext("Wavelets"));
} }
// Return our descriptions, localized: // Return our descriptions, localized:
@ -132,10 +132,10 @@ char *waves_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mod
{ {
if (!which) if (!which)
return (strdup return (strdup
(gettext_noop (gettext
("Click to make the picture horizontally wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves."))); ("Click to make the picture horizontally wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")));
return return
strdup(gettext_noop strdup(gettext
("Click to make the picture vertically wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves.")); ("Click to make the picture vertically wavy. Click toward the top for shorter waves, the bottom for taller waves, the left for small waves, and the right for long waves."));
} }

8
magic/src/xor.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: January 16, 2024 Last updated: October 7, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -97,7 +97,7 @@ SDL_Surface *xor_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
char *xor_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *xor_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (strdup(gettext_noop("Xor Colors"))); return (strdup(gettext("Xor Colors")));
} }
int xor_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int xor_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
@ -113,9 +113,9 @@ int xor_get_order(int which ATTRIBUTE_UNUSED)
char *xor_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *xor_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
return (strdup(gettext_noop("Click and drag to draw an \"Exclusive Or\" (XOR) effect"))); return (strdup(gettext("Click and drag to draw an \"Exclusive Or\" (XOR) effect")));
else else
return (strdup(gettext_noop("Click to apply an \"Exclusive Or\" (XOR) effect on the whole picture"))); return (strdup(gettext("Click to apply an \"Exclusive Or\" (XOR) effect on the whole picture")));
} }
static void do_xor(void *ptr, int which ATTRIBUTE_UNUSED, static void do_xor(void *ptr, int which ATTRIBUTE_UNUSED,