[BZ #495]

	* locales/st_ZA: Updates and corrections.
	Patch by Dwayne Bailey <dwayne@translate.org.za>.

5 files changed, 335 insertions, 124 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5572d44164..08c3be2ad5 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-24  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #495]
+	* locales/st_ZA: Updates and corrections.
+	Patch by Dwayne Bailey <dwayne@translate.org.za>.
+
 	[BZ #493]
 	* locales/xh_ZA: Updates and corrections.
 	Patch by Dwayne Bailey <dwayne@translate.org.za>.
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index b5699bc77b..ca1fdfb36f 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -1,33 +1,45 @@
 escape_char  /
 comment_char  %
 
-% Afrikaans language locale for South Africa
-% Source: RAP
-% Email: schalkc@ntaba.co.za
-% Tel: +27 12 3293397
-% Fax: +27 12 3293397
-% Language: af
-% Territory: ZA
-% Revision: 0.2
-% Date: 1999-09-28
-% Users: general
-% Repertoiremap: mnemonic.ds
-% Charset: ISO-8859-1
-% Distribution and use is free, also
-% for commercial purposes.
+% ChangeLog
+% 1.2 (2004-10-28):
+%      2004-10-28 Dwayne Bailey <dwayne@translate.org.za>
+%        - Corrected country_name should be "Suid-Afrika"
+%      2004-10-27 Dwayne Bailey <dwayne@translate.org.za>
+%        - Change decimal and thousand separator to match common convention of
+%          [comma]==thousand, [point]==decimal.  Thus copy en_ZA
+%        - Add country_post, lang_lib
+%        - abmon March: Mar -> Mrt
+%        - name_* corrected all capitalisation
+%        - Add Translate.org.za to clarify "source"
+%        - Update all contact details
+%        - Change yesexpr to also accept yY
+%        - Update yes/noexpr to remove .*
+%      2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added name_miss
+% 1.1 (2003-04-23):
+%      2003-04-23 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added LC_MEASUREMENT to LC_IDENTIFICATION
+%        - PAPER, TELEPHONE and MEASUREMENT copy en_ZA
+%        - Added "^" to yesexpr and noexpr ie "^[nN].*"
+%        - Change maintainer to Zuza Software Foundation
+%        - Add all missing items in LC_ADDRESS
+%        - Add all name_* to LC_NAME
+%        - Add various comments explaining items
+
 
 LC_IDENTIFICATION
 title      "Afrikaans locale for South Africa"
-source     "RAP"
-address    ""
-contact    ""
-email      "bug-glibc-locales@gnu.org"
-tel        ""
-fax        ""
+source     "Zuza Software Foundation (Translate.org.za)"
+address    "Box 28364, Sunnyside, 0132, South Africa"
+contact    "Dwayne Bailey"
+email      "dwayne@translate.org.za"
+tel        "+27 12 343 0389"
+fax        "+27 12 343 0389"
 language   "Afrikaans"
 territory  "South Africa"
-revision   "1.0"
-date       "2000-06-29"
+revision   "1.2"
+date       "2004-10-28"
 %
 category  "af_ZA:2000";LC_IDENTIFICATION
 category  "af_ZA:2000";LC_CTYPE
@@ -35,11 +47,12 @@ category  "af_ZA:2000";LC_COLLATE
 category  "af_ZA:2000";LC_TIME
 category  "af_ZA:2000";LC_NUMERIC
 category  "af_ZA:2000";LC_MONETARY
-category  "af_ZA:2000";LC_MESSAGES
-category  "af_ZA:2000";LC_PAPER
+category  "af_ZA:2003";LC_MESSAGES
+category  "af_ZA:2003";LC_PAPER
 category  "af_ZA:2000";LC_NAME
-category  "af_ZA:2000";LC_ADDRESS
-category  "af_ZA:2000";LC_TELEPHONE
+category  "af_ZA:2003";LC_ADDRESS
+category  "af_ZA:2003";LC_TELEPHONE
+category  "af_ZA:2003";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -48,39 +61,27 @@ copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "en_DK"
+copy "iso14651_t1"
 END LC_COLLATE
 
-
 LC_MONETARY
-int_curr_symbol      "<U005A><U0041><U0052><U0020>"
-currency_symbol      "<U0052>"
-mon_decimal_point    "<U002C>"
-mon_thousands_sep    "<U002E>"
-mon_grouping         3;3
-positive_sign        ""
-negative_sign        "<U002D>"
-int_frac_digits      2
-frac_digits          2
-p_cs_precedes        1
-p_sep_by_space       0
-n_cs_precedes        1
-n_sep_by_space       0
-p_sign_posn          1
-n_sign_posn          1
+copy "en_ZA"
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point        "<U002C>"
-thousands_sep        "<U002E>"
-grouping             3;3
+copy "en_ZA"
 END LC_NUMERIC
 
 LC_TIME
+% abday - The abbreviations for the week days:
+% - So, Ma, Di, Wo, Do, Vr, Sa
 abday       "<U0053><U006F>";"<U004D><U0061>";/
             "<U0044><U0069>";"<U0057><U006F>";/
             "<U0044><U006F>";"<U0056><U0072>";/
             "<U0053><U0061>"
+
+% day - The full names of the week days:
+% Sondag, Maandag, Dinsdag, Woensdag, Donderdag, Vrydag, Saterdag
 day         "<U0053><U006F><U006E><U0064><U0061><U0067>";/
             "<U004D><U0061><U0061><U006E><U0064><U0061><U0067>";/
             "<U0044><U0069><U006E><U0073><U0064><U0061><U0067>";/
@@ -88,12 +89,19 @@ day         "<U0053><U006F><U006E><U0064><U0061><U0067>";/
             "<U0044><U006F><U006E><U0064><U0065><U0072><U0064><U0061><U0067>";/
             "<U0056><U0072><U0079><U0064><U0061><U0067>";/
             "<U0053><U0061><U0074><U0065><U0072><U0064><U0061><U0067>"
+
+% abmon - The abbreviations for the months 
+% - Jan, Feb, Mrt, Apr, Mei, Jun, Jul, Aug, Sep, Okt, Nov, Des
 abmon       "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
-            "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
+            "<U004D><U0072><U0074>";"<U0041><U0070><U0072>";/
             "<U004D><U0065><U0069>";"<U004A><U0075><U006E>";/
             "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
             "<U0053><U0065><U0070>";"<U004F><U006B><U0074>";/
             "<U004E><U006F><U0076>";"<U0044><U0065><U0073>"
+
+% mon - The full names of the months - 
+% Januarie, Februarie, Maart, April, Mei, Junie
+% Julie, Augustus, September, Oktober, November, Desember
 mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
             "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
             "<U004D><U0061><U0061><U0072><U0074>";/
@@ -106,50 +114,170 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
             "<U004F><U006B><U0074><U006F><U0062><U0065><U0072>";/
             "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
             "<U0044><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
+
+% Abbreviated date and time representation to be referenced by the "%c" field descriptor -
+%
+% "%a" (short weekday name),
+% "%d" (day of month as a decimal number),
+% "%b" (short month name),
+% "%Y" (year with century as a decimal number),
+% "%T" (24-hour clock time in format HH:MM:SS),
+% "%Z" (Time zone name)
 d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+
+% Date representation to be referenced by the "%x" field descriptor -
+% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000).
+d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
+
+% Time representation to be referenced by the "%X" field descriptor -
+% "%T" (24-hour clock time in format HH:MM:SS)
 t_fmt       "<U0025><U0054>"
+
+% Define representation of ante meridian and post maritime strings -
+% The "" mean 'default to "AM" and "PM".
 am_pm       "<U0056><U004D>";"<U004E><U004D>"
+
+% Define time representation in 12-hour format with "am_pm", to be referenced by the "%r"
+% The "" means that this format is not supported.
 t_fmt_ampm  ""
+
+% Date representation not described in ISO/IEC 14652. Comes out as -
+% "%a %b %e %H:%M:%S %Z %Y" which is default "date" command output
+%
+% %a - abbreviated weekday name,
+% %b - abbreviated month name,
+% %e - day of month as a decimal number with leading space (1 to 31),
+% %H - hour (24-hour clock) as a decimal number (00 to 23),
+% %M - minute as a decimal number (00 to 59),
+% %S - seconds as a decimal number (00 to 59),
+% %Z - time-zone name,
+% %Y - year with century as a decimal number,e.g. 2001.
 date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<U005E><U005B><U006A><U004A><U005D><U002E><U002A>"
-noexpr      "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+% The affirmative response -
+% "^[jJyY]"
+yesexpr     "<U005E><U005B><U006A><U004A><U0079><U0059><U005D>"
+
+% The negative response -
+% "^[nN]"
+noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 END LC_MESSAGES
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+copy "en_ZA"
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0032><U0037>"
+copy "en_ZA"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+copy "en_ZA"
 END LC_MEASUREMENT
 
 LC_NAME
+% Format for addressing a person.
+% "%d%t%g%t%m%t%f"
+%
+% "Salutation",
+% "Empty string, or <Space>",
+% "First given name",
+% "Empty string, or <Space>",
+% "Middle names",
+% "Empty string, or <Space>",
+% "Clan names"
 name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 <U0025><U006D><U0025><U0074><U0025><U0066>"
+
+% General salutation for any sex
+% (no term)
+name_gen    ""
+
+% Salutation for unmarried females
+% "mej"
+name_miss   "<U006D><U0065><U006A>"
+ 
+% Salutation for males
+% "mnr"
+name_mr     "<U006D><U006E><U0072>"
+
+% Salutation for married females
+% "mev"
+name_mrs    "<U006D><U0065><U0076>"
+
+% Salutation valid for all females
+% "me"
+name_ms     "<U006D><U0065>"
 END LC_NAME
 
 LC_ADDRESS
+% Representation of postal addresses (minus the addressee's name) in South
+% Africa. (Ignored for now)
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+%
+% "firm name",
+% "end of line",
+% "C/O address",
+% "end of line",
+% "department name",
+% "Building name",
+% "end of line",
+% "street or block name",
+% "space",
+% "house number or designation",
+% "space",
+% "floor number",
+% "space",
+% "room number, door designation",
+% "end of line",
+% "postal code",
+% "space",
+% "town, city",
+% "end of line",
+% "country designation for the <country_post> keyword",
+% "end of line
 postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+
+% Country name in Afrikaans - "Suid-Afrika"
+country_name  "<U0053><U0075><U0069><U0064><U002D>/
+<U0041><U0066><U0072><U0069><U006B><U0061>"
+
+% Language name in Afrikaans - "Afrikaans"
+lang_name     "<U0041><U0066><U0072><U0069><U006B><U0061><U0061><U006E><U0073>"
+
+% CEPT MAILCODES are suggested
+% Alternatively use the code found on your countries postal item tracking number
+% "ZA"
+country_post   "<U005A><U0041>"
+
+% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
+% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
+% "ZA"
+country_car   "<U005A><U0041>"
+
+% ISO 2108
+% http://www.isbn-international.org/html/prefix/prefa.htm
+country_isbn  0
+
+% ISO 639 language abbreviations:
+% 639-1 2 letter, 639-2 3 letter terminology
+% http://www.loc.gov/standards/iso639-2/englangn.html
+% "af", "afr", "afr"
+lang_ab       "<U0061><U0066>"
+lang_term     "<U0061><U0066><U0072>"
+lang_lib      "<U0061><U0066><U0072>"
+
+% ISO 3166 country number and 2 and 3 letter abbreviations
+% http://www.unicode.org/onlinedat/countries.html
+% "ZA", "ZAF"
 country_ab2   "<U005A><U0041>"
 country_ab3   "<U005A><U0041><U0046>"
 country_num   710
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 004d8d7181..798de4cf66 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -2,22 +2,32 @@ escape_char  /
 comment_char  %
 
 % ChangeLog
+% 0.2 (2004-11-03):
+%    2004-11-02 Dwayne Bailey <dwayne@translate.org.za>
+%      - Change all contact information
+%      - Change %e in date_fmt and d_t_fmt to %-e
+%      - Remove .* from yes/noexpr
+%    2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%      - Added country_ab2/3, country_num
+%      - Added country_car
+%    2004-03-29 Dwayne Bailey <dwayne@translate.org.za>
+%      - Added lang_ab and lang_term
 % 0.1 (2003-04-21):
 %   - Initial Sotho locale for South Africa
 %     by Zuza Software Foundation
 
 LC_IDENTIFICATION
 title      "Sotho locale for South Africa"
-source     "Zuza Software Foundation"
-address    "PO Box 13412, Mowbray, 7705, South Africa"
+source     "Zuza Software Foundation (Translate.org.za)"
+address    "PO Box 28364, Sunnyside, 0132, South Africa"
 contact    "Dwayne Bailey"
 email      "dwayne@translate.org.za"
-tel        "+27 (0)21 448 9265"
-fax        "+27 (0)21 448 9574"
+tel        "+27 12 343 0389"
+fax        "+27 12 343 0389"
 language   "Sotho"
 territory  "South Africa"
-revision   "0.1"
-date       "2003-04-21"
+revision   "0.2"
+date       "2004-11-03"
 %
 category  "st_ZA:2003";LC_IDENTIFICATION
 category  "st_ZA:2003";LC_CTYPE
@@ -101,10 +111,11 @@ mon         "<U0050><U0068><U0065><U0073><U0065><U006B><U0067><U006F><U006E><U00
             "<U0054><U0073><U0068><U0069><U0074><U0077><U0065>"
  
 % Abreviated date and time representation to be referenced by the "%c" field descriptor -
-d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-%
+d_t_fmt     "<U0025><U0061><U0020><U0025><U002D><U0065><U0020><U0025><U0062>/
+<U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+
 % "%a" (short weekday name),
-% "%d" (day of month as a decimal number),
+% "%-e" (day of month as a decimal number),
 % "%b" (short month name),
 % "%Y" (year with century as a decimal number),
 % "%T" (24-hour clock time in format HH:MM:SS),
@@ -127,14 +138,14 @@ t_fmt_ampm  ""
 % The "" means that this format is not supported.
  
 % Date representation not described in ISO/IEC 14652. Comes out as -
-% "%a %b %e %H:%M:%S %Z %Y" which is default "date" command output
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+% "%a %b %-e %H:%M:%S %Z %Y" which is default "date" command output
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U002D><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 %
 % %a - abbreviated weekday name,
 % %b - abreviated month name,
-% %e - day of month as a decimal number with leading space (1 to 31),
+% %-e - day of month as a decimal number without leading space (1 to 31),
 % %H - hour (24-hour clock) as a decimal number (00 to 23),
 % %M - minute as a decimal number (00 to 59),
 % %S - seconds as a decimal number (00 to 59),
@@ -146,12 +157,12 @@ END LC_TIME
 LC_MESSAGES
 % FIXME: Check both of these
 % The affirmative response -
-% "^[yY].*"
-yesexpr     "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
+% "^[yY]"
+yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
 % The negative response -
-% "^[nN].*"
-noexpr      "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+% "^[nN]"
+noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 END LC_MESSAGES
 
 LC_PAPER
@@ -204,21 +215,22 @@ country_name "<U0041><U0066><U0072><U0069><U006B><U0061><U0020><U0042><U006F><U0
 % Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
  
-% ISO 3166 two letter country abbreviation - "ZA"
-country_ab2 "<U005A><U0041>"
-
 % FIXME define the following correctly
-% country_ab3 ""
-% country_car ""
 % country_isbn ""
-% country_num 
  
 % Language name in Sotho - "Sesotho"
 lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F>"
 
-% FIXME define the following correctly
-% lang_ab   ""
-% lang_term ""
+% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
+% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
+% "ZA"
+country_car   "<U005A><U0041>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+% "st", "sot"
+lang_ab   "<U0073><U0074>"
+lang_term "<U0073><U006F><U0074>"
  
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
@@ -250,6 +262,13 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % "country designation for the <country_post> keyword",
 % "end of line
 %
-country_num 710
+
+% ISO 3166 country number and 2 and 3 letter abreviations
+% http://www.unicode.org/onlinedat/countries.html
+% "ZA", "ZAF"
+country_num   710
+country_ab2   "<U005A><U0041>"
+country_ab3   "<U005A><U0041><U0046>"
+
 END LC_ADDRESS
 
diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index 62f0554a4d..806f87820b 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -2,21 +2,34 @@ escape_char  /
 comment_char  %
 
 % ChangeLog
+% 0.2 (2004-11-02):
+%     2004-11-01 Dwayne Bailey <dwayne@translate.org.za>
+%       - Change all contact information
+%       - d_t_fmt, date_fmt cahnged day number %e to %-e to remove
+%         space padding in day.
+%       - Remove .* from yes/noexpr
+%     2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%       - Added country_ab2/3, country_num
+%       - Added country_car
+%     2004-03-29 Dwayne Bailey <dwayne@translate.org.za>
+%       - Added lang_ab and lang_term
+%     2004-02-27 Dwayne Bailey <dwayne@translate.org.za>
+%       - Add lang_name
 % 0.1 (2003-05-08):
-%   - Initial Xhosa locale by Zuza Software Foundation
+%    - Initial Xhosa locale by Zuza Software Foundation
 
 LC_IDENTIFICATION
 title      "Xhosa locale for South Africa"
-source     "Zuza Software Foundation"
-address    "PO Box 13412, Mowbray, 7705, South Africa"
+source     "Zuza Software Foundation (Translate.org.za)"
+address    "PO Box 28364, Sunnyside, 0132, South Africa"
 contact    "Dwayne Bailey"
 email      "dwayne@translate.org.za"
-tel        "+27 (0)21 448 9265"
-fax        "+27 (0)21 448 9574"
+tel        "+27 12 343 8389"
+fax        "+27 12 343 0389"
 language   "Xhosa"
 territory  "South Africa"
-revision   "0.1"
-date       "2003-05-08"
+revision   "0.2"
+date       "2004-11-02"
 %
 category  "xh_ZA:2003";LC_IDENTIFICATION
 category  "xh_ZA:2003";LC_CTYPE
@@ -99,9 +112,9 @@ mon         "<U004A><U0061><U006E><U0079><U0075><U0077><U0061><U0072><U0069>";/
             "<U0044><U0069><U0073><U0065><U006D><U0062><U0061>"
 %
 % Abreviated date and time representation to be referenced by the "%c" field descriptor -
-d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_t_fmt     "<U0025><U0061><U0020><U0025><U002D><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 % "%a" (weekday name),
-% "%d" (day of month as a decimal number),
+% "%-e" (day of month as a decimal number),
 % "%b" (month name),
 % "%Y" (year with century as a decimal number),
 % "%T" (24-hour clock time in format HH:MM:SS),
@@ -125,8 +138,8 @@ am_pm       "";""
 t_fmt_ampm  ""
 %
 % Date representation not described in ISO/IEC 14652. 
-% Comes out as - "%a %b %e %H:%M:%S %Z %Y" 
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+% Comes out as - "%a %b %-e %H:%M:%S %Z %Y" 
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U002D><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 % which is:
@@ -143,12 +156,12 @@ END LC_TIME
 
 LC_MESSAGES
 % The affirmative response -
-% "^[yYeE].*"
-yesexpr     "<U005E><U005B><U0079><U0059><U0065><U0045><U005D><U002E><U002A>"
+% "^[yYeE]"
+yesexpr     "<U005E><U005B><U0079><U0059><U0065><U0045><U005D>"
 %
 % The negative response -
-% "^[nNhH].*"
-noexpr      "<U005E><U005B><U006E><U004E><U0068><U0048><U005D><U002E><U002A>"
+% "^[nNhH]"
+noexpr      "<U005E><U005B><U006E><U004E><U0068><U0048><U005D>"
 %
 END LC_MESSAGES
 
@@ -198,9 +211,19 @@ country_name "<U004D><U007A><U0061><U006E><U0074><U0073><U0069><U0020>/
 % Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 %
-% ISO 3166 two letter country abbreviation - "ZA"
-country_ab2 "<U005A><U0041>"
-%
+% Language name in Sotho - "IsiXhosa"
+lang_name "<U0049><U0073><U0069><U0058><U0068><U006F><U0073><U0061>"
+
+% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
+% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
+% "ZA"
+country_car   "<U005A><U0041>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+lang_ab   "<U0078><U0068>"
+lang_term "<U0078><U0068><U006F>"
+
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
 postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
@@ -231,7 +254,13 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % "country designation for the <country_post> keyword",
 % "end of line
 %
-country_ab3 "<U005A><U0041><U0046>"
-country_num 710
+
+% ISO 3166 country number and 2 and 3 letter abreviations
+% http://www.unicode.org/onlinedat/countries.html
+% "ZA", "ZAF"
+country_num   710
+country_ab2   "<U005A><U0041>"
+country_ab3   "<U005A><U0041><U0046>"
+
 END LC_ADDRESS
 
diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index 7fb25bb6ec..45da1e5b79 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -2,21 +2,37 @@ escape_char  /
 comment_char  %
 
 % ChangeLog
+% 0.2 (2004-10-28):
+%     2004-10-28 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added lang_lib
+%        - Reverted version number to 0.2 - needs more testing
+%     2004-10-27 Dwayne Bailey <dwayne@translate.org.za>
+%        - Add Translate.org.za to "source" for clarity
+%        - Update all contact details
+%        - Remove .* from yes/noexpr
+%     2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added country_ab2/3, country_num
+%        - Added country_car
+%     2004-03-29 Dwayne Bailey <dwayne@translate.org.za>
+%       - Added lang_ab and lang_term
+%     2004-02-27 Dwayne Bailey <dwayne@translate.org.za>
+%	    - Correct capatilisation of lang_name
 % 0.1 (2003-04-19):
-%   - Initial Zulu locale by Zuza Software Foundation
+%     2003-04-19:
+%       - Initial Zulu locale by Zuza Software Foundation
 
 LC_IDENTIFICATION
 title      "Zulu locale for South Africa"
-source     "Zuza Software Foundation"
-address    "PO Box 13412, Mowbray, 7705, South Africa"
+source     "Zuza Software Foundation (Translate.org.za)"
+address    "Box 28364, Sunnyside, 0132, South Africa"
 contact    "Dwayne Bailey"
 email      "dwayne@translate.org.za"
-tel        "+27 (0)21 448 9265"
-fax        "+27 (0)21 448 9574"
+tel        "+27 12 343 0389"
+fax        "+27 12 448 0389"
 language   "Zulu"
 territory  "South Africa"
-revision   "0.1"
-date       "2003-04-19"
+revision   "0.2"
+date       "2004-10-28"
 %
 category  "zu_ZA:2003";LC_IDENTIFICATION
 category  "zu_ZA:2003";LC_CTYPE
@@ -145,13 +161,13 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
+yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 % The affirmative response -
-% "^[yY].*"
+% "^[yY]"
 %
-noexpr      "<U005E><U005B><U006E><U004E><U0063><U0043><U005D><U002E><U002A>"
+noexpr      "<U005E><U005B><U006E><U004E><U0063><U0043><U005D>"
 % The negative response -
-% "^[nNcC].*"
+% "^[nNcC]"
 %
 END LC_MESSAGES
 
@@ -201,12 +217,21 @@ country_name "<U004D><U007A><U0061><U006E><U0073><U0069><U0020>/
 country_post "<U005A><U0041>"
 % Abbreviated country postal name - "ZA"
 %
-country_ab2 "<U005A><U0041>"
-% ISO 3166 two letter country abbreviation - "ZA"
-%
-lang_name "<U0049><U0073><U0069><U007A><U0075><U006C><U0075>"
-% Language name in Zulu - "Isizulu"
-%
+lang_name "<U0049><U0073><U0069><U005A><U0075><U006C><U0075>"
+% Language name in Zulu - "IsiZulu"
+
+% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
+% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
+% "ZA"
+country_car   "<U005A><U0041>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+% "zu", "zul", "zul"
+lang_ab   "<U007A><U0075>"
+lang_term "<U007A><U0075><U006C>"
+lang_lib  "<U007A><U0075><U006C>"
+
 postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
@@ -237,7 +262,13 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % "country designation for the <country_post> keyword",
 % "end of line
 %
-country_ab3 "<U005A><U0041><U0046>"
-country_num 710
+
+% ISO 3166 country number and 2 and 3 letter abreviations
+% http://www.unicode.org/onlinedat/countries.html
+% "ZA", "ZAF"
+country_num   710
+country_ab2   "<U005A><U0041>"
+country_ab3   "<U005A><U0041><U0046>"
+
 END LC_ADDRESS