summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS3
-rw-r--r--configure.ac7
-rw-r--r--po/LINGUAS75
4 files changed, 86 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 12c9a80b..fd2bc1c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
-2006-04-21 Brian Cameron <brian.cameron@sun.com>
+2006-04-25 Brian Cameron <brian.cameron@sun.com>
+
+ * configure.ac, po/LINGUAS: Updating 2.15 branch with the new
+ po/LINGUAS.
+
+2006-04-25 Brian Cameron <brian.cameron@sun.com>
* Release 2.14.4:
* NEWS: Updated.
* configure.ac: Update to new release version.
* po/LINGUAS: Revert to old version.
-2006-04-14 Brian Cameron <brian.cameron@sun.com>
+2006-04-24 Brian Cameron <brian.cameron@sun.com>
* Release 2.14.3:
* NEWS: Updated.
diff --git a/NEWS b/NEWS
index 351d188c..13f94a63 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ Ahh news...
- Backing out LINGUAS change which is only for the 2.15 release.
+- Translation updates (Josep Puigdemont Casamaj\303\263, Daniel Nylander,
+ Ignacio Casal Quinteiro, Alexander Shopov)
+
2.14.3 stuff:
- Fixed bug where gdmchooser was ignoring hosts passed in on the command line.
diff --git a/configure.ac b/configure.ac
index 90124975..69ea0bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ AC_PREREQ(2.52)
AC_INIT(daemon/gdm.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.14.4)
+AM_INIT_AUTOMAKE(gdm,2.14.3)
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
-AC_PROG_INTLTOOL([0.28])
+IT_PROG_INTLTOOL([0.34.90])
GNOME_DOC_INIT
@@ -217,8 +217,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
AC_SUBST(GETTEXT_PACKAGE)
dnl ## internationalization support
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS"`"
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
AM_GLIB_GNU_GETTEXT
EXTRA_DAEMON_LIBS=""
@@ -1106,7 +1104,6 @@ config/Init
config/PreSession
config/PostSession
config/gdmprefetchlist
-config/ssh.desktop
gdm-stop
gdm-restart
gdm-safe-restart
diff --git a/po/LINGUAS b/po/LINGUAS
index 5dd6380f..a3f841a9 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,76 @@
# please keep this list sorted alphabetically
#
-af am ar az be bg bn bs ca cs cy da de dz el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka ko ku lt lv mi mk ml mn mr ms nb ne nl nn nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_HK zh_TW zu
+af
+am
+ar
+az
+be
+bg
+bn
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+is
+it
+ja
+ka
+ko
+ku
+lt
+lv
+mi
+mk
+ml
+mn
+mr
+ms
+nb
+ne
+nl
+nn
+nso
+pa
+pl
+pt
+pt_BR
+ro
+ru
+rw
+sk
+sl
+sq
+sr
+sr@Latn
+sv
+ta
+th
+tr
+uk
+vi
+wa
+xh
+zh_CN
+zh_HK
+zh_TW
+zu