[tz] Further un-ASCII-fication and typos

Paul Eggert eggert at cs.ucla.edu
Wed Jun 25 08:06:30 UTC 2014


Thanks for those fixes.  I installed them into the experimental version 
on github.  That's pretty good, fixing a spelling error in French -- I 
would not have caught that.  You inspired me to find some more spelling 
mistakes, one in Spanish, plus a few accent fixes.  I applied the 
attached patch too.  I'm sure there are more errors like that.
-------------- next part --------------
From 363a1be6dfb3c0e5398b28cb4f0f3778157ddbe7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Wed, 25 Jun 2014 01:02:29 -0700
Subject: [PATCH] More spelling and accent fixes.

---
 NEWS         |  3 +++
 africa       |  6 +++---
 antarctica   |  2 +-
 asia         |  8 ++++----
 europe       | 10 +++++-----
 southamerica | 16 ++++++++--------
 usno1989     |  6 +++---
 usno1989a    |  2 +-
 usno1995     |  2 +-
 usno1997     |  2 +-
 usno1998     |  2 +-
 zic.c        |  2 +-
 12 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/NEWS b/NEWS
index cb3e3c2..0c39f71 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ Unreleased, experimental changes
 
     Commentary about permanent Antarctic bases has been updated.
 
+    Several typos have been corrected.  (Thanks to Tim Parenti for
+    contributing some of these fixes.)
+
 
 Release 2014e - 2014-06-12 21:53:52 -0700
 
diff --git a/africa b/africa
index 7f503a9..86d6593 100644
--- a/africa
+++ b/africa
@@ -611,7 +611,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+# de l’heure d’été" stating that DST in Mauritius starting on October 26
 # and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
 
@@ -677,7 +677,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
 # http://en.afrik.com/news11892.html
@@ -696,7 +696,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # the changes occur at midnight:
 #
 # Saturday night May 31st at midnight (which in French is to be
-# intrepreted as the night between Saturday and Sunday)
+# interpreted as the night between Saturday and Sunday)
 # Sunday night the 28th at midnight
 #
 # Seeing that the 28th is Monday, I am guessing that she intends to say
diff --git a/antarctica b/antarctica
index 70d4dbe..af8475c 100644
--- a/antarctica
+++ b/antarctica
@@ -294,7 +294,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
diff --git a/asia b/asia
index 6610ac7..3ee8fdc 100644
--- a/asia
+++ b/asia
@@ -280,7 +280,7 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 # From Bob Devine (1988-01-28):
 # No they don't.  See TIME mag, 1986-02-17 p.52.  Even though
 # China is across 4 physical time zones, before Feb 1, 1986 only the
-# Peking (Bejing) time zone was recognized.  Since that date, China
+# Peking (Beijing) time zone was recognized.  Since that date, China
 # has two of 'em - Peking's and Urumqi (named after the capital of
 # the Xinjiang Uyghur Autonomous Region).  I don't know about DST for it.
 #
@@ -2336,7 +2336,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 # twice in 1996 and probably SL Government or its standardization
 # agencies never declared an abbreviation as a national standard.
 #
-# I recollect before the recent change the government annoucemments
+# I recollect before the recent change the government announcements
 # mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
 # Time and no mention was made about the abbreviation.
 #
@@ -2346,7 +2346,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 # item....
 #
 # Within Sri Lanka I think LKT is well known among computer users and
-# adminsitrators.  In my opinion SLT may not be a good choice because the
+# administrators.  In my opinion SLT may not be a good choice because the
 # nation's largest telcom / internet operator Sri Lanka Telcom is well
 # known by that abbreviation - simply as SLT (there IP domains are
 # slt.lk and sltnet.lk).
@@ -2464,7 +2464,7 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
 # shown above match up with midnight in Syria.
 
 # From Arthur David Olson (2008-03-18):
-# My buest guess at a Syrian rule is "the Friday nearest April 1";
+# My best guess at a Syrian rule is "the Friday nearest April 1";
 # coding that involves either using a "Mar Fri>=29" construct that old time zone
 # compilers can't handle  or having multiple Rules (a la Israel).
 # For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
diff --git a/europe b/europe
index 966980d..67518b0 100644
--- a/europe
+++ b/europe
@@ -491,7 +491,7 @@ Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
 #
 # I found what is probably a typo of 2:00 which should perhaps be 2:00s
 # in the C-Eur rule from tz database version 2008d (this part was
-# corrected in version 2008d). The circumstancial evidence is simply the
+# corrected in version 2008d). The circumstantial evidence is simply the
 # tz database itself, as seen below:
 #
 # Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15  0:01
