summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2006-05-05 13:44:47 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2006-05-05 13:44:47 +0000
commitefff028ebe919dd259de490829476e84c0a44d1b (patch)
tree11302fdef98fd0776871ce7411d44b8eec72b2f0
parentc66ffda7e1221b96e38e9e83187425d7a7209280 (diff)
downloadgconf-efff028ebe919dd259de490829476e84c0a44d1b.tar.gz
Revert the LINGUAS patch until we have branched. Remove temporarily.GNOME_2_14_BRANCHPOINT
2006-05-05 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Revert the LINGUAS patch until we have branched. * po/LINGUAS: Remove temporarily.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--po/LINGUAS70
3 files changed, 6 insertions, 71 deletions
diff --git a/ChangeLog b/ChangeLog
index 1daf68e1..9ffd60c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-05-05 Kjartan Maraas <kmaraas@gnome.org>
+ * configure.in: Revert the LINGUAS patch until we have branched.
+ * po/LINGUAS: Remove temporarily.
+
+2006-05-05 Kjartan Maraas <kmaraas@gnome.org>
+
* gconf/gconf-internals.c: (read_current_server): Fix a
NULL pointer deref reported by Coverity. Patch from Pascal
Terjan. Closes bug #338617.
diff --git a/configure.in b/configure.in
index ac64ab14..1675c229 100644
--- a/configure.in
+++ b/configure.in
@@ -199,7 +199,7 @@ AC_CHECK_HEADER(ldap.h, [
AC_SUBST(LDAP_LIBS)
AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS")
-IT_PROG_INTLTOOL([0.34.90])
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko ku lt lv mk ml mn ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi xh yi zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index afa57c55..00000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,70 +0,0 @@
-# please keep this list sorted alphabetically
-#
-am
-ar
-az
-be
-bg
-bn
-bs
-ca
-cs
-cy
-da
-de
-el
-en_CA
-en_GB
-es
-et
-eu
-fa
-fi
-fr
-ga
-gl
-gu
-he
-hi
-hr
-hu
-id
-is
-it
-ja
-ko
-ku
-lt
-lv
-mk
-ml
-mn
-ms
-nb
-ne
-nl
-nn
-no
-pa
-pl
-pt
-pt_BR
-ro
-ru
-rw
-sk
-sl
-sq
-sr
-sr@Latn
-sv
-ta
-th
-tr
-uk
-vi
-xh
-yi
-zh_CN
-zh_HK
-zh_TW