Index: camel/providers/nntp/camel-nntp-provider.c
===================================================================
--- camel/providers/nntp/camel-nntp-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/nntp/camel-nntp-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -86,6 +86,7 @@
 	news_provider.url_hash = nntp_url_hash;
 	news_provider.url_equal = nntp_url_equal;
 	news_provider.authtypes = g_list_append (NULL, &camel_nntp_password_authtype);
+	news_provider.translation_domain = GETTEXT_PACKAGE;
 	
 	camel_provider_register(&news_provider);
 }
Index: camel/providers/nntp/Makefile.am
===================================================================
--- camel/providers/nntp/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/nntp/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/pop3/camel-pop3-provider.c
===================================================================
--- camel/providers/pop3/camel-pop3-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/pop3/camel-pop3-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -104,6 +104,7 @@
 		pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, auth);
 	pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, &camel_pop3_apop_authtype);
 	pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, &camel_pop3_password_authtype);
+	pop3_provider.translation_domain = GETTEXT_PACKAGE;
 
 	camel_provider_register(&pop3_provider);
 }
Index: camel/providers/smtp/Makefile.am
===================================================================
--- camel/providers/smtp/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/smtp/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/smtp/camel-smtp-provider.c
===================================================================
--- camel/providers/smtp/camel-smtp-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/smtp/camel-smtp-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -57,6 +57,7 @@
 	smtp_provider.authtypes = g_list_append (smtp_provider.authtypes, camel_sasl_authtype ("POPB4SMTP"));
 	smtp_provider.url_hash = camel_url_hash;
 	smtp_provider.url_equal = camel_url_equal;
+	smtp_provider.translation_domain = GETTEXT_PACKAGE;
 	
 	camel_provider_register(&smtp_provider);
 }
Index: camel/providers/groupwise/Makefile.am
===================================================================
--- camel/providers/groupwise/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/groupwise/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/groupwise/camel-groupwise-provider.c
===================================================================
--- camel/providers/groupwise/camel-groupwise-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/groupwise/camel-groupwise-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -134,6 +134,7 @@
 	groupwise_provider.url_equal = groupwise_url_equal;
 	groupwise_provider.auto_detect = groupwise_auto_detect_cb;
 	groupwise_provider.authtypes = g_list_prepend (groupwise_provider.authtypes, &camel_groupwise_password_authtype);
+	groupwise_provider.translation_domain = GETTEXT_PACKAGE;
 	
 	if (use_imap)
 		groupwise_provider.object_types[CAMEL_PROVIDER_STORE] = imap_provider->object_types [CAMEL_PROVIDER_STORE];
Index: camel/providers/imap/Makefile.am
===================================================================
--- camel/providers/imap/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/imap/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/imap/camel-imap-provider.c
===================================================================
--- camel/providers/imap/camel-imap-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/imap/camel-imap-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -110,6 +110,7 @@
 	imap_provider.url_equal = imap_url_equal;
 	imap_provider.authtypes = camel_sasl_authtype_list (FALSE);
 	imap_provider.authtypes = g_list_prepend (imap_provider.authtypes, &camel_imap_password_authtype);
+	imap_provider.translation_domain = GETTEXT_PACKAGE;
 
 	camel_provider_register(&imap_provider);
 }
Index: camel/providers/imapp/camel-imapp-provider.c
===================================================================
--- camel/providers/imapp/camel-imapp-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/imapp/camel-imapp-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -85,6 +85,7 @@
 
 	imapp_provider.authtypes = g_list_prepend(imapp_provider.authtypes, camel_sasl_authtype_list(FALSE));
 	imapp_provider.authtypes = g_list_prepend(imapp_provider.authtypes, &camel_imapp_password_authtype);
+	imapp_provider.translation_domain = GETTEXT_PACKAGE;
 
 	/* blah ... could just use it in object setup? */
 	/* TEMPORARY */