@@ -596,10 +596,10 @@ Zone	EET		2:00	EU	EE%sT
 # From Markus Kuhn (1996-07-12):
 # The official German names ... are
 #
-#	Mitteleuropaeische Zeit (MEZ)         = UTC+01:00
-#	Mitteleuropaeische Sommerzeit (MESZ)  = UTC+02:00
+#	Mitteleuropäische Zeit (MEZ)         = UTC+01:00
+#	Mitteleuropäische Sommerzeit (MESZ)  = UTC+02:00
 #
-# as defined in the German Time Act (Gesetz ueber die Zeitbestimmung (ZeitG),
+# as defined in the German Time Act (Gesetz über die Zeitbestimmung (ZeitG),
 # 1978-07-25, Bundesgesetzblatt, Jahrgang 1978, Teil I, S. 1110-1111)....
 # I wrote ... to the German Federal Physical-Technical Institution
 #
@@ -715,7 +715,7 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
 # From Paul Eggert (1997-07-02):
 # Entries from 1918 through 1991 are taken from:
 #	Annuaire de L'Observatoire Royal de Belgique,
-#	Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe annee, 1991
+#	Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe année, 1991
 #	(Imprimerie HAYEZ, s.p.r.l., Rue Fin, 4, 1080 BRUXELLES, MCMXC),
 #	pp 8-9.
 # LMT before 1892 was 0:17:30, according to the official journal of Belgium:
diff --git a/southamerica b/southamerica
index 245b2e6..e518956 100644
--- a/southamerica
+++ b/southamerica
@@ -157,7 +157,7 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 #
 # From Jesper Nørgaard Welen (2007-12-26)
 # The last hurdle of Argentina DST is over, the proposal was approved in
-# the lower chamber too (Deputados) with a vote 192 for and 2 against.
+# the lower chamber too (Diputados) with a vote 192 for and 2 against.
 # By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
 # the original scanned proposal, where the dates and the zero hours are
 # clear and unambiguous...This is the article about final approval:
@@ -206,12 +206,12 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
 # (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
 #
-# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
-# oficial, decision que estaba en estudio para su implementacion el
-# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
-# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
-# la modificacion del huso horario, ya que 2009 nos encuentra con
-# crecimiento en la produccion y distribucion energetica."
+# "Por el momento, el Gobierno Nacional resolvió no modificar la hora
+# oficial, decisión que estaba en estudio para su implementación el
+# domingo 18 de octubre. Desde el Ministerio de Planificación se anunció
+# que la Argentina hoy, en estas condiciones meteorológicas, no necesita
+# la modificación del huso horario, ya que 2009 nos encuentra con
+# crecimiento en la producción y distribución energética."
 
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
@@ -1306,7 +1306,7 @@ Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
 
 # From Arthur David Olson (2011-06-15):
 # use links for places with new iso3166 codes.
-# The name "Lower Prince's Quarter" is both longer than fourteen charaters
+# The name "Lower Prince's Quarter" is both longer than fourteen characters
 # and contains an apostrophe; use "Lower_Princes" below.
 
 Link	America/Curacao	America/Lower_Princes	# Sint Maarten
diff --git a/usno1989 b/usno1989
index 76f51fd..72f1a99 100644
--- a/usno1989
+++ b/usno1989
@@ -28,7 +28,7 @@ AUSTRALIA  SOUTH    9.5H AHEAD OF UTC  ADELAIDE
 AUSTRALIA                              INCLUDING BROKEN HILL, NSW
 AUSTRALIA  SOUTH   10.5H AHEAD OF UTC  ADELAIDE OCT 30, '88-MAR
 AUSTRALIA  SOUTH                       18, '89 INCLUDING BROKEN
-AUSTRIALIA SOUTH                       HILL, NSW
+AUSTRALIA  SOUTH                       HILL, NSW
 AUSTRALIA  QUEENL  10 H  AHEAD OF UTC
 AUSTRALIA  NSW     10 H  AHEAD OF UTC  SYDNEY
 AUSTRALIA  NSW     11 H  AHEAD OF UTC  SYDNEY OCT 30, '88-MAR 18,
@@ -142,8 +142,7 @@ EL SALVADOR         6 H  BEHIND UTC
 ENGLAND             ON UTC             (WALES, SCOTLAND, N.I.,
 ENGLAND                                CH. IS.)
 ENGLAND             1 H  AHEAD OF UTC  MAR 27 - OCT 22
