2.5-18.1

1 files changed, 89 insertions, 59 deletions

diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 004d8d7181..17a740bff0 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -1,23 +1,41 @@
 escape_char  /
 comment_char  %
 
+% Charset: UTF-8
+
 % ChangeLog
+% 0.3 (2005-10-13):
+%    2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
+%      - Added 'Charset: UTF-8' information
+%      - Update contact information
+%      - Allign spellings of month and weekday names with Dept. of
+%        Art and Culture's: Multilingual Mathematics Dictionary
+% 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 460 1095"
+fax        "+27 12 460 1095"
 language   "Sotho"
 territory  "South Africa"
-revision   "0.1"
-date       "2003-04-21"
+revision   "0.3"
+date       "2005-10-13"
 %
 category  "st_ZA:2003";LC_IDENTIFICATION
 category  "st_ZA:2003";LC_CTYPE
@@ -37,6 +55,10 @@ END LC_IDENTIFICATION
 LC_CTYPE
 % Use the characters described in the charmap file "i18n.tgz"
 copy "i18n"
+
+translit_start
+include  "translit_combining";""
+translit_end
 END LC_CTYPE
 
 LC_COLLATE
@@ -64,94 +86,95 @@ abday       "<U0053><U006F><U006E>";/
             "<U004E><U0065>";/
             "<U0048><U006C><U0061>";/
             "<U004D><U006F><U0071>"
- 
+
 % day - The full names of the week days:
-% - Sontaha, Mmantaha, Labobedi, Laboraru, Labone, Labohlane, Moqebelo
+% - Sontaha, Mantaha, Labobedi, Laboraro, Labone, Labohlano, Moqebelo
 day         "<U0053><U006F><U006E><U0074><U0061><U0068><U0061>";/
-            "<U004D><U006D><U0061><U006E><U0074><U0061><U0068><U0061>";/
+            "<U004D><U0061><U006E><U0074><U0061><U0068><U0061>";/
             "<U004C><U0061><U0062><U006F><U0062><U0065><U0064><U0069>";/
-            "<U004C><U0061><U0062><U006F><U0072><U0061><U0072><U0075>";/
+            "<U004C><U0061><U0062><U006F><U0072><U0061><U0072><U006F>";/
             "<U004C><U0061><U0062><U006F><U006E><U0065>";/
-            "<U004C><U0061><U0062><U006F><U0068><U006C><U0061><U006E><U0065>";/
+            "<U004C><U0061><U0062><U006F><U0068><U006C><U0061><U006E><U006F>";/
             "<U004D><U006F><U0071><U0065><U0062><U0065><U006C><U006F>"
- 
-% abmon - The abbreviations for the months 
-% - Phe, Kol, Ube, Mme, Mot, Jan, Upu, Pha, Leo, Mph, Pun, Tsh
-abmon       "<U0050><U0068><U0065>";"<U004B><U006F><U006C>";/
-            "<U0055><U0062><U0065>";"<U004D><U006D><U0065>";/
+
+% abmon - The abbreviations for the months
+% - Phe, Hla, Tlh, Mme, Mot, Jan, Upu, Pha, Leo, Mph, Pud, Tsh
+abmon       "<U0050><U0068><U0065>";"<U0048><U006C><U0061>";/
+            "<U0054><U006C><U0048>";"<U004D><U006D><U0065>";/
             "<U004D><U006F><U0074>";"<U004A><U0061><U006E>";/
             "<U0055><U0070><U0075>";"<U0050><U0068><U0061>";/
             "<U004C><U0065><U006F>";"<U004D><U0070><U0068>";/
-            "<U0050><U0075><U006E>";"<U0054><U0073><U0068>"
- 
-% mon - The full names of the months - 
-% - Phesekgong, Hlakola, Hlakubele, Mmese, Motsheanong, Phupjane, 
-%   Phupu, Phata, Leotshe, Mphalane, Pundungwane, Tshitwe
-mon         "<U0050><U0068><U0065><U0073><U0065><U006B><U0067><U006F><U006E><U0067>";/
+            "<U0050><U0075><U0064>";"<U0054><U0073><U0068>"
+
+% mon - The full names of the months -
+% - Pherekgong, Hlakola, Tlhakubele, Mmese, Motsheanong, Phupjane,
+%   Phupu, Phato, Leotse, Mphalane, Pudungwana, Tshitwe
+mon         "<U0050><U0068><U0065><U0072><U0065><U006B><U0067><U006F><U006E><U0067>";/
             "<U0048><U006C><U0061><U006B><U006F><U006C><U0061>";/
-            "<U0048><U006C><U0061><U006B><U0075><U0062><U0065><U006C><U0065>";/
+            "<U0054><U006C><U0068><U0061><U006B><U0075><U0062><U0065><U006C><U0065>";/
             "<U004D><U006D><U0065><U0073><U0065>";/
             "<U004D><U006F><U0074><U0073><U0068><U0065><U0061><U006E><U006F><U006E><U0067>";/
             "<U0050><U0068><U0075><U0070><U006A><U0061><U006E><U0065>";/
             "<U0050><U0068><U0075><U0070><U0075>";/
-            "<U0050><U0068><U0061><U0074><U0061>";/
-            "<U004C><U0065><U006F><U0074><U0073><U0068><U0065>";/
+            "<U0050><U0068><U0061><U0074><U006F>";/
+            "<U004C><U0065><U006F><U0074><U0073><U0065>";/
             "<U004D><U0070><U0068><U0061><U006C><U0061><U006E><U0065>";/
-            "<U0050><U0075><U006E><U0064><U0075><U006E><U0067><U0077><U0061><U006E><U0065>";/
+            "<U0050><U0075><U0064><U0075><U006E><U0067><U0077><U0061><U006E><U0061>";/
             "<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),
 % "%Z" (Time zone name)
- 
+
 % Date representation to be referenced by the "%x" field descriptor -
 d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 % "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000).
- 
+
 % Time representation to be referenced by the "%X" field descriptor -
 t_fmt       "<U0025><U0054>"
 % "%T" (24-hour clock time in format HH:MM:SS)
- 
+
 % Define representation of ante meridiem and post meridiem strings -
 am_pm       "";""
 % The "" mean 'default to "AM" and "PM".
- 
+
 % Define time representation in 12-hour format with "am_pm", to be referenced by the "%r"
 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),
 % %Z - time-zone name,
 % %Y - year with century as a decimal number,e.g. 2001.
- 
+
 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
@@ -178,14 +201,14 @@ name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 % "Middle names",
 % "Empty string, or <Space>",
 % "Clan names"
- 
+
 % FIXME - define all the following name_*
 % General salutation for any sex
 % name_gen    ""
 
 % Salutation for unmarried females - ""
 % name_miss   ""
- 
+
 % Salutation for males - ""
 % name_mr     ""
 
@@ -200,26 +223,27 @@ END LC_NAME
 LC_ADDRESS
 % Country name in Sotho - "Afrika Borwa"
 country_name "<U0041><U0066><U0072><U0069><U006B><U0061><U0020><U0042><U006F><U0072><U0077><U0061>"
- 
+
 % 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)
 postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
@@ -250,6 +274,12 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % "country designation for the <country_post> keyword",
 % "end of line
 %
-country_num 710
-END LC_ADDRESS
 
+% 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