This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[Committed] Deduplicate country_car in selected locales.
- From: Chris Leonard <cjlhomeaddress at gmail dot com>
- To: libc-alpha <libc-alpha at sourceware dot org>
- Date: Fri, 6 Sep 2013 11:49:00 -0400
- Subject: [Committed] Deduplicate country_car in selected locales.
- Authentication-results: sourceware.org; auth=none
Correcting some inadvertant duplication of country_car introduced inot
locales with previous patch
./localedata/ChangeLog
2013-09-06 Chris Leonard <cjl@sugarlabs,.org>
* locales/nr_ZA: Deduplicate country_car.
* locales/nso_ZA: Likewise.
* locales/ss_ZA: Likewise.
* locales/tn_ZA: Likewise.
* locales/ve_ZA: Likewise.
* locales/tk_TM: Comment reformat.
---
localedata/locales/nr_ZA | 5 +----
localedata/locales/nso_ZA | 4 +---
localedata/locales/ss_ZA | 4 +---
localedata/locales/tk_TM | 42 ++++++++++++++++++++++++++----------------
localedata/locales/tn_ZA | 5 ++---
localedata/locales/ve_ZA | 4 +---
6 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index 3c9e810..32c2e69 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -227,7 +227,7 @@ 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"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -281,7 +281,4 @@ country_ab2 "<U005A><U0041>"
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
-
END LC_ADDRESS
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index 0094ca7..abe2be2 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -223,7 +223,7 @@ 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"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -277,8 +277,6 @@ country_ab2 "<U005A><U0041>"
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
index 5c87e57..19cb741 100644
--- a/localedata/locales/ss_ZA
+++ b/localedata/locales/ss_ZA
@@ -232,7 +232,7 @@ 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"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -284,7 +284,5 @@ postal_fmt
"<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_num 710
country_ab2 "<U005A><U0041>"
country_ab3 "<U005A><U0041><U0046>"
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
index 43059af..f341b09 100644
--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@@ -399,18 +399,20 @@ LC_MESSAGES
% (used for "yes" in English, but corresponding to "no" in Turkmen (well,
% ý actually)
%%%%%%%%
-yesstr "<U0068><U0061><U0077><U0061>" % hawa
-nostr "<U00FD><U006F><U006B>" % ýok
+% hawa
+yesstr "<U0068><U0061><U0077><U0061>"
+% ýok
+nostr "<U00FD><U006F><U006B>"
+% [hH]
yesexpr "<U005E><U005B><U0068><U0048>/
-<U005D><U002E><U002A>" % [hH]
+<U005D><U002E><U002A>"
+% [ýÝnN]
noexpr "<U005E><U005B><U00FD><U00DD>/
-<U006E><U004E><U005D><U002E><U002A>" % [ýÝnN]
+<U006E><U004E><U005D><U002E><U002A>"
END LC_MESSAGES
LC_PAPER
-%
% A4 Paper
-%
height 297
width 210
END LC_PAPER
@@ -433,19 +435,27 @@ 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>"
-
+% Türkmenistan
country_name "<U0054><U00FC><U0072><U006B><U006D>/
-<U0065><U006E><U0069><U0073><U0074><U0061><U006E>" % Türkmenistan
-country_post "<U0054><U004D>" % TM
-country_car "<U0054><U004D>" % TM
+<U0065><U006E><U0069><U0073><U0074><U0061><U006E>"
+% TM
+country_post "<U0054><U004D>"
+% TM
+country_car "<U0054><U004D>"
country_num 795
-country_ab2 "<U0054><U004D>" % TM
-country_ab3 "<U0054><U004B><U004D>" % TKM
+% TM
+country_ab2 "<U0054><U004D>"
+% TKM
+country_ab3 "<U0054><U004B><U004D>"
+% Türkmençe
lang_name "<U0054><U00FC><U0072><U006B><U006D>/
-<U0065><U006E><U00E7><U0065>" % Türkmençe
-lang_term "<U0074><U0075><U006B>" % tuk
-lang_lib "<U0074><U0075><U006B>" % tuk
-lang_ab "<U0074><U006B>" % tk
+<U0065><U006E><U00E7><U0065>"
+% tuk
+lang_term "<U0074><U0075><U006B>"
+% tuk
+lang_lib "<U0074><U0075><U006B>"
+% tk
+lang_ab "<U0074><U006B>"
END LC_ADDRESS
LC_TELEPHONE
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
index 134ef0b..a3f36db 100644
--- a/localedata/locales/tn_ZA
+++ b/localedata/locales/tn_ZA
@@ -235,7 +235,7 @@ 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"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -288,8 +288,7 @@ country_ab2 "<U005A><U0041>"
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
+
END LC_ADDRESS
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index 26a68d0..b7cf303 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -232,7 +232,7 @@ 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"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -287,7 +287,5 @@ postal_fmt
"<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_num 710
country_ab2 "<U005A><U0041>"
country_ab3 "<U005A><U0041><U0046>"
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
--
1.7.11.7