From 72888fa9e08ffc61c0a29d80b120b907963c0e73 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 24 Sep 2005 15:54:49 +0000 Subject: [BZ #495] * locales/st_ZA: Updates and corrections. Patch by Dwayne Bailey . --- localedata/ChangeLog | 4 + localedata/locales/af_ZA | 246 +++++++++++++++++++++++++++++++++++------------ localedata/locales/st_ZA | 71 +++++++++----- localedata/locales/xh_ZA | 69 +++++++++---- localedata/locales/zu_ZA | 69 +++++++++---- 5 files changed, 335 insertions(+), 124 deletions(-) (limited to 'localedata') 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 + [BZ #495] + * locales/st_ZA: Updates and corrections. + Patch by Dwayne Bailey . + [BZ #493] * locales/xh_ZA: Updates and corrections. Patch by Dwayne Bailey . 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 +% - Corrected country_name should be "Suid-Afrika" +% 2004-10-27 Dwayne Bailey +% - 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 +% - Added name_miss +% 1.1 (2003-04-23): +% 2003-04-23 Dwayne Bailey +% - 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 "" -currency_symbol "" -mon_decimal_point "" -mon_thousands_sep "" -mon_grouping 3;3 -positive_sign "" -negative_sign "" -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 "" -thousands_sep "" -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 "";"";/ "";"";/ "";"";/ "" + +% day - The full names of the week days: +% Sondag, Maandag, Dinsdag, Woensdag, Donderdag, Vrydag, Saterdag day "";/ "";/ "";/ @@ -88,12 +89,19 @@ day "";/ "";/ "";/ "" + +% abmon - The abbreviations for the months +% - Jan, Feb, Mrt, Apr, Mei, Jun, Jul, Aug, Sep, Okt, Nov, Des abmon "";"";/ - "";"";/ + "";"";/ "";"";/ "";"";/ "";"";/ "";"" + +% mon - The full names of the months - +% Januarie, Februarie, Maart, April, Mei, Junie +% Julie, Augustus, September, Oktober, November, Desember mon "";/ "";/ "";/ @@ -106,50 +114,170 @@ mon "";/ "";/ "";/ "" + +% 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 "" -d_fmt "" + +% Date representation to be referenced by the "%x" field descriptor - +% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000). +d_fmt "" + +% Time representation to be referenced by the "%X" field descriptor - +% "%T" (24-hour clock time in format HH:MM:SS) t_fmt "" + +% Define representation of ante meridian and post maritime strings - +% The "" mean 'default to "AM" and "PM". am_pm "";"" + +% 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 "/ / " END LC_TIME LC_MESSAGES -yesexpr "" -noexpr "" +% The affirmative response - +% "^[jJyY]" +yesexpr "" + +% The negative response - +% "^[nN]" +noexpr "" END LC_MESSAGES LC_PAPER -% FIXME -height 297 -% FIXME -width 210 +copy "en_ZA" END LC_PAPER LC_TELEPHONE -tel_int_fmt "/ -" -int_prefix "" +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 ", +% "First given name", +% "Empty string, or ", +% "Middle names", +% "Empty string, or ", +% "Clan names" name_fmt "/ " + +% General salutation for any sex +% (no term) +name_gen "" + +% Salutation for unmarried females +% "mej" +name_miss "" + +% Salutation for males +% "mnr" +name_mr "" + +% Salutation for married females +% "mev" +name_mrs "" + +% Salutation valid for all females +% "me" +name_ms "" 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 keyword", +% "end of line postal_fmt "/ / / / " + +% Country name in Afrikaans - "Suid-Afrika" +country_name "/ +" + +% Language name in Afrikaans - "Afrikaans" +lang_name "" + +% CEPT MAILCODES are suggested +% Alternatively use the code found on your countries postal item tracking number +% "ZA" +country_post "" + +% 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 "" + +% 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 "" +lang_term "" +lang_lib "" + +% ISO 3166 country number and 2 and 3 letter abbreviations +% http://www.unicode.org/onlinedat/countries.html +% "ZA", "ZAF" country_ab2 "" country_ab3 "" 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 +% - Change all contact information +% - Change %e in date_fmt and d_t_fmt to %-e +% - Remove .* from yes/noexpr +% 2004-03-30 Dwayne Bailey +% - Added country_ab2/3, country_num +% - Added country_car +% 2004-03-29 Dwayne Bailey +% - 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 "" % Abreviated date and time representation to be referenced by the "%c" field descriptor - -d_t_fmt "" -% +d_t_fmt "/ +" + % "%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 "/ +% "%a %b %-e %H:%M:%S %Z %Y" which is default "date" command output +date_fmt "/ / " % % %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 "" +% "^[yY]" +yesexpr "" % The negative response - -% "^[nN].*" -noexpr "" +% "^[nN]" +noexpr "" END LC_MESSAGES LC_PAPER @@ -204,21 +215,22 @@ country_name "" -% ISO 3166 two letter country abbreviation - "ZA" -country_ab2 "" - % FIXME define the following correctly -% country_ab3 "" -% country_car "" % country_isbn "" -% country_num % Language name in Sotho - "Sesotho" lang_name "" -% 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 "" + +% ISO 639 two and three letter language names +% see http://www.loc.gov/standards/iso639-2/englangn.html +% "st", "sot" +lang_ab "" +lang_term "" % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) @@ -250,6 +262,13 @@ postal_fmt "/ % "country designation for the 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 "" +country_ab3 "" + 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 +% - 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 +% - Added country_ab2/3, country_num +% - Added country_car +% 2004-03-29 Dwayne Bailey +% - Added lang_ab and lang_term +% 2004-02-27 Dwayne Bailey +% - 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 "";/ "" % % Abreviated date and time representation to be referenced by the "%c" field descriptor - -d_t_fmt "" +d_t_fmt "" % "%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 "/ +% Comes out as - "%a %b %-e %H:%M:%S %Z %Y" +date_fmt "/ / " % which is: @@ -143,12 +156,12 @@ END LC_TIME LC_MESSAGES % The affirmative response - -% "^[yYeE].*" -yesexpr "" +% "^[yYeE]" +yesexpr "" % % The negative response - -% "^[nNhH].*" -noexpr "" +% "^[nNhH]" +noexpr "" % END LC_MESSAGES @@ -198,9 +211,19 @@ country_name "/ % Abbreviated country postal name - "ZA" country_post "" % -% ISO 3166 two letter country abbreviation - "ZA" -country_ab2 "" -% +% Language name in Sotho - "IsiXhosa" +lang_name "" + +% 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 "" + +% ISO 639 two and three letter language names +% see http://www.loc.gov/standards/iso639-2/englangn.html +lang_ab "" +lang_term "" + % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) postal_fmt "/ @@ -231,7 +254,13 @@ postal_fmt "/ % "country designation for the keyword", % "end of line % -country_ab3 "" -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 "" +country_ab3 "" + 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 +% - Added lang_lib +% - Reverted version number to 0.2 - needs more testing +% 2004-10-27 Dwayne Bailey +% - Add Translate.org.za to "source" for clarity +% - Update all contact details +% - Remove .* from yes/noexpr +% 2004-03-30 Dwayne Bailey +% - Added country_ab2/3, country_num +% - Added country_car +% 2004-03-29 Dwayne Bailey +% - Added lang_ab and lang_term +% 2004-02-27 Dwayne Bailey +% - 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 "/ END LC_TIME LC_MESSAGES -yesexpr "" +yesexpr "" % The affirmative response - -% "^[yY].*" +% "^[yY]" % -noexpr "" +noexpr "" % The negative response - -% "^[nNcC].*" +% "^[nNcC]" % END LC_MESSAGES @@ -201,12 +217,21 @@ country_name "/ country_post "" % Abbreviated country postal name - "ZA" % -country_ab2 "" -% ISO 3166 two letter country abbreviation - "ZA" -% -lang_name "" -% Language name in Zulu - "Isizulu" -% +lang_name "" +% 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 "" + +% ISO 639 two and three letter language names +% see http://www.loc.gov/standards/iso639-2/englangn.html +% "zu", "zul", "zul" +lang_ab "" +lang_term "" +lang_lib "" + postal_fmt "/ / / @@ -237,7 +262,13 @@ postal_fmt "/ % "country designation for the keyword", % "end of line % -country_ab3 "" -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 "" +country_ab3 "" + END LC_ADDRESS -- cgit v1.2.1