* include/features.h: Define _POSIX_C_SOURCE to 200112 for

	_XOPEN_SOURCE == 600.

8 files changed, 1176 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e30d38fcb..dc1aca6c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/features.h: Define _POSIX_C_SOURCE to 200112 for
+	_XOPEN_SOURCE == 600.
+
 2005-10-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* malloc/malloc.c (_int_free): Fail if block size is obviously wrong.
diff --git a/include/features.h b/include/features.h
index 89f00dfe07..fd4420d74b 100644
--- a/include/features.h
+++ b/include/features.h
@@ -186,8 +186,10 @@
 # define _POSIX_SOURCE	1
 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500
 #  define _POSIX_C_SOURCE	2
-# else
+# elif defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 600
 #  define _POSIX_C_SOURCE	199506L
+# else
+#  define _POSIX_C_SOURCE	200112L
 # endif
 #endif
 
@@ -263,7 +265,7 @@
 #endif
 
 #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
-    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
+    && __GNUC_PREREQ (4, 0) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
 # if _FORTIFY_SOURCE > 1
 #  define __USE_FORTIFY_LEVEL 2
 # else
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 795542f9e9..504ba5eb4c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,24 @@
+2005-10-13  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #533]
+	* locales/ss_ZA: New file.
+	Patch by Dwayne Bailey <dwayne@translate.org.za>.
+
+	[BZ #529]
+	* locales/tn_ZA: New file.
+	Patch by Dwayne Bailey <dwayne@translate.org.za>.
+
+	[BZ #491]
+	* locales/ve_ZA: New file.
+	Patch by Dwayne Bailey <dwayne@translate.org.za>.
+
+	[BZ #486]
+	* locales/nso_ZA: New file.
+	Patch by Dwayne Bailey <dwayne@translate.org.za>.
+
+	* SUPPORTED: Add nso_ZA.UTF-8, ve_ZA.UTF-8, tn_ZA.UTF-8, and
+	ss_ZA.UTF-8.
+
 2005-10-12  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #532]
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 57e9d8c59b..b9634853fb 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -260,6 +260,7 @@ nl_NL/ISO-8859-1 \
 nl_NL@euro/ISO-8859-15 \
 nn_NO.UTF-8/UTF-8 \
 nn_NO/ISO-8859-1 \
+nso_ZA/UTF-8 \
 oc_FR.UTF-8/UTF-8 \
 oc_FR/ISO-8859-1 \
 om_ET/UTF-8 \
@@ -297,6 +298,7 @@ sq_AL.UTF-8/UTF-8 \
 sq_AL/ISO-8859-1 \
 sr_CS.UTF-8/UTF-8 \
 sr_CS/ISO-8859-5 \
+ss_ZA/UTF-8 \
 st_ZA.UTF-8/UTF-8 \
 st_ZA/ISO-8859-1 \
 sv_FI.UTF-8/UTF-8 \
@@ -315,6 +317,7 @@ ti_ET/UTF-8 \
 tig_ER/UTF-8 \
 tl_PH.UTF-8/UTF-8 \
 tl_PH/ISO-8859-1 \
+tn_ZA/UTF-8 \
 tr_TR.UTF-8/UTF-8 \
 tr_TR/ISO-8859-9 \
 ts_ZA/UTF-8 \
@@ -324,6 +327,7 @@ uk_UA/KOI8-U \
 ur_PK/UTF-8 \
 uz_UZ/ISO-8859-1 \
 uz_UZ@cyrillic/UTF-8 \
+ve_ZA/UTF-8 \
 vi_VN.TCVN/TCVN5712-1 \
 vi_VN/UTF-8 \
 wa_BE/ISO-8859-1 \
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
new file mode 100644
index 0000000000..f80b8431f9
--- /dev/null
+++ b/localedata/locales/nso_ZA
@@ -0,0 +1,281 @@
+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-10-27):
+%      2004-10-27 Dwayne Bailey <dwayne@translate.org.za>
+%        - Update all contact information
+%        - Add lang_lib
+%      2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added country_ab2/3, country_num
+%      2004-02-27: Dwayne Bailey <dwayne@translate.org.za>
+%        - Correction of lang_name comment	
+% 0.1 (2004-02-11):
+%	Initial Northern Sotho locale for South Africa
+%	by Zuza Software Foundation
+
+LC_IDENTIFICATION
+title      "Northern Sotho locale for 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 12 460 1095"
+fax        "+27 12 460 1095"
+language   "Northern Sotho"
+territory  "South Africa"
+revision   "0.3"
+date       "2005-10-13"
+%
+category  "nso_ZA:2004";LC_IDENTIFICATION
+category  "nso_ZA:2004";LC_CTYPE
+category  "nso_ZA:2004";LC_COLLATE
+category  "nso_ZA:2004";LC_TIME
+category  "nso_ZA:2004";LC_NUMERIC
+category  "nso_ZA:2004";LC_MONETARY
+category  "nso_ZA:2004";LC_MESSAGES
+category  "nso_ZA:2004";LC_PAPER
+category  "nso_ZA:2004";LC_NAME
+category  "nso_ZA:2004";LC_ADDRESS
+category  "nso_ZA:2004";LC_TELEPHONE
+category  "nso_ZA:2004";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+% Use the characters described in the charmap file "i18n.tgz"
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+% Copy the template from ISO/IEC 14651 i.e.
+% use the rules there when making ordered lists of words.
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_MONETARY
+copy "en_ZA"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+
+% abday - The abbreviations for the week days:
+% - Son, Mos^, Bed, Rar, Ne, Hla, Mok
+abday       "<U0053><U006F><U006E>";/
+            "<U004D><U006F><U0161>";/
+            "<U0042><U0065><U0064>";/
+            "<U0052><U0061><U0072>";/
+            "<U004E><U0065>";/
+            "<U0048><U006C><U0061>";/
+            "<U004D><U006F><U006B>"
+ 
+% day - The full names of the week days:
+% - LaMorena, Mos^upologo, Labobedi, Laboraro, Labone, Labohlano, Mokibelo
+day         "<U004C><U0061><U004D><U006F><U0072><U0065><U006E><U0061>";/
+            "<U004D><U006F><U0161><U0075><U0070><U006F><U006C><U006F><U0067><U006F>";/
+            "<U004C><U0061><U0062><U006F><U0062><U0065><U0064><U0069>";/
+            "<U004C><U0061><U0062><U006F><U0072><U0061><U0072><U006F>";/
+            "<U004C><U0061><U0062><U006F><U006E><U0065>";/
+            "<U004C><U0061><U0062><U006F><U0068><U006C><U0061><U006E><U006F>";/
+            "<U004D><U006F><U006B><U0069><U0062><U0065><U006C><U006F>"
+ 
+% abmon - The abbreviations for the months 
+% - Jan, Feb, Mat, Apr, Mei, Jun, Jul, Ago, Set, Okt, Nof, Dis
+abmon       "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
+            "<U004D><U0061><U0074>";"<U0041><U0070><U0072>";/
+            "<U004D><U0065><U0069>";"<U004A><U0075><U006E>";/
+            "<U004A><U0075><U006C>";"<U0041><U0067><U006F>";/
+            "<U0053><U0065><U0074>";"<U004F><U006B><U0074>";/
+            "<U004E><U006F><U0066>";"<U0044><U0069><U0073>"
+ 
+% mon - The full names of the months - 
+% - Janaware, Febereware, Mats^he, Aprele, Mei, June
+%   Julae, Agostose, Setemere, Oktobere, Nofemere, Disemere
+mon         "<U004A><U0061><U006E><U0061><U0077><U0061><U0072><U0065>";/
+            "<U0046><U0065><U0062><U0065><U0072><U0065><U0077><U0061><U0072><U0065>";/
+            "<U004D><U0061><U0074><U0161><U0068><U0065>";/
+            "<U0041><U0070><U0072><U0065><U006C><U0065>";/
+            "<U004D><U0065><U0069>";/
+            "<U004A><U0075><U006E><U0065>";/
+            "<U004A><U0075><U006C><U0061><U0065>";/
+            "<U0041><U0067><U006F><U0073><U0074><U006F><U0073><U0065>";/
+            "<U0053><U0065><U0074><U0065><U006D><U0065><U0072><U0065>";/
+            "<U004F><U006B><U0074><U006F><U0062><U0065><U0072><U0065>";/
+            "<U004E><U006F><U0066><U0065><U006D><U0065><U0072><U0065>";/
+            "<U0044><U0069><U0073><U0065><U006D><U0065><U0072><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>"
+%
+% "%a" (short weekday name),
+% "%d" (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>/
+<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),
+% %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 - ee
+% "^[yYeE].*"
+yesexpr     "<U005E><U005B><U0079><U0059><U0065><U0045><U005D>"
+
+% The negative response - aowa
+% "^[nNaA].*"
+noexpr      "<U005E><U005B><U006E><U004E><U0061><U0041><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "en_ZA"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "en_ZA"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "en_ZA"
+END LC_MEASUREMENT
+
+LC_NAME
+% Format for addressing a person.
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+% "%d%t%g%t%m%t%f"
+% "Salutation",
+% "Empty string, or <Space>",
+% "First given name",
+% "Empty string, or <Space>",
+% "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     ""
+
+% Salutation for married females - ""
+% name_mrs    ""
+
+% Salutation valid for all females - "" (no term)
+% name_ms     ""
+
+END LC_NAME
+
+LC_ADDRESS
+% Country name in Northern 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>"
+
+% 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>"
+
+% FIXME define the following correctly
+% country_isbn ""
+ 
+% Language name in Northern Sotho - "Sesotho sa Leboa"
+lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F><U0020>/
+<U0073><U0061><U0020><U004C><U0065><U0062><U006F><U0061>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+lang_ab   ""
+lang_term "<U006E><U0073><U006F>"
+lang_lib  "<U006E><U0073><U006F>"
+ 
+% 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>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "firm name",
+% "end of line",
+% "C/O address",
+% "end of line",
+% "department name",
+% "Building name",
+% "end of line",
+% "street or block name",
+% "space",
+% "house number or designation",
+% "space",
+% "floor number",
+% "space",
+% "room number, door designation",
+% "end of line",
+% "postal code",
+% "space",
+% "town, city",
+% "end of line",
+% "country designation for the <country_post> keyword",
+% "end of line
+%
+
+% 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
+
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
new file mode 100644
index 0000000000..8e4de83c4f
--- /dev/null
+++ b/localedata/locales/ss_ZA
@@ -0,0 +1,285 @@
+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-09):
+%     2004-11-09 Dwayne Bailey <dwayne@translate.org.za>
+%       - Short month names comment corrected to match values in abmon
+%       - Correct yesexpr regex
+%       - <UNNNN> escaped all entries
+%     2004-11-08 Dwayne Bailey <dwayne@translate.org.za>
+%       - Changed all contact details
+%       - Change %d to %-e for d_t_fmt and date_fmt
+%       - Remove .* from yes/noexpr
+%       - <UNNNN> escaped some entries
+%     2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%       - Added country_ab2/3, country_num
+%     2004-02-27 Dwayne Bailey <dwayne@translate.org.za>
+%       - Correct capatilisation of lang_name
+% 0.1 (2004-02-24):
+%	    - Initial Swati locale for South Africa
+%         by Zuza Software Foundation
+
+LC_IDENTIFICATION
+title      "Swati locale for 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 12 460 1095"
+fax        "+27 12 460 1095"
+language   "Swati"
+territory  "South Africa"
+revision   "0.3"
+date       "2005-10-13"
+%
+category  "ss_ZA:2004";LC_IDENTIFICATION
+category  "ss_ZA:2004";LC_CTYPE
+category  "ss_ZA:2004";LC_COLLATE
+category  "ss_ZA:2004";LC_TIME
+category  "ss_ZA:2004";LC_NUMERIC
+category  "ss_ZA:2004";LC_MONETARY
+category  "ss_ZA:2004";LC_MESSAGES
+category  "ss_ZA:2004";LC_PAPER
+category  "ss_ZA:2004";LC_NAME
+category  "ss_ZA:2004";LC_ADDRESS
+category  "ss_ZA:2004";LC_TELEPHONE
+category  "ss_ZA:2004";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+% Use the characters described in the charmap file "i18n.tgz"
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+% Copy the template from ISO/IEC 14651 i.e.
+% use the rules there when making ordered lists of words.
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_MONETARY
+copy "en_ZA"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+
+% abday - The abbreviations for the week days:
+% - Son, Mso, Bil, Tsa, Ne, Hla, Mgc
+abday       "<U0053><U006F><U006E>";/
+            "<U004D><U0073><U006F>";/
+            "<U0042><U0069><U006C>";/
+            "<U0054><U0073><U0061>";/
+            "<U004E><U0065>";/
+            "<U0048><U006C><U0061>";/
+            "<U004D><U0067><U0063>"
+ 
+% day - The full names of the week days:
+% - Lisontfo, uMsombuluko, Lesibili, Lesitsatfu, Lesine, Lesihlanu, uMgcibelo
+day         "<U004C><U0069><U0073><U006F><U006E><U0074><U0066><U006F>";/
+            "<U0075><U004D><U0073><U006F><U006D><U0062><U0075><U006C><U0075><U006B><U006F>";/
+            "<U004C><U0065><U0073><U0069><U0062><U0069><U006C><U0069>";/
+            "<U004C><U0065><U0073><U0069><U0074><U0073><U0061><U0074><U0066><U0075>";/
+            "<U004C><U0065><U0073><U0069><U006E><U0065>";/
+            "<U004C><U0065><U0073><U0069><U0068><U006C><U0061><U006E><U0075>";/
+            "<U0075><U004D><U0067><U0063><U0069><U0062><U0065><U006C><U006F>"
+ 
+% abmon - The abbreviations for the months 
+% - Bhi, Van, Vul, Mab, Ink, Nhl, Kho, Ngc, Nyo, Imp, Lwe, Ngo
+abmon       "<U0042><U0068><U0069>";"<U0056><U0061><U006E>";/
+            "<U0056><U0075><U006C>";"<U004D><U0061><U0062>";/
+            "<U004B><U0068><U006B>";"<U004E><U0068><U006C>";/
+            "<U004B><U0068><U006F>";"<U004E><U0067><U0063>";/
+            "<U004E><U0079><U006F>";"<U0049><U006D><U0070>";/
+            "<U004C><U0077><U0065>";"<U004E><U0067><U006F>"
+ 
+% mon - The full names of the months - 
+% - Bhimbidvwane, iNdlovane, iNdlovulenkhulu, Mabasa, Inkhwenkhweti, iNhlaba
+%   Kholwane, iNgci, iNyoni, Impala, Lweti, iNgongoni
+mon         "<U0042><U0068><U0069><U006D><U0062><U0069><U0064><U0076><U0077><U0061><U006E><U0065>";/
+            "<U0069><U004E><U0064><U006C><U006F><U0076><U0061><U006E><U0065>";/
+            "<U0069><U004E><U0064><U006C><U006F><U0076><U0075><U006C><U0065><U006E><U006B><U0068><U0075><U006C><U0075>";/
+            "<U004D><U0061><U0062><U0061><U0073><U0061>";/
+            "<U0049><U006E><U006B><U0068><U0077><U0065><U006E><U006B><U0068><U0077><U0065><U0074><U0069>";/
+            "<U0069><U004E><U0068><U006C><U0061><U0062><U0061>";/
+            "<U004B><U0068><U006F><U006C><U0077><U0061><U006E><U0065>";/
+            "<U0069><U004E><U0067><U0063><U0069>";/
+            "<U0069><U004E><U0079><U006F><U006E><U0069>";/
+            "<U0049><U006D><U0070><U0061><U006C><U0061>";/
+            "<U004C><U0077><U0065><U0074><U0069>";/
+            "<U0069><U004E><U0067><U006F><U006E><U0067><U006F><U006E><U0069>"
+ 
+% 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>"
+%
+% "%a" (short weekday name),
+% "%-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><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 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 - yebo
+% "^[yY]"
+yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
+
+% The negative response - akukho
+% "^[nNaA]"
+noexpr      "<U005E><U005B><U006E><U004E><U0061><U0041><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "en_ZA"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "en_ZA"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "en_ZA"
+END LC_MEASUREMENT
+
+LC_NAME
+% Format for addressing a person.
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+% "%d%t%g%t%m%t%f"
+% "Salutation",
+% "Empty string, or <Space>",
+% "First given name",
+% "Empty string, or <Space>",
+% "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     ""
+
+% Salutation for married females - ""
+% name_mrs    ""
+
+% Salutation valid for all females - "" (no term)
+% name_ms     ""
+
+END LC_NAME
+
+LC_ADDRESS
+% Country name in Swati - "iNingizimu Afrika"
+country_name "<U0069><U004E><U0069><U006E><U0067><U0069><U007A><U0069><U006D><U0075><U0020><U0041><U0066><U0072><U0069><U006B><U0061>"
+ 
+% 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"
+country_car   "<U005A><U0041>"
+
+% FIXME define the following correctly
+% country_isbn ""
+ 
+% Language name in Swati - "SiSwati"
+lang_name "<U0053><U0069><U0053><U0077><U0061><U0074><U0069>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+% "ss", ssw"
+lang_ab   "<U0073><U0073>"
+lang_term "<U0073><U0073><U0077>"
+ 
+% 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>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "firm name",
+% "end of line",
+% "C/O address",
+% "end of line",
+% "department name",
+% "Building name",
+% "end of line",
+% "street or block name",
+% "space",
+% "house number or designation",
+% "space",
+% "floor number",
+% "space",
+% "room number, door designation",
+% "end of line",
+% "postal code",
+% "space",
+% "town, city",
+% "end of line",
+% "country designation for the <country_post> keyword",
+% "end of line
+%
+
+% 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
+
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
new file mode 100644
index 0000000000..c663811572
--- /dev/null
+++ b/localedata/locales/tn_ZA
@@ -0,0 +1,288 @@
+escape_char  /
+comment_char  %
+
+% Charset: UTF-8
+
+% ChangeLog
+% 0.4 (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.3 (2005-06-21):
+%     2005-06-21 Dwayne Bailey <dwayne@translate.org.za>
+%       - Corrected short month names to correspond to long 
+%         month names (missed in 2004-02-27 corrections)
+% 0.2 (2004-11-08):
+%     2004-11-08 Dwayne Bailey <dwayne@translate.org.za>
+%       - Changed all contact information
+%       - d_t_fmt, date_fmt changed %d to %-e
+%       - Remove .* from yes/noexpr
+%       - Convert all to <UNNNN> syntax
+%     2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%       - Added country_ab2/3, country_num
+%     2004-02-27 Dwayne Bailey <dwayne@translate.org.za>
+%       - Correct capatilisation of lang_name
+%       - Validated and corrected bad month names
+% 0.1 (2004-02-24):
+%	  - Initial Tswana locale for South Africa
+%	    by Zuza Software Foundation
+
+LC_IDENTIFICATION
+title      "Tswana locale for 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 12 460 1095"
+fax        "+27 12 460 1095"
+language   "Tswana"
+territory  "South Africa"
+revision   "0.4"
+date       "2005-10-13"
+%
+category  "tn_ZA:2004";LC_IDENTIFICATION
+category  "tn_ZA:2004";LC_CTYPE
+category  "tn_ZA:2004";LC_COLLATE
+category  "tn_ZA:2004";LC_TIME
+category  "tn_ZA:2004";LC_NUMERIC
+category  "tn_ZA:2004";LC_MONETARY
+category  "tn_ZA:2004";LC_MESSAGES
+category  "tn_ZA:2004";LC_PAPER
+category  "tn_ZA:2004";LC_NAME
+category  "tn_ZA:2004";LC_ADDRESS
+category  "tn_ZA:2004";LC_TELEPHONE
+category  "tn_ZA:2004";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+% Use the characters described in the charmap file "i18n.tgz"
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+% Copy the template from ISO/IEC 14651 i.e.
+% use the rules there when making ordered lists of words.
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_MONETARY
+copy "en_ZA"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+
+% abday - The abbreviations for the week days:
+% - Tsh, Mos, Bed, Rar, Ne, Tlh, Mat
+abday       "<U0054><U0073><U0068>";/
+            "<U004D><U006F><U0073>";/
+            "<U0042><U0065><U0064>";/
+            "<U0052><U0061><U0072>";/
+            "<U004E><U0065>";/
+            "<U0054><U006C><U0068>";/
+            "<U004D><U0061><U0074>"
+ 
+% day - The full names of the week days:
+% - laTshipi, Mosupologo, Labobedi, Laboraro, Labone, Labotlhano, Lamatlhatso
+day         "<U006C><U0061><U0054><U0073><U0068><U0069><U0070><U0069>";/
+            "<U004D><U006F><U0073><U0075><U0070><U006F><U006C><U006F><U0067><U006F>";/
+            "<U004C><U0061><U0062><U006F><U0062><U0065><U0064><U0069>";/
+            "<U004C><U0061><U0062><U006F><U0072><U0061><U0072><U006F>";/
+            "<U004C><U0061><U0062><U006F><U006E><U0065>";/
+            "<U004C><U0061><U0062><U006F><U0074><U006C><U0068><U0061><U006E><U006F>";/
+            "<U004C><U0061><U006D><U0061><U0074><U006C><U0068><U0061><U0074><U0073><U006F>"
+ 
+% abmon - The abbreviations for the months 
+% - Fer, Tlh, Mop, Mor, Mot, See, Phu, Pha, Lwe, Dip, Ngw, Sed
+abmon       "<U0046><U0065><U0072>";"<U0054><U006C><U0068>";/
+            "<U004D><U006F><U0070>";"<U004D><U006F><U0072>";/
+            "<U004D><U006F><U0074>";"<U0053><U0065><U0065>";/
+            "<U0050><U0068><U0075>";"<U0050><U0068><U0061>";/
+            "<U004C><U0077><U0065>";"<U0044><U0069><U0070>";/
+            "<U004E><U0067><U0077>";"<U0053><U0065><U0064>"
+ 
+% mon - The full names of the months - 
+% - Ferikgong, Tlhakole, Mopitlwe, Moranang, Motsheganong, Seetebosigo
+%   Phukwi, Phatwe, Lwetse, Diphalane, Ngwanatsele, Sedimonthole
+mon         "<U0046><U0065><U0072><U0069><U006B><U0067><U006F><U006E><U0067>";/
+            "<U0054><U006C><U0068><U0061><U006B><U006F><U006C><U0065>";/
+            "<U004D><U006F><U0070><U0069><U0074><U006C><U0077><U0065>";/
+            "<U004D><U006F><U0072><U0061><U006E><U0061><U006E><U0067>";/
+            "<U004D><U006F><U0074><U0073><U0068><U0065><U0067><U0061><U006E><U006F><U006E><U0067>";/
+            "<U0053><U0065><U0065><U0074><U0065><U0062><U006F><U0073><U0069><U0067><U006F>";/
+            "<U0050><U0068><U0075><U006B><U0077><U0069>";/
+            "<U0050><U0068><U0061><U0074><U0077><U0065>";/
+            "<U004C><U0077><U0065><U0074><U0073><U0065>";/
+            "<U0044><U0069><U0070><U0068><U0061><U006C><U0061><U006E><U0065>";/
+            "<U004E><U0067><U0077><U0061><U006E><U0061><U0074><U0073><U0065><U006C><U0065>";/
+            "<U0053><U0065><U0064><U0069><U006D><U006F><U006E><U0074><U0068><U006F><U006C><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>"
+%
+% "%a" (short weekday name),
+% "%-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><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),
+% %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 - ee
+% "^[yYeE]"
+yesexpr     "<U005E><U005B><U0079><U0059><U0065><U0045><U005D>"
+
+% The negative response - nyaa
+% "^[nN]"
+noexpr      "<U005E><U005B><U006E><U004E><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "en_ZA"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "en_ZA"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "en_ZA"
+END LC_MEASUREMENT
+
+LC_NAME
+% Format for addressing a person.
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+% "%d%t%g%t%m%t%f"
+% "Salutation",
+% "Empty string, or <Space>",
+% "First given name",
+% "Empty string, or <Space>",
+% "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     ""
+
+% Salutation for married females - ""
+% name_mrs    ""
+
+% Salutation valid for all females - "" (no term)
+% name_ms     ""
+
+END LC_NAME
+
+LC_ADDRESS
+% Country name in Tswana - "Aforika Borwa"
+country_name "<U0041><U0066><U006F><U0072><U0069><U006B><U0061><U0020>/
+<U0042><U006F><U0072><U0077><U0061>"
+ 
+% 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"
+country_car   "<U005A><U0041>"
+
+% FIXME define the following correctly
+% country_isbn ""
+ 
+% Language name in Tswana - "Setswana"
+lang_name "<U0053><U0065><U0074><U0073><U0077><U0061><U006E><U0061>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+% "tn", "tsn"
+lang_ab   "<U0074><U006E>"
+lang_term "<U0074><U0073><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>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "firm name",
+% "end of line",
+% "C/O address",
+% "end of line",
+% "department name",
+% "Building name",
+% "end of line",
+% "street or block name",
+% "space",
+% "house number or designation",
+% "space",
+% "floor number",
+% "space",
+% "room number, door designation",
+% "end of line",
+% "postal code",
+% "space",
+% "town, city",
+% "end of line",
+% "country designation for the <country_post> keyword",
+% "end of line
+%
+
+% 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
+
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
new file mode 100644
index 0000000000..ff6d115812
--- /dev/null
+++ b/localedata/locales/ve_ZA
@@ -0,0 +1,288 @@
+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-10-29):
+%      2004-10-29 Dwayne Bailey <dwayne@translate.org.za>
+%        - Converted to <UNNNN> syntax for everything
+%        - Correct yes/noexpr
+%        - Corrected some days of the week
+%      2004-10-28 Dwayne Bailey <dwayne@translate.org.za>
+%        - Updated all contact information
+%        - Added Translate.org.za to "source" for clarity
+%      2004-03-30 Dwayne Bailey <dwayne@translate.org.za>
+%        - Added country_ab2/3, country_num
+%      2004-02-27 Dwayne Bailey <dwayne@translate.org.za>
+%	     - Correct capatilisation of lang_name
+% 0.1 (2004-02-24):
+%	   2004-02-24 Dwayne Bailey <dwayne@translate.org.za>
+%	     - Initial Venda locale for South Africa
+%          by Zuza Software Foundation
+
+LC_IDENTIFICATION
+title      "Venda locale for 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 12 460 1095"
+fax        "+27 12 460 1095"
+language   "Venda"
+territory  "South Africa"
+revision   "0.3"
+date       "2005-10-13"
+%
+category  "ve_ZA:2004";LC_IDENTIFICATION
+category  "ve_ZA:2004";LC_CTYPE
+category  "ve_ZA:2004";LC_COLLATE
+category  "ve_ZA:2004";LC_TIME
+category  "ve_ZA:2004";LC_NUMERIC
+category  "ve_ZA:2004";LC_MONETARY
+category  "ve_ZA:2004";LC_MESSAGES
+category  "ve_ZA:2004";LC_PAPER
+category  "ve_ZA:2004";LC_NAME
+category  "ve_ZA:2004";LC_ADDRESS
+category  "ve_ZA:2004";LC_TELEPHONE
+category  "ve_ZA:2004";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+% Use the characters described in the charmap file "i18n.tgz"
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+% Copy the template from ISO/IEC 14651 i.e.
+% use the rules there when making ordered lists of words.
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_MONETARY
+copy "en_ZA"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+
+% abday - The abbreviations for the week days:
+% - Swo, Mus, Vhi, Rar, L^a, T^an, Mug
+abday       "<U0053><U0077><U006F>";/
+            "<U004D><U0075><U0073>";/
+            "<U0056><U0068><U0069>";/
+            "<U0052><U0061><U0072>";/
+            "<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>";/
+            "<U004D><U0075><U0073><U0075><U006D><U0062><U0075><U006C><U0075><U0077><U006F>";/
+            "<U1E3C><U0061><U0076><U0068><U0075><U0076><U0068><U0069><U006C><U0069>";/
+            "<U1E3C><U0061><U0076><U0068><U0075><U0072><U0061><U0072><U0075>";/
+            "<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 
+% - 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>";/
+            "<U0053><U0068><U0075>";"<U004C><U0077><U0069>";/
+            "<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 - 
+% - Phando, Luhuhi, T^hafamuhwe, Lambamai, Shundunthule, Fulwi
+%   Fulwana, T^hangule, Khubvumedzi, Tshimedzi, L^ara, Nyendavhusiku
+mon         "<U0050><U0068><U0061><U006E><U0064><U006F>";/
+            "<U004C><U0075><U0068><U0075><U0068><U0069>";/
+            "<U1E70><U0068><U0061><U0066><U0061><U006D><U0075><U0068><U0077><U0065>";/
+            "<U004C><U0061><U006D><U0062><U0061><U006D><U0061><U0069>";/
+            "<U0053><U0068><U0075><U006E><U0064><U0075><U006E><U0074><U0068><U0075><U006C><U0065>";/
+            "<U0046><U0075><U006C><U0077><U0069>";/
+            "<U0046><U0075><U006C><U0077><U0061><U006E><U0061>";/
+            "<U1E70><U0068><U0061><U006E><U0067><U0075><U006C><U0065>";/
+            "<U004B><U0068><U0075><U0062><U0076><U0075><U006D><U0065><U0064><U007A><U0069>";/
+            "<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>"
+%
+% "%a" (short weekday name),
+% "%d" (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>/
+<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),
+% %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 - ee
+% "^[yYeE]"
+yesexpr     "<U005E><U005B><U0079><U0059><U0065><U0045><U005D>"
+
+% The negative response - hai
+% "^[nNhH]"
+noexpr      "<U005E><U005B><U006E><U004E><U0068><U0048><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "en_ZA"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "en_ZA"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "en_ZA"
+END LC_MEASUREMENT
+
+LC_NAME
+% Format for addressing a person.
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+% "%d%t%g%t%m%t%f"
+% "Salutation",
+% "Empty string, or <Space>",
+% "First given name",
+% "Empty string, or <Space>",
+% "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     ""
+
+% Salutation for married females - ""
+% name_mrs    ""
+
+% Salutation valid for all females - "" (no term)
+% name_ms     ""
+
+END LC_NAME
+
+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"
+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>"
+
+% ISO 639 two and three letter language names
+% see http://www.loc.gov/standards/iso639-2/englangn.html
+% "ve", "ven", :ven"
+lang_ab         "<U0076><U0065>"
+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>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives -
+% "firm name",
+% "end of line",
+% "C/O address",
+% "end of line",
+% "department name",
+% "Building name",
+% "end of line",
+% "street or block name",
+% "space",
+% "house number or designation",
+% "space",
+% "floor number",
+% "space",
+% "room number, door designation",
+% "end of line",
+% "postal code",
+% "space",
+% "town, city",
+% "end of line",
+% "country designation for the <country_post> keyword",
+% "end of line
+%
+
+% 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
+