-ENEZUELA           4 H  BEHIND UTC
-EQUITORIAL GUINEA   1 H  AHEAD OF UTC
+EQUATORIAL GUINEA   1 H  AHEAD OF UTC
 ETHIOPIA            3 H  AHEAD OF UTC
 FALKLAND ISLANDS    4 H  BEHIND UTC
 FALKLAND ISLANDS    3 H  BEHIND UTC    SEP 11, '88-APR 15, '89
@@ -433,6 +432,7 @@ VANUATU            12 H  AHEAD OF UTC  SEP 25, '88-MAR 25, '89
 VANUATU                                (ESTIMATED)
 VATICAN             1 H  AHEAD OF UTC
 VATICAN             2 H  AHEAD OF UTC  MAR 27 - SEP 24
+VENEZUELA           4 H  BEHIND UTC
 VIETNAM             7 H  AHEAD OF UTC
 VIRGIN ISLANDS      4 H  BEHIND UTC    ST.CROIX, ST.THOMAS,
 VIRGIN ISLANDS                         ST.JOHN
diff --git a/usno1989a b/usno1989a
index b26a9d5..889f8c4 100644
--- a/usno1989a
+++ b/usno1989a
@@ -28,7 +28,7 @@ AUSTRALIA  SOUTH    9.5H AHEAD OF UTC  ADELAIDE
 AUSTRALIA                              INCLUDING BROKEN HILL, NSW
 AUSTRALIA  SOUTH   10.5H AHEAD OF UTC  ADELAIDE OCT 30, '88-MAR
 AUSTRALIA  SOUTH                       18, '89 INCLUDING BROKEN
-AUSTRIALIA SOUTH                       HILL, NSW
+AUSTRALIA  SOUTH                       HILL, NSW
 AUSTRALIA  QUEENL  10 H  AHEAD OF UTC
 AUSTRALIA  NSW     10 H  AHEAD OF UTC  SYDNEY
 AUSTRALIA  NSW     11 H  AHEAD OF UTC  SYDNEY OCT 30, '88-MAR 18,
diff --git a/usno1995 b/usno1995
index 5641754..9b02616 100644
--- a/usno1995
+++ b/usno1995
@@ -30,7 +30,7 @@ Australia South: +9.5 hours (Local summer +10.5 hours)
 Australia Tasmania: +10 hours (Local summer +11 hours)
 Australia Western: +8 hours
 Austria: +1 hours (Local summer +2 hours)
-Azerbajian: +3 hours
+Azerbaijan: +3 hours
 Azores: -1 hours (Local summer 0 hours)
 Bahamas: -5 hours (Local summer -4 hours)
 Bahrain: +3 hours
diff --git a/usno1997 b/usno1997
index 0fa4a73..0d5e436 100644
--- a/usno1997
+++ b/usno1997
@@ -30,7 +30,7 @@ Australia South: +9.5 hours (Local summer +10.5 hours)
 Australia Tasmania: +10 hours (Local summer +11 hours)
 Australia Western: +8 hours
 Austria: +1 hours (Local summer +2 hours)
-Azerbajian: +3 hours
+Azerbaijan: +3 hours
 Azores: -1 hours (Local summer 0 hours)
 Bahamas: -5 hours (Local summer -4 hours)
 Bahrain: +3 hours
diff --git a/usno1998 b/usno1998
index 862f252..08a0070 100644
--- a/usno1998
+++ b/usno1998
@@ -30,7 +30,7 @@ Australia South: +9.5 hours (Local summer +10.5 hours)
 Australia Tasmania: +10 hours (Local summer +11 hours)
 Australia Western: +8 hours
 Austria: +1 hours (Local summer +2 hours)
-Azerbajian: +3 hours
+Azerbaijan: +3 hours
 Azores: -1 hours (Local summer 0 hours)
 Bahamas: -5 hours (Local summer -4 hours)
 Bahrain: +3 hours
diff --git a/zic.c b/zic.c
index 0b0ca83..4cfa6cf 100644
--- a/zic.c
+++ b/zic.c
@@ -122,7 +122,7 @@ static void	adjleap(void);
 static void	associate(void);
 static void	dolink(const char * fromfield, const char * tofield);
 static char **	getfields(char * buf);
-static zic_t	gethms(const char * string, const char * errstrng,
+static zic_t	gethms(const char * string, const char * errstring,
 		       int signable);
 static void	infile(const char * filename);
 static void	inleap(char ** fields, int nfields);
-- 
1.9.1


More information about the tz mailing list