summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-02-23 15:27:51 +0000
committerChris Lumens <clumens@redhat.com>2007-02-23 15:27:51 +0000
commitdce5ff537264e8e87d0eea930b8df71e0a5d5a7e (patch)
treef0f79f3cbc08e2a6f3f222469cf1db2c2115eaa1
parent95690672bf83f5395640e93d770b873acb13b46b (diff)
Don't include /usr/share/zoneinfo/zone.tab for translation anymore (#229729).
-rw-r--r--ChangeLog7
-rw-r--r--po/Makefile4
-rwxr-xr-xscripts/upd-instroot3
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 899d6809e..77674f249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-23 Chris Lumens <clumens@redhat.com>
+
+ * po/Makefile: Don't include /usr/share/zoneinfo/zone.tab for
+ translation anymore (#229729).
+ * scripts/upd-instroot: Include system-config-date translations in
+ the base KEEPFILES list for text mode.
+
2007-02-22 Chris Lumens <clumens@redhat.com>
* yuminstall.py (YumBackend.doPreInstall): If /etc/mtab exists,
diff --git a/po/Makefile b/po/Makefile
index 116c3b89e..581444285 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -17,15 +17,13 @@ POTFILES = ../anaconda ../*.py ../iw/*.py ../textw/*.py \
../installclasses/*.py \
../loader2/*.c
-NONPOTFILES = /usr/share/zoneinfo/zone.tab \
- ../lang-table
+NONPOTFILES = ../lang-table
all: $(FMTCATALOGS)
$(NLSPACKAGE).pot: $(POTFILES) $(NONPOTFILES) glade-po
xgettext --default-domain=$(NLSPACKAGE) \
--keyword=_ --keyword=N_ $(POTFILES) tmp/*.h
- cat /usr/share/zoneinfo/zone.tab | cut -f4 | grep "^[a-zA-Z]" | sort -u | while read line; do echo -e "\n#. generated from zone.tab\nmsgid \"$$line\"\nmsgstr \"\""; done >> $(NLSPACKAGE).po
cat ../lang-table | cut -f1 | while read line; do echo -e "\n#. generated from lang-table\nmsgid \"$$line\"\nmsgstr \"\""; done >> $(NLSPACKAGE).po
if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
rm -f $(NLSPACKAGE).po; \
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 63278b25e..aa80d1d5c 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -121,7 +121,7 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
libstdc++ expat libgcc readline ncurses yum python-sqlite
python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
db4 rhpxl xorg-x11-server-Xorg libuser system-config-date
- yum-metadata-parser gfs2-utils libvolume_id nash
+ yum-metadata-parser gfs2-utils libvolume_id nash
libdhcp libnl libdhcp6client libdhcp4client
device-mapper device-mapper-libs dmraid
python-pyblock mkinitrd libbdevid libbdevid-python"
@@ -445,6 +445,7 @@ usr/lib/yaboot/ofboot
usr/lib/yaboot/yaboot
usr/libexec/convertdb1
usr/share/locale/*/LC_MESSAGES/anaconda.mo
+usr/share/locale/*/LC_MESSAGES/system-config-date.mo
usr/share/locale/locale.alias
usr/sbin/anaconda
usr/sbin/ddcprobe