Index: camel/providers/imapp/Makefile.am
===================================================================
--- camel/providers/imapp/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/imapp/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/local/camel-local-provider.c
===================================================================
--- camel/providers/local/camel-local-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/local/camel-local-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -209,6 +209,7 @@
 	mh_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mh_store_get_type ();
 	mh_provider.url_hash = local_url_hash;
 	mh_provider.url_equal = local_url_equal;
+	mh_provider.translation_domain = GETTEXT_PACKAGE;
 	camel_provider_register(&mh_provider);
 	
 	if (!(path = getenv ("MAIL")))
@@ -217,12 +218,14 @@
 	mbox_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mbox_store_get_type ();
 	mbox_provider.url_hash = local_url_hash;
 	mbox_provider.url_equal = local_url_equal;
+	mbox_provider.translation_domain = GETTEXT_PACKAGE;
 	camel_provider_register(&mbox_provider);
 	
 	spool_conf_entries[0].value = path;  /* default path - same as mbox */
 	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
 	spool_provider.url_hash = local_url_hash;
 	spool_provider.url_equal = local_url_equal;
+	spool_provider.translation_domain = GETTEXT_PACKAGE;
 	camel_provider_register(&spool_provider);
 	
 	path = getenv("MAILDIR");
@@ -230,5 +233,6 @@
 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
 	maildir_provider.url_hash = local_url_hash;
 	maildir_provider.url_equal = local_url_equal;
+	maildir_provider.translation_domain = GETTEXT_PACKAGE;
 	camel_provider_register(&maildir_provider);
 }
Index: camel/providers/local/Makefile.am
===================================================================
--- camel/providers/local/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/local/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/imap4/camel-imap4-provider.c
===================================================================
--- camel/providers/imap4/camel-imap4-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/imap4/camel-imap4-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -153,6 +153,7 @@
 	imap4_provider.url_equal = imap4_url_equal;
 	imap4_provider.authtypes = camel_sasl_authtype_list (FALSE);
 	imap4_provider.authtypes = g_list_prepend (imap4_provider.authtypes, &camel_imap4_password_authtype);
+	imap4_provider.translation_domain = GETTEXT_PACKAGE;
 	
 	camel_provider_register (&imap4_provider);
 }
Index: camel/providers/imap4/Makefile.am
===================================================================
--- camel/providers/imap4/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/imap4/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/sendmail/camel-sendmail-provider.c
===================================================================
--- camel/providers/sendmail/camel-sendmail-provider.c	(.../upstream/current)	(revision 91)
+++ camel/providers/sendmail/camel-sendmail-provider.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -55,7 +55,8 @@
 	
 	sendmail_provider.url_hash = camel_url_hash;
 	sendmail_provider.url_equal = camel_url_equal;
-	
+	sendmail_provider.translation_domain = GETTEXT_PACKAGE;
+
 	camel_provider_register(&sendmail_provider);
 }
 
Index: camel/providers/sendmail/Makefile.am
===================================================================
--- camel/providers/sendmail/Makefile.am	(.../upstream/current)	(revision 91)
+++ camel/providers/sendmail/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/current)	(revision 91)
+++ camel/ChangeLog	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -1,3 +1,37 @@
+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.
+
+	* providers/groupwise/camel-groupwise-provider.c
+	(camel_provider_module_init):
+	* providers/imapp/camel-imapp-provider.c (camel_imapp_module_init):
+	* providers/imap/camel-imap-provider.c (camel_provider_module_init):
+	* providers/imap4/camel-imap4-provider.c (camel_provider_module_init):
+	* providers/local/camel-local-provider.c (camel_provider_module_init):
+	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): 
+	* providers/pop3/camel-pop3-provider.c (camel_provider_module_init):
+	* providers/sendmail/camel-sendmail-provider.c
+	(camel_provider_module_init):
+	* providers/smtp/camel-smtp-provider.c (camel_provider_module_init):
+	set translation_domain in CamelProvider struct.
+	
 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/current)	(revision 91)
+++ camel/Makefile.am	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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/current)	(revision 91)
+++ camel/camel.c	(.../patches/003-300891-camel-lib-i18n/1.2.2)	(revision 91)
@@ -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 */
