* 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, 14 insertions, 11 deletions

diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index 9f95701199..2ad94130a6 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -61,6 +61,10 @@ 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
@@ -88,7 +92,7 @@ abday       "<U0053><U006F><U006E>";/
             "<U0053><U0069><U006E>";/
             "<U0048><U006C><U0061>";/
             "<U004D><U0067><U0071>"
- 
+
 % day - The full names of the week days:
 % - iSonto, uMsombuluko, uLwesibili, uLwesithathu, uLwesine, uLwesihlanu, uMgqibelo
 day         "<U0069><U0053><U006F><U006E><U0074><U006F>";/
@@ -98,8 +102,8 @@ day         "<U0069><U0053><U006F><U006E><U0074><U006F>";/
             "<U0075><U004C><U0077><U0065><U0073><U0069><U006E><U0065>";/
             "<U0075><U004C><U0077><U0065><U0073><U0069><U0068><U006C><U0061><U006E><U0075>";/
             "<U0075><U004D><U0067><U0071><U0069><U0062><U0065><U006C><U006F>"
- 
-% abmon - The abbreviations for the months 
+
+% abmon - The abbreviations for the months
 % - Mas, Ola, Nda, Mba, Aba, Ang, Ntu, Ncw, Man, Mfu, Lwe, Zib
 abmon       "<U004D><U0061><U0073>";"<U004F><U006C><U0061>";/
             "<U004E><U0064><U0061>";"<U004D><U0062><U0061>";/
@@ -107,8 +111,8 @@ abmon       "<U004D><U0061><U0073>";"<U004F><U006C><U0061>";/
             "<U004E><U0074><U0075>";"<U004E><U0063><U0077>";/
             "<U004D><U0061><U006E>";"<U004D><U0066><U0075>";/
             "<U004C><U0077><U0065>";"<U005A><U0069><U0062>"
- 
-% mon - The full names of the months - 
+
+% mon - The full names of the months -
 % - uMasingana, uNhlolanja, uNdasa, uMbasa, uNhlaba, uNhlangulana
 %   uNtulikazi, uNcwaba, uMandulo, uMfumfu, uLwezi, uZibandlela
 mon         "<U0075><U004D><U0061><U0073><U0069><U006E><U0067><U0061><U006E><U0061>";/
@@ -123,7 +127,7 @@ mon         "<U0075><U004D><U0061><U0073><U0069><U006E><U0067><U0061><U006E><U00
             "<U0075><U004D><U0066><U0075><U006D><U0066><U0075>";/
             "<U0075><U004C><U0077><U0065><U007A><U0069>";/
             "<U0075><U005A><U0069><U0062><U0061><U006E><U0064><U006C><U0065><U006C><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>"
 %
@@ -137,22 +141,22 @@ d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U00
 % 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 meridiem and post meridiem strings -
 % The ""s mean default to "AM" and "PM".
 am_pm       "";""
- 
+
 % Define time representation in 12-hour format with "am_pm", to be referenced by the "%r"
 % field descriptor -
 % 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" 
+% "%a %b %e %H:%M:%S %Z %Y"
 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>"
@@ -279,4 +283,3 @@ country_ab2   "<U005A><U0041>"
 country_ab3   "<U005A><U0041><U0046>"
 
 END LC_ADDRESS
-