callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n cleanups

Browse Source 
--Sven
This commit is contained in:
Sven Neumann
2000-02-01 00:16:50 +00:00
parent c9482821ab
commit fd2fb679c2
9 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,9 +1,15 @@
Tue Feb 1 22:42:26 CET 2000 Tue Feb 1 23:09:42 CET 2000 Sven Neumann <sven@gimp.org>
* app/regex.c * app/regex.c
* plug-ins/script-fu/regex.c: remove occurences of gettext, since * plug-ins/script-fu/regex.c: remove occurences of gettext, since
we don't translate error messages we don't translate error messages
* app/gimpbrushpipe.c: we use the term "image hose", don't we?
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/plug_in.pdb: don't mark error messages for
translation
* app/[lotsa files]: only include libgimp/gimpintl.h if needed; but * app/[lotsa files]: only include libgimp/gimpintl.h if needed; but
if it gets included, include config.h too if it gets included, include config.h too

6
app/core/gimpbrushpipe-load.c
View File

@ -297,7 +297,7 @@ gimp_brush_pipe_load (char *filename)
num_of_brushes = strtol(buf, &paramstring, 10); num_of_brushes = strtol(buf, &paramstring, 10);
if (num_of_brushes < 1) if (num_of_brushes < 1)
{ {
g_message (_("pixmap brush pipe should have at least one brush")); g_message (_("Image hoses should have at least one brush."));
fclose (fp); fclose (fp);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
return NULL; return NULL;
@ -393,7 +393,7 @@ gimp_brush_pipe_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load one of the pixmap brushes in the pipe")); g_message (_("Failed to load one of the brushes in the image hose."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
@ -453,7 +453,7 @@ gimp_brush_pixmap_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load pixmap brush")); g_message (_("Failed to load pixmap brush."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);

6
app/core/gimpbrushpipe.c
View File

@ -297,7 +297,7 @@ gimp_brush_pipe_load (char *filename)
num_of_brushes = strtol(buf, &paramstring, 10); num_of_brushes = strtol(buf, &paramstring, 10);
if (num_of_brushes < 1) if (num_of_brushes < 1)
{ {
g_message (_("pixmap brush pipe should have at least one brush")); g_message (_("Image hoses should have at least one brush."));
fclose (fp); fclose (fp);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
return NULL; return NULL;
@ -393,7 +393,7 @@ gimp_brush_pipe_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load one of the pixmap brushes in the pipe")); g_message (_("Failed to load one of the brushes in the image hose."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
@ -453,7 +453,7 @@ gimp_brush_pixmap_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load pixmap brush")); g_message (_("Failed to load pixmap brush."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);

12
app/fileops_cmds.c
View File

@ -33,8 +33,6 @@
#include "gimprc.h" #include "gimprc.h"
#include "plug_in.h" #include "plug_in.h"
#include "libgimp/gimpintl.h"
static ProcRecord file_load_proc; static ProcRecord file_load_proc;
static ProcRecord file_save_proc; static ProcRecord file_save_proc;
static ProcRecord file_load_thumbnail_proc; static ProcRecord file_load_thumbnail_proc;
@ -460,7 +458,7 @@ register_magic_load_handler_invoker (Argument *args)
(proc->args[2].arg_type != PDB_STRING) || (proc->args[2].arg_type != PDB_STRING) ||
(proc->values[0].arg_type != PDB_IMAGE))) (proc->values[0].arg_type != PDB_IMAGE)))
{ {
g_message (_("load handler \"%s\" does not take the standard load handler args"), g_message ("load handler \"%s\" does not take the standard load handler args",
name); name);
goto done; goto done;
} }
@ -469,8 +467,8 @@ register_magic_load_handler_invoker (Argument *args)
if (!file_proc) if (!file_proc)
{ {
g_message (_("attempt to register non-existant load handler \"%s\""), g_message ("attempt to register non-existant load handler \"%s\""),
name); name;
goto done; goto done;
} }
@ -605,7 +603,7 @@ register_save_handler_invoker (Argument *args)
(proc->args[3].arg_type != PDB_STRING) || (proc->args[3].arg_type != PDB_STRING) ||
(proc->args[4].arg_type != PDB_STRING))) (proc->args[4].arg_type != PDB_STRING)))
{ {
g_message (_("save handler \"%s\" does not take the standard save handler args"), g_message ("save handler \"%s\" does not take the standard save handler args",
name); name);
goto done; goto done;
} }
@ -614,7 +612,7 @@ register_save_handler_invoker (Argument *args)
if (!file_proc) if (!file_proc)
{ {
g_message (_("attempt to register non-existant save handler \"%s\""), g_message ("attempt to register non-existant save handler \"%s\"",
name); name);
goto done; goto done;
} }

6
app/gimpbrushpipe.c
View File

