From 6601299e593cbaaa0d854641b847f8c37d5429ef Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 7 Feb 2005 08:29:49 +0000
Subject: replaced intl.h with glib/gi18n.h.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@92 ee746299-78ed-0310-b773-934348b2243d
---
 src/Makefile.am            | 2 --
 src/about.c                | 2 +-
 src/account.c              | 2 +-
 src/action.c               | 2 +-
 src/addr_compl.c           | 4 ++--
 src/addressadd.c           | 2 +-
 src/addressbook.c          | 2 +-
 src/addrindex.c            | 2 +-
 src/alertpanel.c           | 3 ++-
 src/codeconv.c             | 2 +-
 src/colorlabel.c           | 2 +-
 src/compose.c              | 2 +-
 src/editaddress.c          | 2 +-
 src/editbook.c             | 2 +-
 src/editgroup.c            | 2 +-
 src/editjpilot.c           | 2 +-
 src/editldap.c             | 2 +-
 src/editldap_basedn.c      | 2 +-
 src/editvcard.c            | 2 +-
 src/export.c               | 2 +-
 src/filter.c               | 2 +-
 src/folder.c               | 2 +-
 src/foldersel.c            | 2 +-
 src/folderview.c           | 2 +-
 src/grouplistdialog.c      | 2 +-
 src/gtkutils.c             | 2 +-
 src/headerview.c           | 2 +-
 src/imageview.c            | 2 +-
 src/imap.c                 | 2 +-
 src/import.c               | 2 +-
 src/importldif.c           | 2 +-
 src/inc.c                  | 2 +-
 src/inputdialog.c          | 2 +-
 src/logwindow.c            | 2 +-
 src/main.c                 | 2 +-
 src/mainwindow.c           | 2 +-
 src/mbox.c                 | 2 +-
 src/menu.c                 | 2 +-
 src/message_search.c       | 2 +-
 src/messageview.c          | 2 +-
 src/mh.c                   | 2 +-
 src/mimeview.c             | 2 +-
 src/news.c                 | 2 +-
 src/nntp.c                 | 2 +-
 src/passphrase.c           | 8 ++++----
 src/pop.c                  | 2 +-
 src/prefs.c                | 3 ++-
 src/prefs_account.c        | 3 ++-
 src/prefs_actions.c        | 2 +-
 src/prefs_common.c         | 2 +-
 src/prefs_customheader.c   | 2 +-
 src/prefs_display_header.c | 2 +-
 src/prefs_filter.c         | 2 +-
 src/prefs_filter_edit.c    | 2 +-
 src/prefs_folder_item.c    | 2 +-
 src/prefs_summary_column.c | 2 +-
 src/prefs_template.c       | 2 +-
 src/procheader.c           | 2 +-
 src/procmime.c             | 2 +-
 src/procmsg.c              | 2 +-
 src/progressdialog.c       | 2 +-
 src/recv.c                 | 2 +-
 src/rfc2015.c              | 2 +-
 src/select-keys.c          | 2 +-
 src/send_message.c         | 2 +-
 src/setup.c                | 2 +-
 src/sigstatus.c            | 2 +-
 src/smtp.c                 | 2 +-
 src/sourcewindow.c         | 2 +-
 src/ssl.c                  | 2 +-
 src/statusbar.c            | 2 +-
 src/summary_search.c       | 2 +-
 src/summaryview.c          | 2 +-
 src/template.c             | 2 +-
 src/textview.c             | 2 +-
 src/utils.c                | 2 +-
 76 files changed, 82 insertions(+), 81 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index be28dbc7..e5c83581 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 bin_PROGRAMS = sylpheed
 
 sylpheed_SOURCES = \
-	intl.h \
 	defs.h \
 	version.h \
 	main.c main.h \
@@ -177,7 +176,6 @@ EXTRA_DIST = \
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"Sylpheed\" \
-	-I$(top_srcdir)/intl \
 	$(GTK_CFLAGS) \
 	$(GDK_PIXBUF_CFLAGS) \
 	$(GPGME_CFLAGS) \
diff --git a/src/about.c b/src/about.c
index ae98b38f..2ee0dff8 100644
--- a/src/about.c
+++ b/src/about.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -39,7 +40,6 @@
 #  include <sys/utsname.h>
 #endif
 
