Fix lang_lib/lang_term as per ISO 639-2 [BZ #16973]

lang_lib (which reflects ISO 639-2/B (bibliographic) codes) and
lang_term (which reflects ISO 639-2/T (terminology) codes) should be
identical except for those languages for which ISO 639-2 specifies
separate bibliographic/terminology values.

I used this Library of Congress page as the source:
	http://www.loc.gov/standards/iso639-2/php/code_list.php

diff --git a/ChangeLog b/ChangeLog
index 7de1f009965b63868b0dea5f4061ba3ed5dfb630..298bd229418f9ae71fa856a79598569969359546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-08-18  Marko Myllynen  <myllynen@redhat.com>
+
+       [BZ #16973]
+       * locales/eu_ES: Fix lang_lib.
+       * locales/lb_LU: Likewise.
+       * locales/my_MM: Likewise.
+       * locales/sr_ME: Likewise.
+       * locales/sr_RS: Likewise.
+       * locales/sr_RS@latin: Likewise.
+       * locales/tr_TR: Likewise.
+       * locales/lo_LA: Fix lang_term.
+       * locales/km_KH: Fix lang_ab, lang_term, lang_lib.
+
 2015-08-18  Zack Weinberg  <zackw@panix.com>
 
        * misc/Versions (libc): Add GLIBC_2.23.

diff --git a/NEWS b/NEWS
index 36537ba892010808d669dc0d98d900ce2e1b4083..b1ad77f0ebb620d9371b4fe26ed175e65eea16cf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,9 @@ Version 2.23
 
 * The following bugs are resolved with this release:
 
-  16517, 16519, 16520, 16734, 17905, 18084, 18086, 18265, 18421, 18480,
-  18525, 18618, 18647, 18661, 18681, 18674, 18778, 18781, 18787, 18789,
-  18790, 18795, 18820, 18823, 18824.
+  16517, 16519, 16520, 16734, 16973, 17905, 18084, 18086, 18265, 18421,
+  18480, 18525, 18618, 18647, 18661, 18681, 18674, 18778, 18781, 18787,
+  18789, 18790, 18795, 18820, 18823, 18824.
 
 * The obsolete header <regexp.h> has been removed.  Programs that require
   this header must be updated to use <regex.h> instead.

diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index 1ea5c4e3b0ec382a3c5acbca1cacb681c39eccdb..12491d283c1522c7ad5038b86ad4d288a02b3340 100644 (file)
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -175,6 +175,6 @@ lang_name    "<U0045><U0075><U0073><U006B><U0061><U0072><U0061>"
 lang_ab      "<U0065><U0075>"
 % eus
 lang_term    "<U0065><U0075><U0073>"
-% eus
-lang_lib    "<U0065><U0075><U0073>"
+% baq
+lang_lib    "<U0062><U0061><U0071>"
 END LC_ADDRESS

diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index aaef20dbd04297ae0710d1b994dca78e2886063c..45af3aad79a20f521653fcc4fd5ac6ef27d3d20b 100644 (file)
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1898,7 +1898,10 @@ country_car   "<U004C><U0041><U004F>"
 %country_isbn  ""
 % ភាសាខ្មែរ (Khmer)
 lang_name     "<U1797><U17B6><U179F><U17B6><U1781><U17D2><U1798><U17C2><U179A>"
-lang_ab       "<U006C><U006F>"
-lang_term     "<U006c><U0061><U006F>"
-lang_lib      "<U006C><U0061><U006F>"
+% km
+lang_ab       "<U006B><U006D>"
+% khm
+lang_term     "<U006B><U0068><U006D>"
+% khm
+lang_lib      "<U006B><U0068><U006D>"
 END LC_ADDRESS

diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index a74e1629b2794f371448d834fc662aeeeec8abbd..1140979e8f7f333159879dacc4a483423f77e870 100644 (file)
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -179,8 +179,10 @@ country_isbn  2
 lang_name     "<U004C><U00EB><U0074><U007A><U0065><U0062><U0075><U0065>/
 <U0072><U0067><U0065><U0073><U0063><U0068>"
 lang_ab       "<U006C><U0062>"
+% ltz
 lang_term     "<U006C><U0074><U007A>"
-lang_lib      "<U006C><U0075><U0078>"
+% ltz
+lang_lib      "<U006C><U0074><U007A>"
 END LC_ADDRESS
 
 LC_TELEPHONE

diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index eba90ce996fb5b794b52ec7b68345f8fa1f62681..67d6802bfe1beebb6db28adb6571c569a662843b 100644 (file)
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -776,6 +776,6 @@ country_car   "<U004C><U0041><U004F>"
 %country_isbn  ""
 lang_name     "<U0EA5><U0EB2><U0EA7>"
 lang_ab       "<U006C><U006F>"
-lang_term     "<U006c><U0061><U006F>"
+lang_term     "<U006C><U0061><U006F>"
 lang_lib      "<U006C><U0061><U006F>"
 END LC_ADDRESS

diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index 165519a20759801c8ee9c6d544d21e23789b4b74..c5bac5ef17b08133af9cc26f9482ec27e5919895 100644 (file)
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -314,6 +314,8 @@ country_ab2     "<U004D><U004D>"
 country_car  "<U0042><U0041>"
 lang_ab         "<U006D><U0079>"
 lang_name       "<U1017><U1019><U102C>"
+% mya
 lang_term   "<U006D><U0079><U0061>"
-lang_lib    "<U006D><U0079><U0061>"
+% bur
+lang_lib    "<U0062><U0075><U0072>"
 END LC_ADDRESS

diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
index c0aa4a4ce346ad9c67ceb7092de7b7e76e6795f0..4f243dc5c6b29bb0851b0a3388be941e672605a3 100644 (file)
--- a/localedata/locales/sr_ME
+++ b/localedata/locales/sr_ME
@@ -151,8 +151,10 @@ country_num   499
 country_car   "<U004D><U004E><U0045>"
 country_isbn  "<U0038><U0036>"
 lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+% srp
 lang_term     "<U0073><U0072><U0070>"
-lang_lib      "<U0073><U0063><U0063>"
+% srp
+lang_lib      "<U0073><U0072><U0070>"
 lang_ab              "<U0073><U0072>"
 END LC_ADDRESS
 

diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index b2b8577f6d25b4ab6454835c35e28250836f5ef7..2ae085b37bc4e656337d2d7355ca17045042b7c2 100644 (file)
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -342,8 +342,10 @@ country_car   "<U0053><U0052><U0042>"
 % FIXME: ISBN code is what? "86" that preceedes all the numbers?
 country_isbn  "<U0038><U0036>"
 lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+% srp
 lang_term     "<U0073><U0072><U0070>"
-lang_lib      "<U0073><U0063><U0063>"
+% srp
+lang_lib      "<U0073><U0072><U0070>"
 lang_ab              "<U0073><U0072>"
 END LC_ADDRESS
 

diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index 7b283024a60ea8a4f270548a8c0336638717dda8..da6628b38e309590655b47d9962298dbd08b00de 100644 (file)
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -160,8 +160,10 @@ country_num   688
 country_car   "<U0053><U0052><U0042>"
 country_isbn  "<U0038><U0036>"
 lang_name     "<U0073><U0072><U0070><U0073><U006B><U0069>"
+% srp
 lang_term     "<U0073><U0072><U0070>"
-lang_lib      "<U0073><U0063><U0063>"
+% srp
+lang_lib      "<U0073><U0072><U0070>"
 lang_ab              "<U0073><U0072>"
 END LC_ADDRESS
 

diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index e306b2ef529c7e0f6863a4331b5c1494d77d0eac..34f6021d16731151bf49026ba5cac8e65e0f72ab 100644 (file)
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -3597,7 +3597,7 @@ lang_name "<U0054><U0075><U0072><U006B><U0069><U0073><U0068>"
 % tur
 lang_term      "<U0074><U0075><U0072>"
 % tur
-lang_lib       "<U0074><U0072>"
+lang_lib       "<U0074><U0075><U0072>"
 %tr
 lang_ab                "<U0074><U0072>"
 END LC_ADDRESS