@ -297,7 +297,7 @@ gimp_brush_pipe_load (char *filename)
num_of_brushes = strtol(buf, &paramstring, 10); num_of_brushes = strtol(buf, &paramstring, 10);
if (num_of_brushes < 1) if (num_of_brushes < 1)
{ {
g_message (_("pixmap brush pipe should have at least one brush")); g_message (_("Image hoses should have at least one brush."));
fclose (fp); fclose (fp);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
return NULL; return NULL;
@ -393,7 +393,7 @@ gimp_brush_pipe_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load one of the pixmap brushes in the pipe")); g_message (_("Failed to load one of the brushes in the image hose."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);
@ -453,7 +453,7 @@ gimp_brush_pixmap_load (char *filename)
fp, filename) fp, filename)
|| !pattern_load (pattern, fp, filename)) || !pattern_load (pattern, fp, filename))
{ {
g_message (_("failed to load pixmap brush")); g_message (_("Failed to load pixmap brush."));
fclose (fp); fclose (fp);
pattern_free (pattern); pattern_free (pattern);
gimp_object_destroy (pipe); gimp_object_destroy (pipe);

5
app/plug_in_cmds.c
View File

@ -27,9 +27,6 @@
#include "plug_in.h" #include "plug_in.h"
#include "regex.h" #include "regex.h"
#include "config.h"
#include "libgimp/gimpintl.h"
static ProcRecord progress_init_proc; static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc; static ProcRecord progress_update_proc;
static ProcRecord temp_PDB_name_proc; static ProcRecord temp_PDB_name_proc;
@ -246,7 +243,7 @@ plugins_query_invoker (Argument *args)
while (tmp) while (tmp)
{ {
if (i > num_plugins) if (i > num_plugins)
g_error (_("Internal error counting plugins")); g_error ("Internal error counting plugins");
proc_def = tmp->data; proc_def = tmp->data;
tmp = tmp->next; tmp = tmp->next;

2
po/POTFILES.in
View File

@ -38,7 +38,6 @@ app/eraser.c
app/errorconsole.c app/errorconsole.c
app/file_new_dialog.c app/file_new_dialog.c
app/fileops.c app/fileops.c
app/fileops_cmds.c
app/flip_tool.c app/flip_tool.c
app/floating_sel.c app/floating_sel.c
app/fuzzy_select.c app/fuzzy_select.c
@ -93,7 +92,6 @@ app/pattern_select.c
app/patterns.c app/patterns.c
app/perspective_tool.c app/perspective_tool.c
app/plug_in.c app/plug_in.c
app/plug_in_cmds.c
app/posterize.c app/posterize.c
app/preferences_dialog.c app/preferences_dialog.c
app/procedural_db.c app/procedural_db.c

13
tools/pdbgen/pdb/fileops.pdb
View File

@ -316,7 +316,7 @@ HELP
(proc->args[2].arg_type != PDB_STRING) || (proc->args[2].arg_type != PDB_STRING) ||
(proc->values[0].arg_type != PDB_IMAGE))) (proc->values[0].arg_type != PDB_IMAGE)))
{ {
g_message (_("load handler \"%s\" does not take the standard load handler args"), g_message ("load handler \"%s\" does not take the standard load handler args",
name); name);
goto done; goto done;
} }
@ -325,8 +325,8 @@ HELP
if (!file_proc) if (!file_proc)
{ {
g_message (_("attempt to register non-existant load handler \"%s\""), g_message ("attempt to register non-existant load handler \"%s\""),
name); name;
goto done; goto done;
} }
@ -386,7 +386,7 @@ HELP
(proc->args[3].arg_type != PDB_STRING) || (proc->args[3].arg_type != PDB_STRING) ||
(proc->args[4].arg_type != PDB_STRING))) (proc->args[4].arg_type != PDB_STRING)))
{ {
g_message (_("save handler \"%s\" does not take the standard save handler args"), g_message ("save handler \"%s\" does not take the standard save handler args",
name); name);
goto done; goto done;
} }
@ -395,7 +395,7 @@ HELP
if (!file_proc) if (!file_proc)
{ {
g_message (_("attempt to register non-existant save handler \"%s\""), g_message ("attempt to register non-existant save handler \"%s\"",
name); name);
goto done; goto done;
} }
@ -410,8 +410,7 @@ CODE
); );
} }
@headers = qw("fileops.h" "plug_in.h" "config.h" "libgimp/gimpintl.h" @headers = qw("fileops.h" "plug_in.h" "config.h" <unistd.h>);
<unistd.h>);
@procs = qw(file_load file_save file_load_thumbnail file_save_thumbnail @procs = qw(file_load file_save file_load_thumbnail file_save_thumbnail
temp_name register_magic_load_handler register_load_handler temp_name register_magic_load_handler register_load_handler

3
tools/pdbgen/pdb/plug_in.pdb
View File

@ -156,7 +156,6 @@ sub plugins_query {
delete $outargs[0]->{array}->{no_declare}; delete $outargs[0]->{array}->{no_declare};
%invoke = ( %invoke = (
headers => [ qw("libgimp/gimpintl.h") ],
vars => [ 'PlugInProcDef *proc_def', 'GSList *tmp = NULL', vars => [ 'PlugInProcDef *proc_def', 'GSList *tmp = NULL',
'gint i = 0', 'regex_t sregex' ], 'gint i = 0', 'regex_t sregex' ],
code => <<'CODE' code => <<'CODE'
@ -203,7 +202,7 @@ sub plugins_query {
while (tmp) while (tmp)
{ {
if (i > num_plugins) if (i > num_plugins)
g_error (_("Internal error counting plugins")); g_error ("Internal error counting plugins");
proc_def = tmp->data; proc_def = tmp->data;
tmp = tmp->next; tmp = tmp->next;