-#include "intl.h"
 #include "about.h"
 #include "gtkutils.h"
 #include "stock_pixmap.h"
diff --git a/src/account.c b/src/account.c
index 15a5dda4..d745426c 100644
--- a/src/account.c
+++ b/src/account.c
@@ -24,12 +24,12 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
diff --git a/src/action.c b/src/action.c
index f00340b5..431db8c3 100644
--- a/src/action.c
+++ b/src/action.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #ifdef GDK_WINDOWING_X11
@@ -38,7 +39,6 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "manage_window.h"
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 848147e7..b1f6856f 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  *
- * Copyright (C) 2000-2004 by Alfons Hoogervorst & The Sylpheed Claws Team.
+ * Copyright (C) 2000-2005 by Alfons Hoogervorst & The Sylpheed Claws Team.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,10 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
-#include "intl.h"
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
diff --git a/src/addressadd.c b/src/addressadd.c
index 005961b9..64356835 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -28,6 +28,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -37,7 +38,6 @@
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "gtkutils.h"
 #include "stock_pixmap.h"
 #include "prefs_common.h"
diff --git a/src/addressbook.c b/src/addressbook.c
index ec87466c..46ca05e4 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -44,7 +45,6 @@
 #include <string.h>
 #include <setjmp.h>
 
-#include "intl.h"
 #include "main.h"
 #include "addressbook.h"
 #include "manage_window.h"
diff --git a/src/addrindex.c b/src/addrindex.c
index 23956b2b..64f6a4aa 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -28,9 +28,9 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "mgutils.h"
 #include "addritem.h"
 #include "addrcache.h"
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 7be98940..d1d7a65c 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -23,10 +23,11 @@
 
 #include "defs.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "alertpanel.h"
 #include "manage_window.h"
 #include "utils.h"
diff --git a/src/codeconv.c b/src/codeconv.c
index 32b3918f..50df350d 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -35,7 +36,6 @@
 
 #include <iconv.h>
 
-#include "intl.h"
 #include "codeconv.h"
 #include "unmime.h"
 #include "base64.h"
diff --git a/src/colorlabel.c b/src/colorlabel.c
index 6a5c3d20..40b27d06 100644
--- a/src/colorlabel.c
+++ b/src/colorlabel.c
@@ -25,6 +25,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkpixmap.h>
 #include <gtk/gtkmenu.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkdrawingarea.h>
 
-#include "intl.h"
 #include "colorlabel.h"
 #include "gtkutils.h"
 #include "utils.h"
diff --git a/src/compose.c b/src/compose.c
index c739116e..162bde94 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
@@ -69,7 +70,6 @@
 #  include <wctype.h>
 #endif
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "compose.h"
diff --git a/src/editaddress.c b/src/editaddress.c
index 912ae0cb..6015a95c 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -32,7 +33,6 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtktable.h>
 
-#include "intl.h"
 #include "mgutils.h"
 #include "addressbook.h"
 #include "addressitem.h"
diff --git a/src/editbook.c b/src/editbook.c
index aecbca3d..d69f3f61 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -28,6 +28,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "prefs_common.h"
 #include "mgutils.h"
diff --git a/src/editgroup.c b/src/editgroup.c
index 30dbd3a7..f32b8c85 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -24,9 +24,9 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "addressbook.h"
 #include "addressitem.h"
 #include "addrbook.h"
diff --git a/src/editjpilot.c b/src/editjpilot.c
index 731cec0c..9c2bd622 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -30,6 +30,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -39,7 +40,6 @@
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "addressbook.h"
 #include "prefs_common.h"
 #include "addressitem.h"
diff --git a/src/editldap.c b/src/editldap.c
index ef987f22..be2df6bd 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -30,6 +30,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -38,7 +39,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "addressbook.h"
 #include "prefs_common.h"
 #include "addressitem.h"
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 0ffa491c..f620161e 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -30,6 +30,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -39,7 +40,6 @@
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "prefs_common.h"
 #include "syldap.h"
 #include "mgutils.h"
diff --git a/src/editvcard.c b/src/editvcard.c
index 53bb23cf..e4f33134 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -28,6 +28,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "addressbook.h"
 #include "prefs_common.h"
 #include "addressitem.h"
diff --git a/src/export.c b/src/export.c
index f55dc1e3..ee5d06b8 100644
--- a/src/export.c
+++ b/src/export.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -37,7 +38,6 @@
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
 
