build: Switch from intltool to gettext

See xfce/xfce4-dev-tools#41.

.gitignore

@@ -8,6 +8,7 @@ config.h
 config.h.in
 config.h.in~
 config.log
+config.rpath
 config.status
 config.sub
 configure
@@ -15,6 +16,8 @@ depcomp
 gtk-doc.make
 libtool
 ltmain.sh
+ABOUT-NLS
+ChangeLog
 Makefile
 Makefile.in
 omf.make
@@ -42,15 +45,21 @@ configure.ac
 doc/xfce4-terminal.1
 INSTALL
 install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 m4/
 missing
-po/.intltool-merge-cache*
 po/Makefile.in.in
+po/Makevars.template
 po/POTFILES
-po/stamp-it
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.sed
+po/remove-potcdate.sin
+po/stamp-po
+po/xfce4-terminal.pot
 terminal/stamp-terminal-enum-types.h
 terminal/stamp-terminal-marshal.h
 terminal/terminal-config.h

Makefile.am

@@ -25,21 +25,15 @@ dist-hook: ChangeLog
 desktopdir = $(datadir)/applications
 desktop_in_files = xfce4-terminal.desktop.in xfce4-terminal-settings.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = \
 	HACKING \
-	README.md \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
 	$(desktop_in_files)
 
 DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge \
-	intltool-update \
-	po/.intltool-merge-cache.lock \
 	$(desktop_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent:

colorschemes/Makefile.am

@@ -12,7 +12,9 @@ presets_in_files = 							\
 
 presetsdir = $(datadir)/xfce4/terminal/colorschemes
 presets_DATA = $(presets_in_files:.theme.in=.theme)
-@INTLTOOL_THEME_RULE@
+
+%.theme: %.theme.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(presets_in_files)
 

colorschemes/black-on-white.theme.in

 [Scheme]
-_Name=Black on White
+Name=Black on White
 ColorForeground=#000000
 ColorBackground=#ffffff

colorschemes/dark-pastels.theme.in

 [Scheme]
-_Name=Dark Pastels
+Name=Dark Pastels
 ColorForeground=#dcdcdc
 ColorBackground=#2c2c2c
 ColorCursor=#dcdcdc

colorschemes/green-on-black.theme.in

 [Scheme]
-_Name=Green on Black
+Name=Green on Black
 ColorForeground=#17f018
 ColorBackground=#000000

colorschemes/solarized-dark.theme.in

 [Scheme]
-_Name=Solarized (dark)
+Name=Solarized (dark)
 ColorForeground=#839496
 ColorBackground=#002b36
 ColorCursor=#93a1a1

colorschemes/solarized-light.theme.in

 [Scheme]
-_Name=Solarized (light)
+Name=Solarized (light)
 ColorForeground=#073642
 ColorBackground=#fdf6e3
 ColorCursor=#073642

colorschemes/tango.theme.in

 [Scheme]
-_Name=Tango
+Name=Tango
 ColorPalette=#000000;#cc0000;#4e9a06;#c4a000;#3465a4;#75507b;#06989a;#d3d7cf;#555753;#ef2929;#8ae234;#fce94f;#739fcf;#ad7fa8;#34e2e2;#eeeeec

colorschemes/white-on-black.theme.in

 [Scheme]
-_Name=White on Black
+Name=White on Black

colorschemes/xterm.theme.in

 [Scheme]
-_Name=XTerm
+Name=XTerm
 ColorForeground=#000000
 ColorBackground=#ffffff
 ColorPalette=#000000;#cd0000;#00cd00;#cdcd00;#0000cd;#cd00cd;#00cdcd;#e5e5e5;#7f7f7f;#ff0000;#00ff00;#ffff00;#5c5cff;#ff00ff;#00ffff;#ffffff

configure.ac.in

@@ -33,11 +33,6 @@ dnl *** Debugging support for GIT snapshots ***
 dnl *******************************************
 m4_define([terminal_debug_default], [ifelse(terminal_version_tag(), [git], [yes], [minimum])])
 
-dnl ****************************
-dnl *** For intltool support ***
-dnl ****************************
-m4_define([intltool_minimum_version], [0.35])
-
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
@@ -77,7 +72,6 @@ dnl ********************************
 AC_PROG_CC()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
-IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 
 dnl **************************
 dnl *** Initialize libtool ***
@@ -93,7 +87,12 @@ AC_CHECK_HEADERS([ctype.h errno.h limits.h pwd.h signal.h time.h unistd.h locale
 dnl ******************************
 dnl *** Check for i18n support ***
 dnl ******************************
-XDT_I18N([@LINGUAS@])
+GETTEXT_PACKAGE="$PACKAGE"
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain])
+AC_SUBST([GETTEXT_PACKAGE])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 dnl ***********************************
 dnl *** Check for optional packages ***

po/LINGUAS

+ar
+ast
+be
+bg
+ca
+cs
+da
+de
+el
+en_AU
+en_GB
+eo
+es
+et
+eu
+fa_IR
+fi
+fr
+gl
+he
+hr
+hu
+hy_AM
+hye
+id
+ie
+is
+it
+ja
+kk
+ko
+lt
+lv
+ms
+nb
+nl
+oc
+pa
+pl
+pt_BR
+pt
+ro
+ru
+si
+sk
+sl
+sq
+sr
+sv
+te
+th
+tr
+ug
+uk
+ur_PK
+ur
+vi
+zh_CN
+zh_TW

po/Makevars

+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
+	--keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 \
+	--add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Xfce development team.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no

xfce4-terminal-settings.desktop.in

 [Desktop Entry]
 Version=1.0
-_Name=Xfce Terminal Settings
-_Comment=Configure Xfce Terminal
-_Keywords=terminal;settings;preferences;configuration;configure;
+Name=Xfce Terminal Settings
+Comment=Configure Xfce Terminal
+Keywords=terminal;settings;preferences;configuration;configure;
 Exec=xfce4-terminal --preferences
 Icon=org.xfce.terminal-settings
 Terminal=false

xfce4-terminal.desktop.in

 [Desktop Entry]
 Version=1.0
-_Name=Xfce Terminal
-_Comment=Terminal Emulator
-_GenericName=Terminal Emulator
-_Keywords=terminal;command line;prompt;cli;cmd;xterm;bash;shell;dos;
+Name=Xfce Terminal
+Comment=Terminal Emulator
+GenericName=Terminal Emulator
+Keywords=terminal;command line;prompt;cli;cmd;xterm;bash;shell;dos;
 Exec=xfce4-terminal
 Icon=org.xfce.terminal
 Terminal=false
@@ -13,5 +13,5 @@ StartupNotify=true
 Actions=preferences;
 
 [Desktop Action preferences]
-_Name=Terminal Preferences
+Name=Terminal Preferences
 Exec=xfce4-terminal --preferences