From c10d32c83429239be3c7d7159aa0e558f6e97bcc Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 30 Jul 2006 22:24:49 +0000
Subject: * 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.
---
 localedata/locales/xh_ZA | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'localedata/locales/xh_ZA')

diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index 1f61d17a82..218cdb1fb5 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -57,6 +57,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
@@ -94,7 +98,7 @@ day         "<U0069><U0043><U0061><U0077><U0061>";/
             "<U006C><U0077><U0065><U0073><U0069><U0048><U006C><U0061><U006E><U0075>";/
             "<U0075><U004D><U0067><U0071><U0069><U0062><U0065><U006C><U006F>"
 %
-% The abbreviations for the months 
+% The abbreviations for the months
 % - Mqu, Mdu, Kwi, Tsh, Can, Sil, Kha, Thu, Msi, Dwa, Nka, Mng
 abmon       "<U004D><U0071><U0075>";"<U004D><U0064><U0075>";/
             "<U004B><U0077><U0069>";"<U0054><U0073><U0068>";/
@@ -103,7 +107,7 @@ abmon       "<U004D><U0071><U0075>";"<U004D><U0064><U0075>";/
             "<U004D><U0073><U0069>";"<U0044><U0077><U0061>";/
             "<U004E><U006B><U0061>";"<U004D><U006E><U0067>"
 %
-% The full names of the months - 
+% The full names of the months -
 % - eyoMqungu, eyoMdumba, eyoKwindla, uTshazimpuzi, uCanzibe, eyeSilimela
 %   eyeKhala, eyeThupa, eyoMsintsi, eyeDwarha, eyeNkanga, eyoMnga
 mon         "<U0065><U0079><U006F><U004D><U0071><U0075><U006E><U0067><U0075>";/
@@ -145,8 +149,8 @@ am_pm       "";""
 % 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" 
+% Date representation not described in ISO/IEC 14652.
+% Comes out as - "%a %b %-e %H:%M:%S %Z %Y"
 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>"
@@ -271,4 +275,3 @@ country_ab2   "<U005A><U0041>"
 country_ab3   "<U005A><U0041><U0046>"
 
 END LC_ADDRESS
-
-- 
cgit 1.4.1