summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-10-02 21:51:04 +0000
committersvu <svu>2007-10-02 21:51:04 +0000
commit0fcce674c5398950e8b00495b70236a473cb425d (patch)
treed7e35c65b6fb50adfe06c9d8489a86f373d46e20
parent0bd7be715727db0ca9a6e63622f3327fec5a21c6 (diff)
downloadxkeyboard-config-0fcce674c5398950e8b00495b70236a473cb425d.tar.gz
xkeyboard-config-0fcce674c5398950e8b00495b70236a473cb425d.tar.bz2
xkeyboard-config-0fcce674c5398950e8b00495b70236a473cb425d.zip
dropping translation from base.xml
-rw-r--r--ChangeLog2
-rw-r--r--configure.in11
-rw-r--r--po/ChangeLog4
-rw-r--r--rules/Makefile.am2
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 <bug-gnu-gettext@gnu.org>
+
+ * 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@