-#include "intl.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
diff --git a/src/filter.c b/src/filter.c
index 1fa17a70..983cee34 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
@@ -31,7 +32,6 @@
 #include <regex.h>
 #include <time.h>
 
-#include "intl.h"
 #include "procheader.h"
 #include "filter.h"
 #include "folder.h"
diff --git a/src/folder.c b/src/folder.c
index 9780f1d4..3995976d 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -24,11 +24,11 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "folder.h"
 #include "session.h"
 #include "imap.h"
diff --git a/src/foldersel.c b/src/foldersel.c
index 7a11ac8f..b6efebaf 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -38,7 +39,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "utils.h"
 #include "gtkutils.h"
diff --git a/src/folderview.c b/src/folderview.c
index 8ee6f81f..0d573b30 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -37,7 +38,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index ee66c5b6..779e8bd3 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -41,7 +42,6 @@
 #include <gtk/gtkstock.h>
 #include <string.h>
 
-#include "intl.h"
 #include "grouplistdialog.h"
 #include "manage_window.h"
 #include "gtkutils.h"
diff --git a/src/gtkutils.c b/src/gtkutils.c
index 81d07b61..85dfda5f 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
@@ -39,7 +40,6 @@
 #  include <wctype.h>
 #endif
 
-#include "intl.h"
 #include "gtkutils.h"
 #include "utils.h"
 #include "gtksctree.h"
diff --git a/src/headerview.c b/src/headerview.c
index ee730f37..6e4ed219 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkstyle.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -39,7 +40,6 @@
 #  include <compface.h>
 #endif
 
-#include "intl.h"
 #include "main.h"
 #include "headerview.h"
 #include "prefs_common.h"
diff --git a/src/imageview.c b/src/imageview.c
index c1dd68c0..2aa70683 100644
--- a/src/imageview.c
+++ b/src/imageview.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkimage.h>
 
@@ -29,7 +30,6 @@
 #  include <gdk-pixbuf/gdk-pixbuf.h>
 #endif /* HAVE_GDK_PIXBUF */
 
-#include "intl.h"
 #include "mainwindow.h"
 #include "prefs_common.h"
 #include "procmime.h"
diff --git a/src/imap.c b/src/imap.c
index 5953bf2a..e80985cb 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -35,7 +36,6 @@
 #  include <iconv.h>
 #endif
 
-#include "intl.h"
 #include "imap.h"
 #include "socket.h"
 #include "ssl.h"
diff --git a/src/import.c b/src/import.c
index 754e534e..c11ef21c 100644
--- a/src/import.c
+++ b/src/import.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -37,7 +38,6 @@
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
 
-#include "intl.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
diff --git a/src/importldif.c b/src/importldif.c
index 3420c3c9..cbadd478 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -28,6 +28,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "addrbook.h"
 #include "addressbook.h"
 #include "addressitem.h"
diff --git a/src/inc.c b/src/inc.c
index dea36cfe..e51c7640 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -39,7 +40,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "inc.h"
 #include "mainwindow.h"
diff --git a/src/inputdialog.c b/src/inputdialog.c
index bd8b285e..1afc1da0 100644
--- a/src/inputdialog.c
+++ b/src/inputdialog.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbbox.h>
 
-#include "intl.h"
 #include "inputdialog.h"
 #include "manage_window.h"
 #include "inc.h"
diff --git a/src/logwindow.c b/src/logwindow.c
index 5ad2f8cf..41cdf254 100644
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -30,7 +31,6 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtkstyle.h>
 
-#include "intl.h"
 #include "logwindow.h"
 #include "utils.h"
 #include "gtkutils.h"
diff --git a/src/main.c b/src/main.c
index 4c78d157..fbbfb555 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkrc.h>
 
@@ -46,7 +47,6 @@
 #  include <gpgme.h>
 #endif
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 03a39eb1..3a609fe6 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkwidget.h>
@@ -41,7 +42,6 @@
 #include <gtk/gtktooltips.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
diff --git a/src/mbox.c b/src/mbox.c
index aaf9d663..635a4888 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "intl.h"
 #include "mbox.h"
 #include "procmsg.h"
 #include "folder.h"
diff --git a/src/menu.c b/src/menu.c
index 1528b96c..4c71d5c6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenubar.h>
@@ -30,7 +31,6 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkwindow.h>
 
