aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-factory.c2
-rw-r--r--calendar/gui/main.c2
-rw-r--r--executive-summary/component/main.c2
-rw-r--r--mail/main.c2
-rw-r--r--notes/main.c2
-rw-r--r--shell/main.c2
7 files changed, 7 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c320147e6..63026a5a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-30 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
+ shell/main.c, notes/main.c,
+ addressbook/gui/component/addressbook-factory.c:
+ removed #ifdef ENABLE_NLS/#endif on Miguel's request.
+
2000-11-29 JP Rosevear <jpr@helixcode.com>
* README: Update pilot info
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
index 623e0385de..ebfd0d9cfd 100644
--- a/addressbook/gui/component/addressbook-factory.c
+++ b/addressbook/gui/component/addressbook-factory.c
@@ -43,10 +43,8 @@ init_bonobo (int argc, char **argv)
int
main (int argc, char **argv)
{
- #ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
- #endif
init_corba (&argc, argv);
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 95b9ddf64d..3d7789eb49 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -58,10 +58,8 @@ init_bonobo (int *argc, char **argv)
int
main (int argc, char **argv)
{
-#ifdef ENABLE_NLS
bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
textdomain(PACKAGE);
-#endif
init_bonobo (&argc, argv);
glade_gnome_init ();
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
index 2fb5d5bfa9..3c9cc059dd 100644
--- a/executive-summary/component/main.c
+++ b/executive-summary/component/main.c
@@ -47,10 +47,8 @@ main (int argc,
{
CORBA_ORB orb;
-#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
-#endif
gnome_init_with_popt_table ("evolution-executive-summary", VERSION,
argc, argv, oaf_popt_options, 0, NULL);
diff --git a/mail/main.c b/mail/main.c
index 986fd64db7..48ed4c1a7f 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -53,10 +53,8 @@ main (int argc, char *argv [])
mcheck(blowup);
#endif
#endif
-#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
-#endif
g_thread_init( NULL );
diff --git a/notes/main.c b/notes/main.c
index 4b483138da..f3198c0d63 100644
--- a/notes/main.c
+++ b/notes/main.c
@@ -35,10 +35,8 @@ init_bonobo (void)
gint
main (gint argc, gchar **argv)
{
- #ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
- #endif
init_corba (argc, argv);
init_bonobo ();
diff --git a/shell/main.c b/shell/main.c
index f71c0ce40d..76d0582bd0 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -147,10 +147,8 @@ main (int argc, char **argv)
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
-#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
-#endif
gnome_init_with_popt_table ("Evolution", VERSION, argc, argv, options, 0, NULL);
oaf_init (argc, argv);