From d0ead0c4a950ba4bfc82fdca88e2412bb464138e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 6 Feb 2003 17:26:04 +0000 Subject: s/PACKAGE/GETTEXT_PACKAGE/ in gettext init svn path=/trunk/; revision=19818 --- ChangeLog | 5 +++++ addressbook/ChangeLog | 5 +++++ addressbook/gui/component/addressbook-config.c | 4 ++-- calendar/ChangeLog | 5 +++++ calendar/importers/main.c | 4 ++-- importers/ChangeLog | 7 +++++++ importers/elm-importer.c | 4 ++-- importers/evolution-gnomecard-importer.c | 4 ++-- importers/netscape-importer.c | 4 ++-- importers/pine-importer.c | 4 ++-- mail/ChangeLog | 2 ++ mail/main.c | 4 ++-- shell/ChangeLog | 5 +++++ shell/evolution-test-component.c | 4 ++-- tools/evolution-addressbook-abuse.c | 4 ++-- tools/evolution-addressbook-export.c | 4 ++-- tools/evolution-addressbook-import.c | 4 ++-- wombat/ChangeLog | 2 ++ wombat/wombat.c | 4 ++-- 19 files changed, 55 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 102ecd0646..f23b11d8cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,11 @@ * tools/evolution-addressbook-clean.in: s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/ + * tools/evolution-addressbook-abuse.c (main): + s/PACKAGE/GETTEXT_PACKAGE/ in gettext init + * tools/evolution-addressbook-export.c (main): Likewise + * tools/evolution-addressbook-import.c (main): Likewise + 2003-02-05 Dan Winship * configure.in: Define and AC_SUBST privlibexecdir, privdatadir, diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 70563fa2b6..e80a6e816e 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 Dan Winship + + * gui/component/addressbook-config.c (main): + s/PACKAGE/GETTEXT_PACKAGE/ in gettext setup. + 2003-02-05 Dan Winship * backend/ebook/Makefile.am (INCLUDES): Remove cruft. diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index b7d8f1ce41..7142c7be2b 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -1756,8 +1756,8 @@ main(int argc, char **argv) glade_init (); - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); #if 0 g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 16d9a581e2..78ba5002ab 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 Dan Winship + + * importers/main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext + init + 2003-02-05 Dan Winship * gui/Makefile.am (INCLUDES): Remove cruft. Rename ICONSDIR to diff --git a/calendar/importers/main.c b/calendar/importers/main.c index e3ac17fa2a..79d1e7db4a 100644 --- a/calendar/importers/main.c +++ b/calendar/importers/main.c @@ -72,8 +72,8 @@ main (int argc, char *argv[]) { CORBA_ORB orb; - bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain(GETTEXT_PACKAGE); g_type_init (); bonobo_activation_init (argc, argv); diff --git a/importers/ChangeLog b/importers/ChangeLog index 3465d22158..38c24d73d3 100644 --- a/importers/ChangeLog +++ b/importers/ChangeLog @@ -1,3 +1,10 @@ +2003-02-06 Dan Winship + + * elm-importer.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init + * evolution-gnomecard-importer.c (main): Likewise + * netscape-importer.c (main): Likewise + * pine-importer.c (main): Likewise + 2003-01-22 Ettore Perazzoli * netscape-importer.c (netscape_import_filters): Look for diff --git a/importers/elm-importer.c b/importers/elm-importer.c index ad48fb446b..ede8b27fed 100644 --- a/importers/elm-importer.c +++ b/importers/elm-importer.c @@ -604,8 +604,8 @@ main (int argc, { CORBA_ORB orb; - bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain(GETTEXT_PACKAGE); gnome_init_with_popt_table ("Evolution-Elm-Importer", VERSION, argc, argv, oaf_popt_options, 0, diff --git a/importers/evolution-gnomecard-importer.c b/importers/evolution-gnomecard-importer.c index d4cc1244f6..815fd9cf9d 100644 --- a/importers/evolution-gnomecard-importer.c +++ b/importers/evolution-gnomecard-importer.c @@ -307,8 +307,8 @@ main (int argc, { CORBA_ORB orb; - bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain(GETTEXT_PACKAGE); gnome_init_with_popt_table ("Evolution-GnomeCard-Intelligent-Importer", VERSION, argc, argv, oaf_popt_options, 0, diff --git a/importers/netscape-importer.c b/importers/netscape-importer.c index c722b4747b..8b841c9cc0 100644 --- a/importers/netscape-importer.c +++ b/importers/netscape-importer.c @@ -2217,8 +2217,8 @@ main (int argc, { CORBA_ORB orb; - bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain(GETTEXT_PACKAGE); gnome_init_with_popt_table ("Evolution-Netscape-Importer", VERSION, argc, argv, oaf_popt_options, 0, diff --git a/importers/pine-importer.c b/importers/pine-importer.c index 8ef539409d..8836fe611d 100644 --- a/importers/pine-importer.c +++ b/importers/pine-importer.c @@ -720,8 +720,8 @@ main (int argc, { CORBA_ORB orb; - bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR); - textdomain(PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain(GETTEXT_PACKAGE); gnome_init_with_popt_table ("Evolution-Pine-Importer", VERSION, argc, argv, oaf_popt_options, 0, diff --git a/mail/ChangeLog b/mail/ChangeLog index 5f1de47862..dac9a081cb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -5,6 +5,8 @@ (libevolution_mail_la_LDFLAGS): remove -export-dynamic, add -module + * main.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init + * importers/Makefile.am (INCLUDES): change EVOLUTION_DATADIR to EVOLUTION_PRIVDATADIR diff --git a/mail/main.c b/mail/main.c index 6dc41dba44..b5192a9f5c 100644 --- a/mail/main.c +++ b/mail/main.c @@ -89,8 +89,8 @@ main (int argc, char *argv []) /*mtrace();*/ mcheck(blowup); #endif - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); g_thread_init (NULL); diff --git a/shell/ChangeLog b/shell/ChangeLog index 29c1897559..65b3c7d818 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 Dan Winship + + * evolution-test-component.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in + gettext init. + 2003-02-06 Not Zed * e-shortcuts-view.c (class_init): use POINTER_STRING_BOOL for diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c index f922e88fc4..faeae39991 100644 --- a/shell/evolution-test-component.c +++ b/shell/evolution-test-component.c @@ -695,8 +695,8 @@ register_component (void) int main (int argc, char **argv) { - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PROGRAM_STANDARD_PROPERTIES, diff --git a/tools/evolution-addressbook-abuse.c b/tools/evolution-addressbook-abuse.c index dc8b721ef8..d01d6cb6e9 100644 --- a/tools/evolution-addressbook-abuse.c +++ b/tools/evolution-addressbook-abuse.c @@ -120,8 +120,8 @@ main (int argc, char *argv[]) exit(0); } - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); gnome_program_init ("evolution-addressbook-abuse", VERSION, LIBGNOMEUI_MODULE, argc, argv, diff --git a/tools/evolution-addressbook-export.c b/tools/evolution-addressbook-export.c index 585728f853..7f00157566 100644 --- a/tools/evolution-addressbook-export.c +++ b/tools/evolution-addressbook-export.c @@ -48,8 +48,8 @@ main (int argc, char *argv[]) { NULL, '\0', 0, NULL, 0, NULL, NULL } }; - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); gnome_program_init ("evolution-addressbook-export", VERSION, LIBGNOMEUI_MODULE, argc, argv, diff --git a/tools/evolution-addressbook-import.c b/tools/evolution-addressbook-import.c index 234899cb9a..e04a117e51 100644 --- a/tools/evolution-addressbook-import.c +++ b/tools/evolution-addressbook-import.c @@ -69,8 +69,8 @@ main (int argc, char *argv[]) { NULL, '\0', 0, NULL, 0, NULL, NULL } }; - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); gnome_program_init ("evolution-addressbook-import", VERSION, LIBGNOMEUI_MODULE, argc, argv, diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 67afbe1c01..f2b2cff37b 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -2,6 +2,8 @@ * Makefile.am: cleanup + * wombat.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init + 2003-02-01 Hans Petter Jansson * Makefile.am: Make .server file point to where wombat is now diff --git a/wombat/wombat.c b/wombat/wombat.c index e1fd04e130..549948c195 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -173,8 +173,8 @@ main (int argc, char **argv) { gboolean did_pas=FALSE, did_pcs=FALSE; - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + textdomain (GETTEXT_PACKAGE); g_message ("Starting wombat"); -- cgit