Merge remote branch 'origin/master' into fedora/master

11 files changed, 383 insertions, 54 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 11d78fde3f..0de7cccb87 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,38 @@
+2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #10286]
+	* locales/ast_ES: Define first_weekday.
+
+	[BZ #10312]
+	* locales/es_CO: Define am_pm , t_fmt_ampm, first_weekday.
+	Patch by Jorge Guerrero <geojorg@gmail.com>.
+
+	[BZ #10319]
+	* locales/shs_CA: Fix accents.
+	Patch by Neskie Manuel <neskiem@gmail.com>.
+
+2009-10-29  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #10425]
+	* locales/it_IT: Fix date_fmt.
+	* locales/it_CH: Likewise.
+	Patch by Nicolo' Chieffo <nicolo.chieffo@gmail.com>.
+
+	* locales/POSIX: Define yesstr and nostr.
+	* locales/en_US: Likewise.
+	Patch by Petr Machata <pmachata@redhat.com>.
+
+	* locales/crh_UA: Fix first day of week and a few spellings.
+	Patch by Režat SABIQ <tilde.birlik@gmail.com>.
+
+2009-10-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* SUPPORTED (SUPPORTED-LOCALES): Add ps_AF.UTF-8.
+
+	* locale/ps_AF: New file.
+	Contributed by Sayamindu Dasgupta <sayamindu@gmail.com> and
+	Pravin Satpute <psatpute@redhat.com>.
+
 2009-06-16  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10011]
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index ceb2415c19..2a8f61b806 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -322,6 +322,7 @@ pa_PK/UTF-8 \
 pap_AN/UTF-8 \
 pl_PL.UTF-8/UTF-8 \
 pl_PL/ISO-8859-2 \
+ps_AF/UTF-8 \
 pt_BR.UTF-8/UTF-8 \
 pt_BR/ISO-8859-1 \
 pt_PT.UTF-8/UTF-8 \
diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX
index 00c5b4a0d6..457ce6ec64 100644
--- a/localedata/locales/POSIX
+++ b/localedata/locales/POSIX
@@ -328,4 +328,8 @@ LC_MESSAGES
 yesexpr "<U005E><U005B><U0079><U0059><U005D>"
 #
 noexpr  "<U005E><U005B><U006E><U004E><U005D>"
+#
+yesstr  "<U0059><U0065><U0073>"
+#
+nostr   "<U004E><U006F>"
 END LC_MESSAGES
diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
index 249571cd3e..eb048d5bbb 100644
--- a/localedata/locales/ast_ES
+++ b/localedata/locales/ast_ES
@@ -109,6 +109,7 @@ t_fmt_ampm ""
 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>"
+first_weekday 2
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index 5dfab24d90..a6fceeae0a 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -1,14 +1,14 @@
 comment_char %
 escape_char  /
 %
-% Crimean Tatar Language Locale for Ukraine (latin)
-% Source:	Reshat Sabiq (Re<U015F>at)
-% Contact:	Reshat Sabiq (Re<U015F>at)
-% Email:	<tatar.iqtelif.i18n@gmail.com>
+% Crimean Tatar (Crimean Turkish) Language Locale for Ukraine (latin)
+% Source:	Re<U015F>at SABIQ
+% Contact:	Re<U015F>at SABIQ
+% Email:	<tilde.birlik@gmail.com>
 % Language:	crh
 % Territory:	UA
-% Revision:	0.3
-% Date:		2006-10-09
+% Revision:	0.4
+% Date:		2009-08-16
 % Application:	general
 % Users:	general
 % Charset:	UTF-8 
@@ -16,17 +16,17 @@ escape_char  /
 % for commercial purposes.
 
 LC_IDENTIFICATION
-title		"Crimean Tatar language locale for Ukraine"
+title		"Crimean Tatar (Crimean Turkish) language locale for Ukraine"
 source		""
 address		""
-contact		"Reshat Sabiq (Re<U015F>at)"
-email		"tatar.iqtelif.i18n@gmail.com"
+contact		"Re<U015F>at SABIQ"
+email		"tilde.birlik@gmail.com"
 tel		""
 fax		""
 language	"Crimean Tatar"
 territory	"Ukraine"
-revision	"0.3"
-date		"2006-10-09"
+revision	"0.4"
+date		"2009-08-16"
 
 category crh_UA:2000;LC_IDENTIFICATION
 category crh_UA:2000;LC_CTYPE
@@ -124,11 +124,10 @@ copy "tr_TR"
 END LC_CTYPE
 
 LC_MESSAGES
-% TODO: No is "yoq"; is it OK that it corresponds with English "yes"?
 yesstr  "<U0065><U0062><U0065><U0074>"
-nostr   "<U0079><U006F><U0071>"
-yesexpr "<U005E><U005B><U0045><U0065><U005D><U002E><U002A>"
-noexpr  "<U005E><U005B><U0059><U0079><U004E><U006E><U005D><U002E><U002A>"
+nostr   "<U0068><U0061><U0079><U0131><U0072>"
+yesexpr	"<U005E><U005B><U0079><U0059><U0065><U0045><U005D>"
+noexpr	"<U005E><U005B><U006E><U004E><U0068><U0048><U005D>"
 END LC_MESSAGES
 
 LC_MONETARY
@@ -157,9 +156,9 @@ END LC_NUMERIC
 
 LC_TIME
 day     "<U0042><U0061><U007A><U0061><U0072>";/
-        "<U0042><U0061><U007A><U0061><U0072><U0020><U0065><U0072><U0074><U0065><U0073><U0069>";/
+        "<U0042><U0061><U007A><U0061><U0072><U0065><U0072><U0074><U0065><U0073><U0069>";/
         "<U0053><U0061><U006C><U0131>";/
-        "<U00C7><U0061><U0072><U015F><U0065><U006E><U0062><U0065>";/
+        "<U00C7><U0061><U0072><U015F><U0065><U006D><U0062><U0065>";/
         "<U0043><U0075><U006D><U0061><U0061><U0071><U015F><U0061><U006D><U0131>";/
         "<U0043><U0075><U006D><U0061>";/
         "<U0043><U0075><U006D><U0061><U0065><U0072><U0074><U0065><U0073><U0069>"
@@ -198,12 +197,14 @@ d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062>/
 <U0020><U0025><U0059><U0020><U0025><U0054>"
 d_fmt     "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
 t_fmt     "<U0025><U0054>"
-am_pm     "<U00D6><U0041>";"<U00D6><U0053>"
+am_pm     "<U00DC><U0045>";"<U00DC><U0053>"
 t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
 <U0020><U0025><U0070>"
 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>"
+first_weekday 2
+first_workday 2
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index 38425e815e..a41f5bc310 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -132,6 +132,8 @@ END LC_TIME
 LC_MESSAGES
 yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
 noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+yesstr  "<U0059><U0065><U0073>"
+nostr   "<U004E><U006F>"
 END LC_MESSAGES
 
 LC_PAPER
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index bb983d7e7f..4c1de136be 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -117,11 +117,14 @@ mon     "<U0065><U006E><U0065><U0072><U006F>";/
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt   "<U0025><U0054>"
-am_pm   "";""
-t_fmt_ampm ""
+am_pm   "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0025><U0070>"
 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>"
+%  FIXME: found in CLDR
+first_weekday 2
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
index 4fdc50a4b8..7ea13ad106 100644
--- a/localedata/locales/it_CH
+++ b/localedata/locales/it_CH
@@ -97,9 +97,9 @@ d_fmt   "<U0025><U0064><U002E><U0020><U0025><U006D><U002E><U0020><U0025><U0079>"
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-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>"
+date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025>\
+<U0062><U0020><U0025><U0059><U002C><U0020><U0025><U0048><U002E>\
+<U0025><U004D><U002E><U0025><U0053><U002C><U0020><U0025><U005A>"
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index 105f40c9f4..ec8151c68a 100644
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -121,9 +121,9 @@ d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-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>"
+date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025>\
+<U0062><U0020><U0025><U0059><U002C><U0020><U0025><U0048><U002E>\
+<U0025><U004D><U002E><U0025><U0053><U002C><U0020><U0025><U005A>"
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
new file mode 100644
index 0000000000..7f686abbb5
--- /dev/null
+++ b/localedata/locales/ps_AF
@@ -0,0 +1,282 @@
+escape_char /
+comment_char %
+
+%%%%%%%%%%%%%%%%%%%%%%% locale definition file "ps_AF"  %%%%%%%%%%%%%%%%%%%%%%
+
+% Pashto Locale for Afghanistan
+% Filename: ps_AF
+% Locale name: ps_AF.UTF-8
+% Language: Pashto
+% Territory: Afghanistan
+% Charset: UTF-8
+% Revision: 0.1
+% By: Nasir Gulzade<nasirgulzade@hotmail.com>
+% Creation Date: Thu, 15 Jan 2009 18:16:15 +0500 GMT
+% Last Modification Date: Fri, 16 Jan 2009 20:33:40 +0500 GMT
+%
+
+
+LC_IDENTIFICATION
+	title      "Pashto locale for Afghanistan"
+	source     "Nasir Gulzade"
+	address    "see e-mail."
+	contact    "Nasir Gulzade"
+	email      "nasirgulzade@hotmail.com"
+	tel        "+93 700530286"
+	fax        ""
+	language   "Pashto"
+	territory  "Afghanistan"
+	revision   "0.2"
+	date       "2009-01-16"
+
+	category  "ps_AF:2007";LC_IDENTIFICATION
+	category  "ps_AF:2007";LC_CTYPE
+	category  "ps_AF:2007";LC_COLLATE
+	category  "ps_AF:2007";LC_TIME
+	category  "ps_AF:2007";LC_NUMERIC
+	category  "ps_AF:2007";LC_MONETARY
+	category  "ps_AF:2007";LC_MESSAGES
+	category  "ps_AF:2007";LC_MEASUREMENT
+	category  "ps_AF:2007";LC_PAPER
+	category  "ps_AF:2007";LC_NAME
+	category  "ps_AF:2007";LC_ADDRESS
+	category  "ps_AF:2007";LC_TELEPHONE
+END LC_IDENTIFICATION
+
+LC_CTYPE
+	copy	"i18n"
+	outdigit	<U0660>..<U0663>;<U06F4>;<U0665>..<U0669>
+	map to_outpunct;  (<U002E>,<U066B>);(<U002C>,<U066C>)
+END LC_CTYPE
+
+LC_COLLATE
+% Collation rules updated as per requirement of glibc by Pravin Satpute <psatpute@redhat.com>
+% see rh bug 482881
+copy "iso14651_t1"
+
+collating-symbol  <teh_with_ring>
+collating-symbol  <hah_with_hamza_above>
+collating-symbol  <hah_with_three_dots>
+collating-symbol  <dal_with_ring>
+collating-symbol  <reh_with_ring>
+collating-symbol <reh_with_dot_below_and_above>
+collating-symbol  <seen_with_dot_below_and_above>
+collating-symbol  <kaaf_with_ring>
+collating-symbol  <noon_with_ring>
+collating-symbol  <farsi_yeh>
+collating-symbol  <arabic_letter_e>
+collating-symbol  <yeh_with_tail>
+
+reorder-after <teh>
+<teh_with_ring>
+
+reorder-after <jeem>
+<hah_with_hamza_above>
+
+reorder-after <tcheh>
+<hah_with_three_dots>
+
+reorder-after <dal>
+<dal_with_ring>
+
+reorder-after <reh>
+<reh_with_ring>
+
+reorder-after <jeh>
+<reh_with_dot_below_and_above>
+
+reorder-after <sheen>
+<seen_with_dot_below_and_above>
+
+reorder-after <keheh>
+<kaaf_with_ring>
+
+reorder-after <noon>
+<noon_with_ring>
+
+reorder-after <heh>
+<farsi_yeh>
+
+reorder-after <alef_maksura>
+<arabic_letter_e>
+<yeh_with_tail>
+
+
+reorder-after <U062A>
+<U067C>  <teh_with_ring>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U062C>
+<U0681> <hah_with_hamza_above>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0686>
+<U0685> <hah_with_three_dots>;<BAS>;<MIN>;IGNORE
+
+reorder-after  <U062F>
+<U0689> <dal_with_ring>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0631>
+<U0693> <reh_with_ring>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0698>
+<U0696> <reh_with_dot_below_and_above>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0634>
+<U069A> <seen_with_dot_below_and_above>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U06A9>
+<U06AB> <kaaf_with_ring>;<BAS>;<MIN>;IGNORE
+
+reorder-after  <U0646>
+<U06BC> <noon_with_ring>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0648>
+<U0647> <heh>;<BAS>;<MIN>;IGNORE
+<U06CC> <farsi_yeh>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U064A>
+<U06D0> <arabic_letter_e>;<AYE>;<MIN>;IGNORE
+<U0626> "<alef_maksura><hamza>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
+<U06CD> <yeh_with_tail>;<AYE>;<MIN>;IGNORE
+
+reorder-end
+
+END LC_COLLATE
+
+LC_TIME
+	abday	"<U06CC><U002E>";/
+		"<U062F><U002E>";/
+		"<U0633><U002E>";/
+		"<U0686><U002E>";/
+		"<U067E><U002E>";/
+		"<U062C><U002E>";/
+		"<U0634><U002E>"
+	day	"<U06CC><U06A9><U0634><U0646><U0628><U0647>";/
+		"<U062F><U0648><U0634><U0646><U0628><U0647>";/
+		"<U0633><U0647><U200C><U0634><U0646><U0628><U0647>";/
+		"<U0686><U0627><U0631><U0634><U0646><U0628><U0647>";/
+		"<U067E><U0646><U062C><U0634><U0646><U0628><U0647>";/
+		"<U062C><U0645><U0639><U0647>";/
+		"<U0634><U0646><U0628><U0647>"
+	abmon	"<U062C><U0646><U0648>";/
+		"<U0641><U0628><U0631>";/
+		"<U0645><U0627><U0631>";/
+		"<U0627><U067E><U0631>";/
+		"<U0645><U0640><U06D0>";/
+		"<U062C><U0648><U0646>";/
+		"<U062C><U0648><U0644>";/
+		"<U0627><U06AB><U0633>";/
+		"<U0633><U067E><U062A>";/
+		"<U0627><U06A9><U062A>";/
+		"<U0646><U0648><U0645>";/
+		"<U062F><U0633><U0645>"
+	mon	"<U062C><U0646><U0648><U0631><U064A>";/
+		"<U0641><U0628><U0631><U0648><U0631><U064A>";/
+		"<U0645><U0627><U0631><U0686>";/
+		"<U0627><U067E><U0631><U06CC><U0644>";/
+		"<U0645><U06D0>";/
+		"<U062C><U0648><U0646>";/
+		"<U062C><U0648><U0644><U0627><U064A>";/
+		"<U0627><U06AB><U0633><U062A>";/
+		"<U0633><U067E><U062A><U0645><U0628><U0631>";/
+		"<U0627><U06A9><U062A><U0648><U0628><U0631>";/
+		"<U0646><U0648><U0645><U0628><U0631>";/
+		"<U062F><U0633><U0645><U0628><U0631>"
+	d_t_fmt	"<U0025><U0041><U0020><U062F><U0020><U0025><U0059>/
+<U0020><U062F><U0020><U0025><U0042><U0020><U0025><U0065><U060C>/
+<U0020><U0025><U005A><U0020><U0025><U0048><U003A><U0025><U004D>/
+<U003A><U0025><U0053>"
+	d_fmt	"<U062F><U0020><U0025><U0059><U0020><U062F><U0020>/
+<U0025><U0042><U0020><U0025><U0065>"
+	t_fmt	"<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
+	am_pm	"<U063A><U002E><U0645><U002E>";/
+		"<U063A><U002E><U0648><U002E>"
+	t_fmt_ampm	"<U202B><U0025><U0049><U003A><U0025><U004D><U003A>/
+<U0025><U0053><U0020><U0025><U0070><U202C>"
+	first_weekday	7
+	first_workday	7
+	cal_direction	3
+END LC_TIME
+
+LC_NUMERIC
+	decimal_point	"<U066B>"
+	thousands_sep	"<U066C>"
+	grouping	3
+END LC_NUMERIC
+
+LC_MONETARY
+	int_curr_symbol	"<U0041><U0046><U004E><U0020>"
+	currency_symbol	"<U0627><U0641><U063A><U0627><U0646><U06CD>"
+	mon_decimal_point	"<U066B>"
+	mon_thousands_sep	"<U066C>"
+	mon_grouping	3
+	positive_sign	""
+	negative_sign	"<U002D>"
+	int_frac_digits	0
+	frac_digits	0
+	p_cs_precedes	0
+	p_sep_by_space	1
+	n_cs_precedes	0
+	n_sep_by_space	1
+	p_sign_posn	1
+	n_sign_posn	1
+END LC_MONETARY
+
+LC_MESSAGES
+	yesexpr "<U005E><U005B><U0079><U0059><U0628>/
+<U0066><U005D><U002E><U002A>"
+	noexpr  "<U005E><U005B><U006E><U004E><U062E>/
+<U0646><U006F><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_MEASUREMENT
+	measurement	1
+END LC_MEASUREMENT
+
+LC_PAPER
+	height	297
+	width	210
+END LC_PAPER
+
+LC_NAME
+	name_fmt	"<U0025><U0073><U0025><U0074><U0025><U0070><U0025>/
+<U0074><U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066>"
+	name_gen	"" % No general salutation for all persons in Pashto.
+	name_mr	"<U069A><U0627><U063A><U0644><U06D0>"
+	name_mrs	"<U0628><U064A><U0020><U0628><U064A>"
+	name_miss	"<U0628><U064A><U0020><U0628><U064A>"
+	name_ms	"<U0628><U064A><U0020><U0628><U064A>"
+END LC_NAME
+
+LC_ADDRESS
+	postal_fmt	"<U0025><U0061><U0025><U004E><U0025><U0066><U0025>/
+<U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025>/
+<U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072>/
+<U0025><U004E><U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054>/
+<U0025><U004E><U0025><U0063><U0025><U004E>"
+	country_name	"<U0627><U0641><U063A><U0627><U0646>/
+<U0633><U062A><U0627><U0646>"
+	%country_post	"<U0041><U0046><U0047>" % FIXME: Not confirmed.
+	country_ab2	"<U0041><U0046>"
+	country_ab3	"<U0041><U0046><U0047>"
+	country_num	004
+	country_car	"<U0041><U0046><U0047>"
+
+	%country_isbn	"" % Unfortunately not yet assigned :-(
+			   % Since to date there is no ISBN agency working
+			   % in Afghanistan.
+
+	lang_name	"<U067E><U069A><U062A><U0648>"
+	lang_ab	"<U0070><U0073>"
+	lang_term	"<U0070><U0075><U0073>"
+	lang_lib	"<U0070><U0075><U0073>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+	tel_int_fmt	"<U002B><U0025><U0063><U0020><U0025><U0061><U0020>/
+<U0025><U006C>"
+	tel_dom_fmt	"<U0025><U0041><U2012><U0025><U006C>"
+	int_select	"<U0030><U0030>"
+	int_prefix	"<U0039><U0033>"
+END LC_TELEPHONE
+
+%%%%%%%%%%%%%%%%%%%% locale definition file "ps_AF" ends %%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA
index e6c52c7672..6c1b77f19d 100644
--- a/localedata/locales/shs_CA
+++ b/localedata/locales/shs_CA
@@ -55,10 +55,10 @@ reorder-after <RES-1>
 %  Present in iso14651_t1, but these definitions seem to have been
 %  removed from latest iso14651 tables.
 reorder-after <U0041>
-<U00C6> "<a><e>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
+<U00C6> "<U003C><U0061><U003E><U003C><U0065><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U0043><U0041><U0050><U003E><U003C><U0043><U0041><U0050><U003E>";IGNORE
 
 reorder-after <U0061>
-<U00E6> "<a><e>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+<U00E6> "<U003C><U0061><U003E><U003C><U0065><U003E>";"<U003C><U004C><U0049><U0047><U003E><U003C><U004C><U0049><U0047><U003E>";"<U003C><U004D><U0049><U004E><U003E><U003C><U004D><U0049><U004E><U003E>";IGNORE
 
 reorder-end
 
@@ -80,41 +80,41 @@ LC_TIME
 abday      "<U0053><U0078><U0065>";/
            "<U0053><U0070><U0065>";/
            "<U0053><U0065><U006C>";/
-           "<U004B><U0065><U006C>";/
-           "<U004D><U0065><U0073>";/
-           "<U0054><U0073><U0065>";/
-           "<U0054><U0071><U006D>"
-day        "<U0053><U0078><U0065><U0074><U0073><U0070><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U0070><U0065><U0074><U006B><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U0065><U006C><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U006B><U0065><U006C><U006C><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U006D><U0065><U0073><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U0074><U0073><U0065><U006C><U006B><U0073><U0074><U0065><U0073><U0071><U0027><U0074>";/
-           "<U0053><U0074><U0071><U006D><U0065><U006B><U0073><U0074><U0065><U0073><U0071><U0027><U0074>"
+           "<U0053><U006B><U0065>";/
+           "<U0053><U006D><U0065>";/
+           "<U0053><U0074><U0073>";/
+           "<U0053><U0074><U0071>"
+day        "<U0053><U0078><U0065><U0074><U0073><U0070><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U0070><U0065><U0074><U006B><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U0065><U006C><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U006B><U0065><U006C><U006C><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U006D><U0065><U0073><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U0074><U0073><U0065><U006C><U006B><U0073><U0074><U0065><U0073><U0071><U0313><U0074>";/
+           "<U0053><U0074><U0071><U006D><U0065><U006B><U0073><U0074><U0065><U0073><U0071><U0313><U0074>"
 abmon      "<U004B><U0077><U0065>";/
            "<U0054><U0073><U0069>";/
            "<U0053><U0071><U0065>";/
-           "<U0045><U0027><U0077>";/
+           "<U00C9><U0077><U0074>";/
            "<U0045><U006C><U006C>";/
            "<U0054><U0073><U0070>";/
            "<U0054><U0071><U0077>";/
-           "<U0043><U0074><U0027>";/
+           "<U0043><U0074><U0313><U00E9>";/
            "<U0051><U0065><U006C>";/
-           "<U0057><U0065><U006C>";/
+           "<U0057><U00E9><U006C>";/
            "<U0055><U0037><U006C>";/
            "<U0054><U0065><U0074>"
-mon        "<U0050><U0065><U006C><U006C><U006B><U0077><U0065><U0074><U0027><U006D><U0069><U006E>";/
-           "<U0050><U0065><U006C><U0063><U0074><U0073><U0069><U0070><U0077><U0065><U006E><U0027><U0074><U0065><U006E>";/
-           "<U0050><U0065><U006C><U006C><U0073><U0071><U0065><U0027><U0070><U0074><U0073>";/
-           "<U0050><U0065><U0073><U006C><U006C><U0065><U0027><U0077><U0074><U0065><U006E>";/
-           "<U0050><U0065><U006C><U006C><U0037><U0065><U006C><U006C><U0037><U0065><U0027><U0037><U006C><U006C><U0071><U0074><U0065><U006E>";/
-           "<U0050><U0065><U006C><U006C><U0074><U0073><U0070><U0065><U0027><U006E><U0074><U0073><U006B>";/
-           "<U0050><U0065><U006C><U006C><U0074><U0071><U0077><U0065><U006C><U0071><U0027><U0077><U0065><U0027><U006C><U0027><U0074>";/
-           "<U0050><U0065><U006C><U006C><U0063><U0074><U0027><U0065><U0027><U0078><U0065><U006C><U0027><U0063><U0074><U0065><U006E>";/
-           "<U0050><U0065><U0073><U0071><U0065><U006C><U0071><U006C><U0065><U0027><U006C><U0074><U0065><U006E>";/
-           "<U0050><U0065><U0073><U006C><U006C><U0077><U0065><U0027><U006C><U0073><U0074><U0065><U006E>";/
-           "<U0050><U0065><U006C><U006C><U0063><U0037><U0065><U006C><U006C><U0037><U0075><U0027><U0037><U006C><U006C><U0063><U0077><U0074><U0065><U006E><U0027>";/
-           "<U0050><U0065><U006C><U006C><U0074><U0065><U0074><U0065><U0027><U0074><U0071><U0027><U0065><U006D>"
+mon        "<U0050><U0065><U006C><U006C><U006B><U0077><U0065><U0074><U0313><U006D><U0069><U006E>";/
+       "<U0050><U0065><U006C><U0063><U0074><U0073><U0069><U0070><U0077><U0065><U006E><U0313><U0074><U0065><U006E>";/
+       "<U0050><U0065><U006C><U006C><U0073><U0071><U00E9><U0070><U0074><U0073>";/
+       "<U0050><U0065><U0073><U006C><U006C><U00E9><U0077><U0074><U0065><U006E>";/
+       "<U0050><U0065><U006C><U006C><U0037><U0065><U006C><U006C><U0037><U00E9><U0037><U006C><U006C><U0071><U0074><U0065><U006E>";/
+       "<U0050><U0065><U006C><U006C><U0074><U0073><U0070><U00E9><U006E><U0074><U0073><U006B>";/
+       "<U0050><U0065><U006C><U006C><U0074><U0071><U0077><U0065><U006C><U0071><U0313><U0077><U00E9><U006C><U0313><U0074>";/
+       "<U0050><U0065><U006C><U006C><U0063><U0074><U0313><U00E9><U0078><U0065><U006C><U0313><U0063><U0074><U0065><U006E>";/
+       "<U0050><U0065><U0073><U0071><U0065><U006C><U0071><U006C><U00E9><U006C><U0074><U0065><U006E>";/
+       "<U0050><U0065><U0073><U006C><U006C><U0077><U00E9><U006C><U0073><U0074><U0065><U006E>";/
+       "<U0050><U0065><U006C><U006C><U0063><U0037><U0065><U006C><U006C><U0037><U00E9><U0037><U006C><U006C><U0063><U0077><U0074><U0065><U006E><U0313>";/
+       "<U0050><U0065><U006C><U006C><U0074><U0065><U0074><U00E9><U0074><U0071><U0313><U0065><U006D>"
 d_t_fmt    "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
 d_fmt      "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt      "<U0025><U0072>"