From 0fcce674c5398950e8b00495b70236a473cb425d Mon Sep 17 00:00:00 2001 From: svu Date: Tue, 2 Oct 2007 21:51:04 +0000 Subject: dropping translation from base.xml --- ChangeLog | 2 ++ configure.in | 11 ++++++++++- po/ChangeLog | 4 ++++ rules/Makefile.am | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index af59767a..5b5ae428 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * symbols/inet: fixing dell inspiron, https://bugs.freedesktop.org/show_bug.cgi?id=12653 + * configure.in, rules/Makefile.am, po/ChangeLog: dropping translations + from base.xml, let apps/libs use .gmo files instead 2007-09-27 Sergey Udaltsov diff --git a/configure.in b/configure.in index d84371a9..ae0adedf 100644 --- a/configure.in +++ b/configure.in @@ -35,14 +35,23 @@ AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" = "xyes") AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes") +# **** +# i18n +# **** AC_PROG_INTLTOOL(0.30) +GETTEXT_PACKAGE=xkeyboard-config +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) + +AM_GLIB_GNU_GETTEXT + ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW" AC_SUBST(xkb_base) AC_SUBST(xkb_rules_symlink) -AC_OUTPUT([ po/Makefile +AC_OUTPUT([ po/Makefile.in Makefile compat/Makefile geometry/Makefile diff --git a/po/ChangeLog b/po/ChangeLog index 096fd351..3a5062c4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-10-02 gettextize + + * Makefile.in.in: New file, from gettext-0.16.1. + 2007-09-25 svu * *.po: sync with TP diff --git a/rules/Makefile.am b/rules/Makefile.am index a2593bef..b87da5b2 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -80,4 +80,4 @@ DISTCLEANFILES=base.xml base.lst sun.xml rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) -@INTLTOOL_XML_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ -- cgit v1.2.3