11 files changed, 41 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 7de1f00996..298bd22941 100644
--- 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 36537ba892..b1ad77f0eb 100644
--- 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 1ea5c4e3b0..12491d283c 100644
--- 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 aaef20dbd0..45af3aad79 100644
--- 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 a74e1629b2..1140979e8f 100644
--- 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 eba90ce996..67d6802bfe 100644
--- 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 165519a207..c5bac5ef17 100644
--- 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 c0aa4a4ce3..4f243dc5c6 100644
--- 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 b2b8577f6d..2ae085b37b 100644
--- 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 7b283024a6..da6628b38e 100644
--- 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 e306b2ef52..34f6021d16 100644
--- 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