Index: camel/providers/nntp/Makefile.am
===================================================================
--- camel/providers/nntp/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/nntp/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
 
 libcamelnntp_la_SOURCES = 			\
Index: camel/providers/smtp/Makefile.am
===================================================================
--- camel/providers/smtp/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/smtp/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/camel			\
 	$(CAMEL_CFLAGS)				\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
 
 libcamelsmtp_la_SOURCES = 			\
Index: camel/providers/groupwise/Makefile.am
===================================================================
--- camel/providers/groupwise/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/groupwise/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
         $(SOUP_CFLAGS)                          \
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-groupwise-provider\"
 
 libcamelgroupwise_la_SOURCES = 			\
Index: camel/providers/imapp/Makefile.am
===================================================================
--- camel/providers/imapp/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/imapp/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-imapp-provider\"
 
 libcamelimapp_la_SOURCES =			\
Index: camel/providers/imap/Makefile.am
===================================================================
--- camel/providers/imap/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/imap/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-imap-provider\"
 
 libcamelimap_la_SOURCES = 			\
Index: camel/providers/imap4/Makefile.am
===================================================================
--- camel/providers/imap4/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/imap4/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-imap4-provider\"
 
 libcamelimap4_la_SOURCES = 			\
Index: camel/providers/local/Makefile.am
===================================================================
--- camel/providers/local/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/local/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)				\
 	$(CAMEL_CFLAGS)				\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-local-provider\"
 
 libcamellocal_la_SOURCES = 			\
Index: camel/providers/sendmail/Makefile.am
===================================================================
--- camel/providers/sendmail/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/providers/sendmail/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -12,6 +12,7 @@
 	$(CAMEL_CFLAGS)					\
 	$(GNOME_INCLUDEDIR)				\
 	$(GTK_INCLUDEDIR) 				\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
 	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
 
 libcamelsendmail_la_SOURCES = 			\
Index: camel/ChangeLog
===================================================================
--- camel/ChangeLog	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/ChangeLog	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -1,3 +1,24 @@
+2005-04-17  Changwoo Ryu  <cwryu@debian.org>
+
+	** See bug #300891
+	
+	* Makefile.am (INCLUDES): define CAMEL_EXPLICIT_TRANSLATION_DOMAIN
+	and EVOLUTION_LOCALEDIR.
+
+	* camel.c (camel_init): initialize gettext with bindtextdomain()
+	and bind_textdomain_codeset().
+
+	* providers/groupwise/Makefile.am (INCLUDES): 
+	* providers/imap/Makefile.am (INCLUDES):
+	* providers/imap4/Makefile.am (INCLUDES):
+	* providers/imapp/Makefile.am (INCLUDES):
+	* providers/local/Makefile.am (INCLUDES):
+	* providers/nntp/Makefile.am (INCLUDES):
+	* providers/pop3/Makefile.am (INCLUDES):
+	* providers/sendmail/Makefile.am (INCLUDES):
+	* providers/smtp/Makefile.am (INCLUDES): 
+	define CAMEL_EXPLICIT_TRANSLATION_DOMAIN.
+
 2005-03-31  Jeffrey Stedfast  <fejj@novell.com>
 
 	* camel-sasl-digest-md5.c (camel_sasl_digest_md5_finalize): If the
Index: camel/Makefile.am
===================================================================
--- camel/Makefile.am	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -22,6 +22,8 @@
 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
 	-DG_LOG_DOMAIN=\"camel\"			\
+	-DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	$(CAMEL_CFLAGS)
 
 libcamel_provider_1_2_la_SOURCES = 		\
Index: camel/camel.c
===================================================================
--- camel/camel.c	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 50)
+++ camel/camel.c	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 50)
@@ -37,6 +37,7 @@
 
 #include "camel.h"
 #include "camel-certdb.h"
+#include "camel-i18n.h"
 #include "camel-mime-utils.h"
 #include "camel-provider.h"
 #include "camel-debug.h"
@@ -75,6 +76,9 @@
 	if (initialised)
 		return 0;
 
+	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 	camel_debug_init();
 
 	/* initialise global camel_object_type */
