[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac cygnal...
|
From: |
John Gilmore |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac cygnal... |
|
Date: |
Fri, 06 Apr 2007 07:58:16 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: John Gilmore <jgilmore> 07/04/06 07:58:16
Modified files:
. : ChangeLog Makefile.am configure.ac
cygnal : Makefile.am cygnal.cpp
gui : Makefile.am gnash.cpp
server : gnash.h
utilities : Makefile.am dumpshm.cpp processor.cpp
parser.cpp
Log message:
Internationalize gnash. Phase 1: use gettextize, update config files.
* po: New directory for translated messages (Portable Object files)
* server/gnash.h: Include "gettext.h" for NLS.
* Makefile.am (EXTRA_DIST): Add config.rpath.
(STD_DIRS): Add po.
* configure.ac (AC_OUTPUT): Add po/Makefile.in.
(AM_GNU_GETTEXT): Add, to configure gettext support.
* cygnal/Makefile.am (localedir, INCLUDES),
gui/Makefile.am (localedir, INCLUDES),
utilities/Makefile.am (localedir, INCLUDES): Define LOCALEDIR.
* cygnal/cygnal.cpp (main), gui/gnash.cpp (main),
utilities/{dumpshm,parser,processor}.cpp (main):
Set locale and initialize gettext upon startup.
* utilities/{dumpshm,parser,processor}.cpp: Flag strings with _
for translation, for testing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2794&r2=1.2795
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.286&r2=1.287
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.35&r2=1.36
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2794
retrieving revision 1.2795
diff -u -b -r1.2794 -r1.2795
--- ChangeLog 6 Apr 2007 02:43:49 -0000 1.2794
+++ ChangeLog 6 Apr 2007 07:58:15 -0000 1.2795
@@ -1,3 +1,39 @@
+2007-04-05 John Gilmore <address@hidden>
+
+ Internationalize gnash. Phase 1: use gettextize, update config files.
+
+ * macros/{codeset.m4, gettext.m4, glibc2.m4, glibc21.m4,
+ iconv.m4, intdiv0.m4, intmax.m4, inttypes.m4, inttypes_h.m4,
+ inttypes-pri.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4,
+ lib-link.m4, lib-prefix.m4, longdouble.m4, longlong.m4, nls.m4,
+ po.m4, printf-posix.m4, progtest.m4, signed.m4, size_max.m4,
+ stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4,
+ xsize.m4}: New files, from gettext-0.14.6.
+ * po: New directory for translated messages (Portable Object files)
+ * po/{Makefile.in.in, boldquot.sed, address@hidden,
+ address@hidden, insert-header.sin, quot.sed,
+ remove-potcdate.sin, Rules-quot}: New files, from gettext-0.14.6.
+ * ABOUT-NLS, config.rpath: New files, from gettext-0.14.6.
+ * libbase/gettext.h: New file, from gettext-0.14.6.
+ * server/gnash.h: Include "gettext.h" for NLS.
+ * po/Makevars: New file: settings for gnash's message translation.
+ * po/POTFILES.in: New file: source files with translatable strings.
+ * po/LINGUAS: New file: languages we have translations for.
+ * Makefile.am (EXTRA_DIST): Add config.rpath.
+ (STD_DIRS): Add po.
+ * configure.ac (AC_OUTPUT): Add po/Makefile.in.
+ (AM_GNU_GETTEXT): Add, to configure gettext support.
+ * cygnal/Makefile.am (localedir, INCLUDES),
+ gui/Makefile.am (localedir, INCLUDES),
+ utilities/Makefile.am (localedir, INCLUDES): Define LOCALEDIR.
+ * cygnal/cygnal.cpp (main), gui/gnash.cpp (main),
+ utilities/{dumpshm,parser,processor}.cpp (main):
+ Set locale and initialize gettext upon startup.
+ * utilities/{dumpshm,parser,processor}.cpp: Flag strings with _
+ for translation, for testing.
+ * po/gnash.pot: Message string catalog for testing.
+ * po/es.po: Spanish-language message string catalog for testing.
+
2007-04-05 Zou Lunkai <address@hidden>
* server/asobj/Date.cpp
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- Makefile.am 2 Apr 2007 16:46:31 -0000 1.66
+++ Makefile.am 6 Apr 2007 07:58:15 -0000 1.67
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.66 2007/04/02 16:46:31 tgc Exp $
+# $Id: Makefile.am,v 1.67 2007/04/06 07:58:15 jgilmore Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -32,6 +32,7 @@
utilities \
gui \
testsuite \
+ po \
$(NULL)
if PLUGIN
@@ -62,7 +63,7 @@
DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
-EXTRA_DIST= $(man_MANS) macros/incllist macros/libslist
+EXTRA_DIST= config.rpath $(man_MANS) macros/incllist macros/libslist
#EXTRA_DIST = macros
# if HTTP
# SUBDIRS += net $(STD_DIRS)
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- configure.ac 3 Apr 2007 16:13:07 -0000 1.286
+++ configure.ac 6 Apr 2007 07:58:15 -0000 1.287
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.286 2007/04/03 16:13:07 bjacques Exp $
+dnl $Id: configure.ac,v 1.287 2007/04/06 07:58:15 jgilmore Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -54,6 +54,7 @@
AC_DISABLE_STATIC dnl Disable building static libs.
+AM_GNU_GETTEXT([external])
save_CFLAGS="$CFLAGS";
CFLAGS="$CFLAGS -Werror -Wformat";
@@ -879,6 +880,7 @@
AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
AC_OUTPUT(Makefile
+po/Makefile.in
libbase/Makefile
libgeometry/Makefile
server/Makefile
Index: cygnal/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cygnal/Makefile.am 6 Mar 2007 18:06:13 -0000 1.4
+++ cygnal/Makefile.am 6 Apr 2007 07:58:15 -0000 1.5
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.4 2007/03/06 18:06:13 rsavoye Exp $
+# $Id: Makefile.am,v 1.5 2007/04/06 07:58:15 jgilmore Exp $
## Process this file with automake to generate Makefile.in
@@ -36,11 +36,14 @@
$(BOOST_LIBS) \
$(PTHREAD_LIBS)
+localedir = $(datadir)/locale
+
INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libamf \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
+ -DLOCALEDIR=\"$(localedir)\" \
$(LIBXML_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(CURL_CFLAGS) \
Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cygnal/cygnal.cpp 5 Feb 2007 20:13:05 -0000 1.6
+++ cygnal/cygnal.cpp 6 Apr 2007 07:58:15 -0000 1.7
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: cygnal.cpp,v 1.6 2007/02/05 20:13:05 nihilus Exp $ */
+/* $Id: cygnal.cpp,v 1.7 2007/04/06 07:58:15 jgilmore Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -52,6 +52,10 @@
#include <sys/stat.h>
#include <fcntl.h>
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
@@ -106,6 +110,11 @@
int
main(int argc, char *argv[])
{
+ // Initialize national language support
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
// scan for the two main long GNU options
int c;
for (c=0; c<argc; c++) {
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- gui/Makefile.am 2 Apr 2007 16:46:32 -0000 1.62
+++ gui/Makefile.am 6 Apr 2007 07:58:15 -0000 1.63
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,9 +17,10 @@
#
-# $Id: Makefile.am,v 1.62 2007/04/02 16:46:32 tgc Exp $
+# $Id: Makefile.am,v 1.63 2007/04/06 07:58:15 jgilmore Exp $
AUTOMAKE_OPTIONS =
+localedir = $(datadir)/locale
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
@@ -30,6 +31,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libgeometry \
+ -DLOCALEDIR=\"$(localedir)\" \
$(LIBXML_CFLAGS) \
$(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gui/gnash.cpp 2 Apr 2007 16:46:32 -0000 1.67
+++ gui/gnash.cpp 6 Apr 2007 07:58:15 -0000 1.68
@@ -43,6 +43,10 @@
#include <string>
#include <iostream>
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
//using namespace gnash; // for dbglogfile
using namespace std;
@@ -328,6 +332,11 @@
{
gnash::Player player;
+ // Enable native language support, i.e. internationalization
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
rcfile.loadFiles();
parseCommandLine(argc, argv, player);
Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnash.h 2 Apr 2007 15:45:22 -0000 1.89
+++ server/gnash.h 6 Apr 2007 07:58:16 -0000 1.90
@@ -17,7 +17,7 @@
//
//
-/* $Id: gnash.h,v 1.89 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: gnash.h,v 1.90 2007/04/06 07:58:16 jgilmore Exp $ */
/// \mainpage
///
@@ -39,6 +39,11 @@
#include "as_value.h" // FIXME: for as_c_function_ptr typedef
(register_component)
+// Support compilation with (or without) native language support
+#include "gettext.h" // for internationalization (GNU gettext)
+#define _(String) gettext (String)
+#define N_(String) gettext_noop (String)
+
// FIXME: The local usage of these constants should probably be renamed in this
// file because they conflict with definitions in the system header files.
Luckily
// they are used in files we don't need, so we should be able to safely
redefine
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- utilities/Makefile.am 31 Mar 2007 21:16:49 -0000 1.50
+++ utilities/Makefile.am 6 Apr 2007 07:58:16 -0000 1.51
@@ -43,6 +43,8 @@
$(PTHREAD_LIBS) \
$(NULL)
+localedir = $(datadir)/locale
+
#AM_CPPFLAGS = # -Wall
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
@@ -51,6 +53,7 @@
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
-I$(top_srcdir)/server/vm \
+ -DLOCALEDIR=\"$(localedir)\" \
$(BOOST_CFLAGS) \
$(LIBXML_CFLAGS) \
$(MYSQL_CFLAGS) \
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- utilities/dumpshm.cpp 19 Nov 2006 17:39:01 -0000 1.9
+++ utilities/dumpshm.cpp 6 Apr 2007 07:58:16 -0000 1.10
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
//
-/* $Id: dumpshm.cpp,v 1.9 2006/11/19 17:39:01 nihilus Exp $ */
+/* $Id: dumpshm.cpp,v 1.10 2007/04/06 07:58:16 jgilmore Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -63,6 +63,7 @@
#include "log.h"
#include "rc.h"
#include "shm.h"
+#include "gnash.h"
using namespace std;
using namespace gnash;
@@ -96,6 +97,11 @@
// strstream *shmnames;
// #endif
+ // Enable native language support, i.e. internationalization
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
/* This initializes the DBG_MSG macros */
while ((c = getopt (argc, argv, "hdnl:if")) != -1) {
switch (c) {
@@ -197,8 +203,8 @@
}
}
} else {
- cout << "Sorry, we can only list the files on systems with";
- cout << "with disk based shared memory" << endl;
+ cout << _("Sorry, we can only list the files on systems with"
+ " disk based shared memory") << endl;
}
exit(0);
}
@@ -206,14 +212,14 @@
//Destroy shared memory segments
if (nuke) {
if (filespec.size() == 0) {
- cout << "No name specified, nuking everything..." << endl;
+ cout << _("No name specified, nuking everything...") << endl;
for (i=0; entry>0; i++) {
entry = readdir(library_dir);
if (entry != NULL) {
tmpname = "/"; // prefix a / so shm_unlink can
// use the correct path
tmpname += entry->d_name;
- cout << "Removing segment: " << tmpname << endl;
+ cout << _("Removing segment: ") << tmpname << endl;
#ifdef HAVE_SHM_UNLINK
shm_unlink(tmpname.c_str());
#endif
@@ -221,7 +227,7 @@
}
exit(0);
} else {
- cout << "Nuking the shared memory segment " << filespec << endl;
+ cout << _("Nuking the shared memory segment ") << filespec << endl;
#ifdef HAVE_SHM_UNLINK
shm_unlink(filespec.c_str());
#endif
@@ -247,7 +253,7 @@
if (!in.eof()) {
if (!in.read(reinterpret_cast<char*>(&shmptr), sizeof(Shm))) {
- cerr << "ERROR: couldn't read!" << endl;
+ cerr << _("ERROR: couldn't read!") << endl;
exit(1);
}
dump_ctrl(&shmptr);
@@ -278,15 +284,15 @@
static void
usage (void)
{
- cerr << "This program dumps the internal data of a shared memory segment"
+ cerr << _("This program dumps the internal data of a shared memory
segment")
<< endl;
- cerr << "Usage: dumpmem [hdsanlif] filename" << endl;
- cerr << "-h\tHelp" << endl;
- cerr << "-d\tDump data" << endl;
- cerr << "-n [optional name]\tNuke everything" << endl;
- cerr << "-l\tLength of segment" << endl;
- cerr << "-i\tList segments" << endl;
- cerr << "-f\tForce to use builtin names for nuke" << endl;
+ cerr << _("Usage: dumpmem [hdsanlif] filename") << endl;
+ cerr << _("-h\tHelp") << endl;
+ cerr << _("-d\tDump data") << endl;
+ cerr << _("-n [optional name]\tNuke everything") << endl;
+ cerr << _("-l\tLength of segment") << endl;
+ cerr << _("-i\tList segments") << endl;
+ cerr << _("-f\tForce to use builtin names for nuke") << endl;
exit (-1);
}
@@ -298,11 +304,11 @@
{
Shm *ptr = static_cast<Shm *>(inmem);
- cerr << "\tBase address of this segment: "
+ cerr << _("\tBase address of this segment: ")
<< static_cast<void *>(ptr->getAddr()) << endl;
- cerr << "\tFilespec: " << ptr->getName() << endl;
- cerr << "\t# Bytes allocated: " << ptr->getAllocated() << endl;
- cerr << "\tTotal # of bytes: " << ptr->getSize() << endl;
+ cerr << _("\tFilespec: ") << ptr->getName() << endl;
+ cerr << _("\t# Bytes allocated: ") << ptr->getAllocated() << endl;
+ cerr << _("\tTotal # of bytes: ") << ptr->getSize() << endl;
}
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- utilities/processor.cpp 3 Apr 2007 16:13:07 -0000 1.54
+++ utilities/processor.cpp 6 Apr 2007 07:58:16 -0000 1.55
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: processor.cpp,v 1.54 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: processor.cpp,v 1.55 2007/04/06 07:58:16 jgilmore Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -133,6 +133,12 @@
main(int argc, char *argv[])
{
assert(tu_types_validate());
+
+ // Enable native language support, i.e. internationalization
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
int c;
// scan for the two main standard GNU options
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- utilities/parser.cpp 6 Feb 2007 23:06:18 -0000 1.35
+++ utilities/parser.cpp 6 Apr 2007 07:58:16 -0000 1.36
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: parser.cpp,v 1.35 2007/02/06 23:06:18 rsavoye Exp $ */
+/* $Id: parser.cpp,v 1.36 2007/04/06 07:58:16 jgilmore Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -135,7 +135,7 @@
static void write()
{
ident++;
- log_msg("has_scale = %d, has_rotate = %d\n", has_scale, has_rotate);
+ log_msg(_("has_scale = %d, has_rotate = %d\n"), has_scale,
has_rotate);
log_msg("| %4.4f %4.4f %4.4f |\n", m_[0][0], m_[0][1],
TWIPS_TO_PIXELS(m_[0][2]));
log_msg("| %4.4f %4.4f %4.4f |\n", m_[1][0], m_[1][1],
TWIPS_TO_PIXELS(m_[1][2]));
ident--;
@@ -160,8 +160,8 @@
static void write()
{
ident++;
- log_msg("x_min: %i, x_max: %i, width: %i twips, %4.0f
pixels\n", x_min, x_max, x_max - x_min, TWIPS_TO_PIXELS(x_max - x_min));
- log_msg("y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n",
y_min, y_max, y_max - y_min, TWIPS_TO_PIXELS(y_max - y_min));
+ log_msg(_("x_min: %i, x_max: %i, width: %i twips, %4.0f
pixels\n"), x_min, x_max, x_max - x_min, TWIPS_TO_PIXELS(x_max - x_min));
+ log_msg(_("y_min: %i, y_max: %i, height: %i twips, %4.0f
pixels\n"), y_min, y_max, y_max - y_min, TWIPS_TO_PIXELS(y_max - y_min));
ident--;
}
};
@@ -182,7 +182,7 @@
static void write()
{
ident++;
- log_msg("rgb: %d %d %d \n", m_r, m_g, m_b);
+ log_msg(_("rgb: %d %d %d \n"), m_r, m_g, m_b);
ident--;
}
};
@@ -203,7 +203,7 @@
static void write()
{
ident++;
- log_msg("rgba: %d %d %d %d\n", m_r, m_g, m_b, m_a);
+ log_msg(_("rgba: %d %d %d %d\n"), m_r, m_g, m_b, m_a);
ident--;
}
};
@@ -276,8 +276,8 @@
static void write()
{
ident++;
- log_msg("cxform:\n");
- log_msg("has_add = %d, has_mult = %d\n", has_add, has_mult);
+ log_msg(_("cxform:\n"));
+ log_msg(_("has_add = %d, has_mult = %d\n"), has_add, has_mult);
log_msg("| %4.4f %4.4f |\n", m_[0][0], m_[0][1]);
log_msg("| %4.4f %4.4f |\n", m_[1][0], m_[1][1]);
log_msg("| %4.4f %4.4f |\n", m_[2][0], m_[2][1]);
@@ -295,7 +295,7 @@
assert(tag_type == 0);
ident--;
log_msg("\n");
- log_msg("Movie ended\n\n");
+ log_msg(_("Movie ended\n\n"));
}
// tag 1
@@ -605,6 +605,12 @@
main(int argc, char *argv[])
{
int c;
+
+ // Enable native language support, i.e. internationalization
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
// scan for the two main standard GNU options
for (c = 0; c < argc; c++) {
if (strcmp("--help", argv[c]) == 0) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am configure.ac cygnal...,
John Gilmore <=