* locale/programs/localedef.c (add_to_readlist): Rename local

	variables to avoid confusion.

	* locale/programs/charmap.c (charmap_read): Emit error message if
	charmap couldn't be found or read.

1 files changed, 23 insertions, 20 deletions

diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index d36eb9ab2c..17a740bff0 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -55,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
@@ -82,7 +86,7 @@ abday       "<U0053><U006F><U006E>";/
             "<U004E><U0065>";/
             "<U0048><U006C><U0061>";/
             "<U004D><U006F><U0071>"
- 
+
 % day - The full names of the week days:
 % - Sontaha, Mantaha, Labobedi, Laboraro, Labone, Labohlano, Moqebelo
 day         "<U0053><U006F><U006E><U0074><U0061><U0068><U0061>";/
@@ -92,8 +96,8 @@ day         "<U0053><U006F><U006E><U0074><U0061><U0068><U0061>";/
             "<U004C><U0061><U0062><U006F><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 
+
+% 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>";/
@@ -101,9 +105,9 @@ abmon       "<U0050><U0068><U0065>";"<U0048><U006C><U0061>";/
             "<U0055><U0070><U0075>";"<U0050><U0068><U0061>";/
             "<U004C><U0065><U006F>";"<U004D><U0070><U0068>";/
             "<U0050><U0075><U0064>";"<U0054><U0073><U0068>"
- 
-% mon - The full names of the months - 
-% - Pherekgong, Hlakola, Tlhakubele, Mmese, Motsheanong, Phupjane, 
+
+% 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>";/
@@ -117,7 +121,7 @@ mon         "<U0050><U0068><U0065><U0072><U0065><U006B><U0067><U006F><U006E><U00
             "<U004D><U0070><U0068><U0061><U006C><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><U002D><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -128,23 +132,23 @@ d_t_fmt     "<U0025><U0061><U0020><U0025><U002D><U0065><U0020><U0025><U0062>/
 % "%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><U002D><U0065>/
@@ -159,7 +163,7 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U002D><U0065>/
 % %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
@@ -197,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     ""
 
@@ -219,13 +223,13 @@ 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>"
- 
+
 % FIXME define the following correctly
 % country_isbn ""
- 
+
 % Language name in Sotho - "Sesotho"
 lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F>"
 
@@ -239,7 +243,7 @@ country_car   "<U005A><U0041>"
 % "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>/
@@ -279,4 +283,3 @@ country_ab2   "<U005A><U0041>"
 country_ab3   "<U005A><U0041><U0046>"
 
 END LC_ADDRESS
-