-#include "intl.h"
 #include "menu.h"
 #include "utils.h"
 
diff --git a/src/message_search.c b/src/message_search.c
index 0f0c628c..a05c0be5 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -40,7 +41,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "message_search.h"
 #include "messageview.h"
diff --git a/src/messageview.c b/src/messageview.c
index dc0952c8..dd0b3788 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
@@ -32,7 +33,6 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "messageview.h"
 #include "message_search.h"
diff --git a/src/mh.c b/src/mh.c
index 60ada344..97825646 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -36,7 +37,6 @@
 #  include <sys/time.h>
 #endif
 
-#include "intl.h"
 #include "folder.h"
 #include "mh.h"
 #include "procmsg.h"
diff --git a/src/mimeview.c b/src/mimeview.c
index a2dec4a1..517778dc 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -37,7 +38,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mimeview.h"
 #include "textview.h"
diff --git a/src/news.c b/src/news.c
index 521acec9..8d1622bb 100644
--- a/src/news.c
+++ b/src/news.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,7 +32,6 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "intl.h"
 #include "news.h"
 #include "nntp.h"
 #include "socket.h"
diff --git a/src/nntp.c b/src/nntp.c
index 54335ce9..173f605e 100644
--- a/src/nntp.c
+++ b/src/nntp.c
@@ -22,10 +22,10 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "intl.h"
 #include "nntp.h"
 #include "socket.h"
 #include "utils.h"
diff --git a/src/passphrase.c b/src/passphrase.c
index 519c23c1..39eee9ed 100644
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -22,10 +22,8 @@
 
 #if USE_GPGME
 
-#include <string.h>
-#include <sys/types.h>
-#include <sys/mman.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>  /* GDK_DISPLAY() */
@@ -41,8 +39,10 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/mman.h>
 
-#include "intl.h"
 #include "passphrase.h"
 #include "prefs_common.h"
 #include "manage_window.h"
diff --git a/src/pop.c b/src/pop.c
index d4c3e873..3f618613 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -32,7 +33,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "pop.h"
 #include "md5.h"
 #include "prefs_account.h"
diff --git a/src/prefs.c b/src/prefs.c
index 7223b5ed..af394679 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +30,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "codeconv.h"
diff --git a/src/prefs_account.c b/src/prefs_account.c
index ae29407b..29159fc9 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -23,6 +23,8 @@
 
 #include "defs.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -32,7 +34,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_account.h"
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 8cc0e24b..f1d0b439 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "prefs.h"
 #include "inc.h"
 #include "utils.h"
diff --git a/src/prefs_common.c b/src/prefs_common.c
index d009c1c9..dd74803f 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -34,7 +35,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_common.h"
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index e1219db5..d44387b7 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_customheader.h"
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index c34e30d0..ec0d51c9 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "prefs.h"
 #include "prefs_display_header.h"
 #include "prefs_common.h"
diff --git a/src/prefs_filter.c b/src/prefs_filter.c
index 7b0bc5f5..f5f5d1e7 100644
--- a/src/prefs_filter.c
+++ b/src/prefs_filter.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_filter.h"
diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c
index edc17917..3808917a 100644
--- a/src/prefs_filter_edit.c
+++ b/src/prefs_filter_edit.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_filter.h"
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 183ccdc4..a393cd18 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -24,10 +24,10 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "folder.h"
 #include "prefs.h"
 #include "prefs_folder_item.h"
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 169532ee..5b95e19e 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkvbox.h>
@@ -32,7 +33,6 @@
 #include <gtk/gtkbutton.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "prefs.h"
 #include "prefs_common.h"
 #include "prefs_summary_column.h"
diff --git a/src/prefs_template.c b/src/prefs_template.c
index e274b9d9..e9a345f6 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -21,13 +21,13 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
 
-#include "intl.h"
 #include "template.h"
 #include "main.h"
 #include "inc.h"
diff --git a/src/procheader.c b/src/procheader.c
index 9a18bf31..b7baf940 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -22,13 +22,13 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
 #include <sys/stat.h>
 
-#include "intl.h"
 #include "procheader.h"
 #include "procmsg.h"
 #include "codeconv.h"
