r3736 - tzdata/trunk/debian
Author: schizo
Date: 2009-08-04 02:56:59 +0000 (Tue, 04 Aug 2009)
New Revision: 3736
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/postinst
tzdata/trunk/debian/rules
Log:
Clarify some wording in postinst and debconf template. closes: #507164.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2009-08-03 17:50:32 UTC (rev 3735)
+++ tzdata/trunk/debian/changelog 2009-08-04 02:56:59 UTC (rev 3736)
@@ -1,3 +1,9 @@
+tzdata (2009k-3) UNRELEASED; urgency=low
+
+ * Clarify some wording in postinst and debconf template. closes: #507164.
+
+ -- Clint Adams <schizo@debian.org> Mon, 03 Aug 2009 22:46:22 -0400
+
tzdata (2009k-2) unstable; urgency=low
[ Christian Perrier ]
Modified: tzdata/trunk/debian/postinst
===================================================================
--- tzdata/trunk/debian/postinst 2009-08-03 17:50:32 UTC (rev 3735)
+++ tzdata/trunk/debian/postinst 2009-08-04 02:56:59 UTC (rev 3736)
@@ -10,12 +10,12 @@
db_version 2.0
if [ "$1" = configure ]; then
- # If the user prefers to manage the timezone by itself, let him doing that.
+ # If the user prefers to manage the time zone by itself, let him doing that.
if ! [ -e /etc/timezone ] && [ -z "$DEBCONF_RECONFIGURE" ] ; then
db_stop
echo
- echo "User defined timezone, leaving /etc/localtime unchanged."
+ echo "User defined time zone, leaving /etc/localtime unchanged."
else
# Get the values from debconf
@@ -25,14 +25,14 @@
db_get tzdata/Zones/$AREA && ZONE="$RET"
db_stop
- # Update the timezone
+ # Update the time zone
echo $AREA/$ZONE > /etc/timezone
cp -f /usr/share/zoneinfo/$AREA/$ZONE /etc/localtime.dpkg-new && \
mv -f /etc/localtime.dpkg-new /etc/localtime
which restorecon >/dev/null 2>&1 && restorecon /etc/localtime
echo
- echo "Current default timezone: '$AREA/$ZONE'"
+ echo "Current default time zone: '$AREA/$ZONE'"
fi
# Show the new setting to the user
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2009-08-03 17:50:32 UTC (rev 3735)
+++ tzdata/trunk/debian/rules 2009-08-04 02:56:59 UTC (rev 3736)
@@ -106,7 +106,7 @@
echo -n "__Choices: " ; \
echo "$(TEMPLATES_AREAS)" | sed -e 's# #, #g' -e 's#, $$##' ; \
echo "_Description: Geographic area:" ; \
- echo " Please select the geographic area you live in. Subsequent" ; \
+ echo " Please select the geographic area in which you live. Subsequent" ; \
echo " configuration questions will narrow this down by presenting a list of" ; \
echo " cities, representing the time zones in which they are located." ; \
echo ; \
@@ -124,7 +124,7 @@
egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu)$$' | \
sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \
echo "_Description: Time zone:" ; \
- echo " Please select the time zone corresponding to your location." ; \
+ echo " Please select the city or region corresponding to your time zone." ; \
echo ; \
done ) > $(TEMPLATES_FILE)
debconf-updatepo
Reply to: