plug-ins/common/wmf.c small i18n fixes.

* plug-ins/common/wmf.c
* app/text_tool.c: small i18n fixes.

-- yasuhiro
This commit is contained in:
SHIRASAKI Yasuhiro 2000-01-15 18:06:15 +00:00
parent 72ae425bfc
commit 14c3c191e2
5 changed files with 34 additions and 3 deletions

View File

@ -8,6 +8,8 @@
* plug-ins/pagecurl/Makefile.am
* po-plug-ins/POTFILES.in: added gettext support.
* app/text_tool.c: i18n fix.
2000-01-15 Garry R. Osgood <gosgood@idt.net>
* app/layers_dialog.c

View File

@ -20,6 +20,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
@ -567,6 +568,8 @@ text_render (GimpImage *gimage,
gint width, height;
gint x, y, k;
void * pr;
XFontStruct *xfs;
char *fname;
/* determine the layer type */
if (drawable)
@ -588,6 +591,13 @@ text_render (GimpImage *gimage,
gdk_error_warnings = 0;
gdk_error_code = 0;
font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
gdk_font_unref(font);
fname = g_strdup_printf("%s,*", fontname);
font = gdk_fontset_load (fname);
g_free(fname);
}
gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1))
{

View File

@ -20,6 +20,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
@ -567,6 +568,8 @@ text_render (GimpImage *gimage,
gint width, height;
gint x, y, k;
void * pr;
XFontStruct *xfs;
char *fname;
/* determine the layer type */
if (drawable)
@ -588,6 +591,13 @@ text_render (GimpImage *gimage,
gdk_error_warnings = 0;
gdk_error_code = 0;
font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
gdk_font_unref(font);
fname = g_strdup_printf("%s,*", fontname);
font = gdk_fontset_load (fname);
g_free(fname);
}
gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1))
{

View File

@ -20,6 +20,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
@ -567,6 +568,8 @@ text_render (GimpImage *gimage,
gint width, height;
gint x, y, k;
void * pr;
XFontStruct *xfs;
char *fname;
/* determine the layer type */
if (drawable)
@ -588,6 +591,13 @@ text_render (GimpImage *gimage,
gdk_error_warnings = 0;
gdk_error_code = 0;
font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
gdk_font_unref(font);
fname = g_strdup_printf("%s,*", fontname);
font = gdk_fontset_load (fname);
g_free(fname);
}
gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1))
{

View File

@ -1321,8 +1321,7 @@ load_image (char *filename)
return -1;
}
name_buf = g_malloc (strlen (filename) + 100);
sprintf (name_buf, "Interpreting %s:", filename);
name_buf = g_strdup_printf ( _("Interpreting %s:"), filename);
gimp_progress_init (name_buf);
g_free (name_buf);
@ -2335,7 +2334,7 @@ load_image (char *filename)
if (canvas->height >= 100)
{
g_strdup_printf (name_buf, _("Transferring image"));
name_buf = g_strdup_printf (_("Transferring image"));
gimp_progress_init (name_buf);
g_free (name_buf);
}