Index: camel/ChangeLog
===================================================================
--- camel/ChangeLog	(.../upstream/EVOLUTION_DATA_SERVER_1_2_2)	(revision 44)
+++ camel/ChangeLog	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 44)
@@ -1,3 +1,12 @@
+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().
+
 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 44)
+++ camel/Makefile.am	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 44)
@@ -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 44)
+++ camel/camel.c	(.../patches/003-300891-camel-explicit-translation-domain/1.2.2)	(revision 44)
@@ -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 */
