* 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, 22 insertions, 19 deletions

diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index ff6d115812..5996810e73 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -58,6 +58,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
@@ -85,7 +89,7 @@ abday       "<U0053><U0077><U006F>";/
             "<U1E4B><U0061>";/
             "<U1E70><U0061><U006E>";/
             "<U004D><U0075><U0067>"
- 
+
 % day - The full names of the week days:
 % - Swondaha, Musumbuluwo, L^avhuvhili, L^avhuraru, L^avhun^a, L^avhut^anu, Mugivhela
 day         "<U0053><U0077><U006F><U006E><U0064><U0061><U0068><U0061>";/
@@ -95,8 +99,8 @@ day         "<U0053><U0077><U006F><U006E><U0064><U0061><U0068><U0061>";/
             "<U1E3C><U0061><U0076><U0068><U0075><U1E4B><U0061>";/
             "<U1E3C><U0061><U0076><U0068><U0075><U1E71><U0061><U006E><U0075>";/
             "<U004D><U0075><U0067><U0069><U0076><U0068><U0065><U006C><U0061>"
- 
-% abmon - The abbreviations for the months 
+
+% abmon - The abbreviations for the months
 % - Pha, Luh, Fam, Lam, Shu, Lwi, Lwa, Ngu, Khu, Tsh, L^ar, Nye
 abmon       "<U0050><U0068><U0061>";"<U004C><U0075><U0068>";/
             "<U0046><U0061><U006D>";"<U004C><U0061><U006D>";/
@@ -104,8 +108,8 @@ abmon       "<U0050><U0068><U0061>";"<U004C><U0075><U0068>";/
             "<U004C><U0077><U0061>";"<U004E><U0067><U0075>";/
             "<U004B><U0068><U0075>";"<U0054><U0073><U0068>";/
             "<U1E3C><U0061><U0072>";"<U004E><U0079><U0065>"
- 
-% mon - The full names of the months - 
+
+% mon - The full names of the months -
 % - Phando, Luhuhi, T^hafamuhwe, Lambamai, Shundunthule, Fulwi
 %   Fulwana, T^hangule, Khubvumedzi, Tshimedzi, L^ara, Nyendavhusiku
 mon         "<U0050><U0068><U0061><U006E><U0064><U006F>";/
@@ -120,7 +124,7 @@ mon         "<U0050><U0068><U0061><U006E><U0064><U006F>";/
             "<U0054><U0073><U0068><U0069><U006D><U0065><U0064><U007A><U0069>";/
             "<U1E3C><U0061><U0072><U0061>";/
             "<U004E><U0079><U0065><U006E><U0064><U0061><U0076><U0068><U0075><U0073><U0069><U006B><U0075>"
- 
+
 % 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>"
 %
@@ -130,23 +134,23 @@ d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U00
 % "%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>/
@@ -161,7 +165,7 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><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
@@ -199,14 +203,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     ""
 
@@ -222,10 +226,10 @@ LC_ADDRESS
 % Country name in Venda - "Afurika Tshipembe"
 country_name "<U0041><U0066><U0075><U0072><U0069><U006B><U0061><U0020>/
 <U0054><U0073><U0068><U0069><U0070><U0065><U006D><U0062><U0065>"
- 
+
 % Abbreviated country postal name - "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"
@@ -233,7 +237,7 @@ country_car   "<U005A><U0041>"
 
 % FIXME define the following correctly
 % country_isbn ""
- 
+
 % Language name in Venda - "Tshivend^a"
 lang_name "<U0054><U0073><U0068><U0069><U0076><U0065><U006E><U1E13><U0061>"
 
@@ -245,7 +249,7 @@ lang_term       "<U0076><U0065><U006E>"
 % FIXME there seems to be an error with the following but am unable to
 % determine what as it works correctly in other locale files
 % lang_lib        "<U0076><U0065><U006E>"
- 
+
 % 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>/
@@ -285,4 +289,3 @@ country_ab2   "<U005A><U0041>"
 country_ab3   "<U005A><U0041><U0046>"
 
 END LC_ADDRESS
-