summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--NEWS11
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/locales/gd_GB247
3 files changed, 147 insertions, 116 deletions
diff --git a/NEWS b/NEWS
index 7f193a40aa..e7eb7775fd 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,11 @@ Version 2.19
 
 * The following bugs are resolved with this release:
 
-  13985, 14155, 14547, 14699, 15427, 15522, 15531, 15532, 15608, 15609,
-  15610, 15640, 15681, 15736, 15748, 15749, 15754, 15797, 15844, 15849,
-  15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893,
-  15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939, 15963, 15966.
+  13985, 14155, 14547, 14699, 15400, 15427, 15522, 15531, 15532, 15608,
+  15609, 15610, 15640, 15681, 15736, 15748, 15749, 15754, 15797, 15844,
+  15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892,
+  15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939, 15963,
+  15966.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
@@ -43,6 +44,8 @@ Version 2.19
 
 * New locales: ak_GH, cmn_TW, hak_TW, lzh_TW, nan_TW, quz_PE.
 
+* Substantially revised locales: gd_GB, ht_HT
+
 * The LC_ADDRESS field was updated to support country_car for almost all
   supported locales.
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2e8da8c3fb..f0fbc6e445 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-25  Michael Bauer <fios@akerbeltz.org>
+
+    [BZ#15400]
+    * locales/gd_GB: Version 1.2 of gd_GB locale.
+
 2013-09-23  Wei-Lun Chao <bluebat@member.fsf.org>
 
     [BZ#15609]
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index fd2bce0ed9..f2d9e81be4 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -1,57 +1,47 @@
-escape_char  /
-comment_char  %
-% charset "ISO_8859-15"
-% Distribution and use is free, also for commercial purposes.
-
-
-% WARNING: UNOFFICIAL; EXPERIMENTAL.
+comment_char %
+escape_char /
+% Charset: UTF-8
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Revision 1.1 created by Alastair McKinstry <mckinstry@computer.org>, 2000-06-12
+% Revision 1.2 created by Michael Bauer <fios@akerbeltz.org>, 2013-04-25
+%
+% This file is a part of GNU C Library (glibc) and contains locale data. The
+% Free Software Foundation does not claim any copyright interest in the
+% locale data contained in this file. The foregoing does not affect the
+% license of GNU C Library (glibc) as a whole. It does not exempt you from the
+% conditions of the license if your use would otherwise be governed by
+% that license.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_IDENTIFICATION
-title "Scots Gaelic language locale for Great Britain"
-source "Alastair McKinstry"
-address "Croí Lár, Ballinahalla, Maigh Cuilinn, Co. Gaillimh, Ireland"
-contact "Alastair McKinstry"
-email "mckinstry@computer.org"
-tel "+353 91 556177"
-language "Scots Gaelic"
-territory "Great Britain"
-date "2000-06-12"
-revision "1.1"
-
-category gd_GB:2000;LC_IDENTIFICATION
-category gd_GB:2000;LC_CTYPE
-category gd_GB:2000;LC_COLLATE
-category gd_GB:2000;LC_TIME
-category gd_Gb:2000;LC_NUMERIC
-category gd_GB:2000;LC_PAPER
-category gd_GB:2000;LC_NAME
-category gd_GB:2000;LC_ADDRESS
-category gd_GB:2000;LC_TELEPHONE
-category gd_GB:2000;LC_MEASUREMENT
-
+title        "Scots Gaelic language locale for Great Britain"
+source       "Akerbeltz"
+address      "1/2, 47 Wilton Street, Glasgow G20 6RT, UK"
+contact      "Michael Bauer"
+email        "fios@akerbeltz.org"
+tel          "+44 141 946 4437"
+language     "Scots Gaelic"
+territory    "Great Britain"
+revision     "1.2"
+date         "2013-04-25"
+%
+category  "gd_GB:2000";LC_IDENTIFICATION
+category  "gd_GB:2000";LC_CTYPE
+category  "gd_GB:2000";LC_COLLATE
+category  "gd_GB:2000";LC_TIME
+category  "gd_GB:2000";LC_NUMERIC
+category  "gd_GB:2000";LC_MONETARY
+category  "gd_GB:2000";LC_PAPER
+category  "gd_GB:2000";LC_MEASUREMENT
+category  "gd_GB:2000";LC_MESSAGES
+category  "gd_GB:2000";LC_NAME
+category  "gd_GB:2000";LC_ADDRESS
+category  "gd_GB:2000";LC_TELEPHONE
 END LC_IDENTIFICATION
 
-LC_ADDRESS
-% FIXME
-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><U007A><U0020><U0025><U0054><U0025>/
-<U004E><U0025><U0063><U0025><U004E>"
-
-country_name "<U0042><U0072><U0065><U0061><U0074><U0061><U0069><U006E><U006E><U0020><U004D><U0068><U00F2><U0072>"
-country_ab2 "GB"
-country_ab3 "GBR"
-country_num 826
-% GB
-country_car    "<U0047><U0042>"
-country_isbn "0"
-lang_name "<U0047><U0061><U0069><U0064><U0068><U006C><U0069><U0067><U0020><U006E><U0061><U0020><U0068><U002D><U0041><U006C><U0062><U0061><U006E><U00F1>"
-lang_ab "gd"
-lang_term "gla"
-lang_lib "gla"
-END LC_ADDRESS
-
 LC_CTYPE
 copy "i18n"
 translit_start
@@ -59,82 +49,115 @@ include "translit_combining";""
 translit_end
 END LC_CTYPE
 
-LC_PAPER
-copy "en_GB"
-END LC_PAPER
-
-LC_MEASUREMENT
-copy "en_GB"
-END LC_MEASUREMENT
-
-LC_TELEPHONE
-copy "en_GB"
-END LC_TELEPHONE
-
 LC_COLLATE
-copy "en_DK"
+copy "iso14651_t1"
 END LC_COLLATE
 
-LC_MONETARY
-copy "en_GB"
-END LC_MONETARY
+LC_TIME
+% Am Faoilleach, An Gearran, Am Màrt, An Giblean, An Cèitean, An t-Ògmhios, An t-Iuchar, An Lùnastal, An t-Sultain, An Dàmhair, An t-Samhain, An Dùbhlachd
+mon           "<U0041><U006D><U0020><U0046><U0061><U006F><U0069><U006C><U006C><U0065><U0061><U0063><U0068>";/
+     "<U0041><U006E><U0020><U0047><U0065><U0061><U0072><U0072><U0061><U006E>";/
+     "<U0041><U006D><U0020><U004D><U00E0><U0072><U0074>";/
+     "<U0041><U006E><U0020><U0047><U0069><U0062><U006C><U0065><U0061><U006E>";/
+     "<U0041><U006E><U0020><U0043><U00E8><U0069><U0074><U0065><U0061><U006E>";/
+     "<U0041><U006E><U0020><U0074><U002D><U00D2><U0067><U006D><U0068><U0069><U006F><U0073>";/
+     "<U0041><U006E><U0020><U0074><U002D><U0049><U0075><U0063><U0068><U0061><U0072>";/
+     "<U0041><U006E><U0020><U004C><U00F9><U006E><U0061><U0073><U0074><U0061><U006C>";/
+     "<U0041><U006E><U0020><U0074><U002D><U0053><U0075><U006C><U0074><U0061><U0069><U006E>";/
+     "<U0041><U006E><U0020><U0044><U00E0><U006D><U0068><U0061><U0069><U0072>";/
+     "<U0041><U006E><U0020><U0074><U002D><U0053><U0061><U006D><U0068><U0061><U0069><U006E>";/
+     "<U0041><U006E><U0020><U0044><U00F9><U0062><U0068><U006C><U0061><U0063><U0068><U0064>"
+% Faoi, Gearr, MĂ rt, Gibl, MhĂ rt, Ă’gmh, Iuch, LĂąna, Sult, DĂ mh, Samh, DĂąbh
+abmon         "<U0046><U0061><U006F><U0069>";/
+       "<U0047><U0065><U0061><U0072><U0072>";/
+       "<U004D><U00E0><U0072><U0074>";/
+       "<U0047><U0069><U0062><U006C>";/
+       "<U004D><U0068><U00E0><U0072><U0074>";/
+       "<U00D2><U0067><U006D><U0068>";/
+       "<U0049><U0075><U0063><U0068>";/
+       "<U004C><U00F9><U006E><U0061>";/
+       "<U0053><U0075><U006C><U0074>";/
+       "<U0044><U00E0><U006D><U0068>";/
+       "<U0053><U0061><U006D><U0068>";/
+       "<U0044><U00F9><U0062><U0068>"
+% DiDòmhnaich, DiLuain, DiMàirt, DiCiadain, DiarDaoin, DihAoine, DiSathairne
+day           "<U0044><U0069><U0044><U00F2><U006D><U0068><U006E><U0061><U0069><U0063><U0068>";/
+     "<U0044><U0069><U004C><U0075><U0061><U0069><U006E>";/
+     "<U0044><U0069><U004D><U00E0><U0069><U0072><U0074>";/
+     "<U0044><U0069><U0043><U0069><U0061><U0064><U0061><U0069><U006E>";/
+     "<U0044><U0069><U0061><U0072><U0044><U0061><U006F><U0069><U006E>";/
+     "<U0044><U0069><U0068><U0041><U006F><U0069><U006E><U0065>";/
+     "<U0044><U0069><U0053><U0061><U0074><U0068><U0061><U0069><U0072><U006E><U0065>"
+% DiD, DiL, DiM, DiC, Dia, Dih, DiS
+abday         "<U0044><U0069><U0044>";/
+       "<U0044><U0069><U004C>";/
+       "<U0044><U0069><U004D>";/
+       "<U0044><U0069><U0043>";/
+       "<U0044><U0069><U0061>";/
+       "<U0044><U0069><U0068>";/
+       "<U0044><U0069><U0053>"
+% %a %d %b %Y %T %Z
+d_t_fmt       "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+% %d/%m/%y
+d_fmt         "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+% %r
+t_fmt         "<U0025><U0072>"
+% m, f
+am_pm         "<U006D>";/
+       "<U0066>"
+t_fmt_ampm    ""
+END LC_TIME
 
 LC_NUMERIC
 copy "en_GB"
 END LC_NUMERIC
 
-LC_TIME
-
-abday       "<U0044><U0069><U0064><U006F>";"<U0044><U0069><U006C><U0075>";/
-            "<U0044><U0069><U006D>";"<U0044><U0069><U0063>";/
-            "<U0044><U0069><U0061><U0072>";"<U0044><U0069><U0068><U0061>";/
-            "<U0044><U0069><U0073><U0061>"
-
-day         "<U0044><U0069><U0064><U00F2><U006D><U0068><U006E><U0061><U0069><U0063><U0068>";/
-	    "<U0044><U0069><U006C><U0075><U0061><U0069><U006E>";/
-            "<U0044><U0069><U006D><U00E0><U0069><U0072><U0074>";/
-            "<U0044><U0069><U0063><U0069><U0061><U0064><U0061><U0069><U006E>";/
-            "<U0044><U0069><U0061><U0072><U0064><U0061><U006F><U0069><U006E>";/
-            "<U0044><U0069><U0068><U0061><U006F><U0069><U006E><U0065>";/
-            "<U0044><U0069><U0073><U0061><U0074><U0068><U0061><U0069><U0072><U006E><U0065>"
-
-abmon       "<U0046><U0061><U006F>";"<U0047><U0065><U0061>";/
-            "<U004D><U00E0><U0072>";"<U0047><U0069><U0062>";/
-            "<U004D><U0068><U00E0>";"<U004F><U0067><U004D>";/
-            "<U006C><U0075><U0063>";"<U004C><U00F9><U006E>";/
-            "<U0053><U0075><U006C>";"<U0044><U0061><U006D>";/
-            "<U0053><U0061><U006D>";"<U0044><U00F9><U0062>"
+LC_MONETARY
+copy "en_GB"
+END LC_MONETARY
 
-mon	    "<U0041><U006D><U0020><U0046><U0061><U006F><U0069><U006C><U0074><U0065><U0061><U0063><U0068>";/
-	    "<U0041><U006E><U0020><U0047><U0065><U0061><U0072><U0072><U0061><U006E>";/
-	    "<U0041><U006D><U0020><U004D><U00E0><U0072><U0074>";/
-	    "<U0041><U006E><U0020><U0047><U0069><U0062><U006C><U0065><U0061><U006E>";/
-	    "<U0041><U0027><U0020><U004D><U0068><U00E0><U0069><U0067><U0068>";/
-	    "<U0041><U006E><U0020><U0074><U002D><U004D><U0068><U00EC><U006F><U0073>";/
-	    "<U0041><U006E><U0020><U0074><U002D><U006C><U0075><U0063><U0068><U0061><U0072>";/
-	    "<U0041><U006E><U0020><U004C><U00F9><U006E><U0061><U0073><U0064><U0061><U006C>";/
-	    "<U0041><U006E><U0020><U0074><U002D><U0053><U0075><U006C><U0074><U0061><U0069><U006E>";/
-	    "<U0041><U006E><U0020><U0044><U0061><U006D><U0068><U0061><U0069><U0072>";/
-	    "<U0041><U006E><U0020><U0074><U002D><U0053><U0061><U006D><U0068><U0061><U0069><U006E>";/
- 	    "<U0041><U006E><U0020><U0044><U00F9><U0062><U0068><U006C><U0061><U0063><U0068><U0064>"
+LC_PAPER
+copy "en_GB"
+END LC_PAPER
 
-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  ""
-first_workday 2
-first_weekday 2
-END LC_TIME
+LC_MEASUREMENT
+copy "en_GB"
+END LC_MEASUREMENT
 
 LC_MESSAGES
-% FIXME
-yesexpr     "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
-% FIXME
-noexpr      "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+% ^[tTyY].*
+yesexpr "<U005E><U005B><U0074><U0054><U0079><U0059><U005D><U002E><U002A>"
+% ^[cCnN].*
+noexpr  "<U005E><U005B><U0063><U0043><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_NAME
-% FIXME
 copy "en_GB"
 END LC_NAME
+
+LC_ADDRESS
+% %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%S%N%c%N
+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><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0053><U0025><U004E><U0025><U0063><U0025><U004E>"
+% A' Bhreatainn Mhòr
+country_name "<U0042><U0072><U0065><U0061><U0074><U0061><U0069><U006E><U006E><U0020><U004D><U0068><U00F2><U0072>"
+% GB
+country_ab2  "<U0047><U0042>"
+% GBR
+country_ab3  "<U0047><U0042><U0052>"
+country_num  826
+% GB
+country_car  "<U0047><U0042>"
+country_isbn 0
+% GĂ idhlig
+lang_name    "<U0047><U00E0><U0069><U0064><U0068><U006C><U0069><U0067>"
+% gd
+lang_ab      "<U0067><U0064>"
+% gla
+lang_term    "<U0067><U006C><U0061>"
+% gla
+lang_lib     "<U0067><U006C><U0061>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "en_GB"
+END LC_TELEPHONE