diff --git a/src/procmime.c b/src/procmime.c
index 008bd10e..a603da71 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -24,12 +24,12 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "base64.h"
diff --git a/src/procmsg.c b/src/procmsg.c
index 9b8bcb1f..985b1871 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -20,11 +20,11 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "utils.h"
 #include "procmsg.h"
diff --git a/src/progressdialog.c b/src/progressdialog.c
index b7a21e1b..6c8d8647 100644
--- a/src/progressdialog.c
+++ b/src/progressdialog.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkhbox.h>
@@ -31,7 +32,6 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkstock.h>
 
-#include "intl.h"
 #include "progressdialog.h"
 #include "gtkutils.h"
 #include "utils.h"
diff --git a/src/recv.c b/src/recv.c
index 46cf27be..04959f8c 100644
--- a/src/recv.c
+++ b/src/recv.c
@@ -24,12 +24,12 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "intl.h"
 #include "recv.h"
 #include "socket.h"
 #include "utils.h"
diff --git a/src/rfc2015.c b/src/rfc2015.c
index e5958dfe..7496e38a 100644
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -26,6 +26,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
@@ -34,7 +35,6 @@
 
 #include <gpgme.h>
 
-#include "intl.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "base64.h"
diff --git a/src/select-keys.c b/src/select-keys.c
index 84a7f90f..a1483e8e 100644
--- a/src/select-keys.c
+++ b/src/select-keys.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -39,7 +40,6 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkstock.h>
 
-#include "intl.h"
 #include "select-keys.h"
 #include "utils.h"
 #include "gtkutils.h"
diff --git a/src/send_message.c b/src/send_message.c
index 75d36c61..b2e5bd6b 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
@@ -31,7 +32,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "intl.h"
 #include "send_message.h"
 #include "session.h"
 #include "ssl.h"
diff --git a/src/setup.c b/src/setup.c
index fe2316f1..b044d17f 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -22,9 +22,9 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkstatusbar.h>
 
-#include "intl.h"
 #include "inputdialog.h"
 #include "alertpanel.h"
 #include "mainwindow.h"
diff --git a/src/sigstatus.c b/src/sigstatus.c
index bc3c81d0..e05bf8d3 100644
--- a/src/sigstatus.c
+++ b/src/sigstatus.c
@@ -23,6 +23,7 @@
 #if USE_GPGME
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkhbox.h>
@@ -32,7 +33,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gpgme.h>
 
-#include "intl.h"
 #include "gtkutils.h"
 #include "utils.h"
 #include "sigstatus.h"
diff --git a/src/smtp.c b/src/smtp.c
index 4b8ae355..3ee43c3b 100644
--- a/src/smtp.c
+++ b/src/smtp.c
@@ -22,10 +22,10 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "intl.h"
 #include "smtp.h"
 #include "md5.h"
 #include "base64.h"
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index 64bf30ea..7c367397 100644
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -30,7 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "sourcewindow.h"
 #include "procmsg.h"
 #include "utils.h"
diff --git a/src/ssl.c b/src/ssl.c
index 17ce8934..98d33893 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -26,8 +26,8 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "ssl.h"
 
diff --git a/src/statusbar.c b/src/statusbar.c
index 63bdd8e0..e1f4ab29 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -22,10 +22,10 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkstatusbar.h>
 #include <stdarg.h>
 
-#include "intl.h"
 #include "statusbar.h"
 #include "gtkutils.h"
 #include "utils.h"
diff --git a/src/summary_search.c b/src/summary_search.c
index 98380350..f2f60361 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -41,7 +42,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summary_search.h"
 #include "summaryview.h"
diff --git a/src/summaryview.c b/src/summaryview.c
index 542a7e3f..0df95d95 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
@@ -44,7 +45,6 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include "intl.h"
 #include "main.h"
 #include "menu.h"
 #include "mainwindow.h"
diff --git a/src/template.c b/src/template.c
index 5402be67..e7fa1bdf 100644
--- a/src/template.c
+++ b/src/template.c
@@ -21,12 +21,12 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "template.h"
 #include "utils.h"
diff --git a/src/textview.c b/src/textview.c
index 82b5ba09..a7af0d01 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
@@ -34,7 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"
diff --git a/src/utils.c b/src/utils.c
index 16602697..b43af5de 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -42,7 +43,6 @@
 #include <dirent.h>
 #include <time.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "socket.h"
 #include "statusbar.h"
-- 
cgit v1.2.3