Rename Oriya locale to Odia (bug 15601)

The state of Orissa was officially renamed the state to Odisha and the
language from Oriya to Odia in 2010.

References:

http://zeenews.india.com/election09/story.aspx?aid=739995
http://orissamatters.com/2011/11/07/orissa-became-odisha/
http://www.ndtv.com/article/india/parliament-passes-bill-to-change-orissa-s-name-93888
http://orissa.gov.in/e-magazine/Orissareview/2011/Nov/engpdf/9-17.pdf

diff --git a/ChangeLog b/ChangeLog
index a138e0bc3f714106d6fd9b1b72dfa733571285ec..d5a5bafeb22c572859e73b0ab67d0f2d222e9a02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-20  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+       [BZ #15601]
+       * libio/tst-widetext.input: Rename Oriya to Odia.
+       * locale/iso-639.def: Likewise.
+
        * manual/probes.texi (Mathematical Function Probes): Add
        documentation for sin, cos, asin and acos probes.
        * sysdeps/ieee754/dbl-64/sincos32.c: Include stap-probe.h.

diff --git a/NEWS b/NEWS
index 0fdc535dd47fd738eb93cbbf92fda4d90d16e3d5..f9837a66d64da0552314994a81cd68553c334d14 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,14 +12,14 @@ Version 2.19
   156, 387, 431, 832, 2801, 7003, 9954, 10253, 10278, 11087, 13028, 13982,
   13985, 14029, 14143, 14155, 14547, 14699, 14752, 14876, 14910, 15048,
   15218, 15277, 15308, 15362, 15374, 15400, 15427, 15483, 15522, 15531,
-  15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681,
-  15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15763, 15764,
-  15797, 15799, 15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859,
-  15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
-  15917, 15919, 15921, 15923, 15939, 15948, 15963, 15966, 15985, 15988,
-  15997, 16032, 16034, 16036, 16037, 16041, 16055, 16071, 16072, 16074,
-  16078, 16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167,
-  16172.
+  15532, 15601, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680,
+  15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15763,
+  15764, 15797, 15799, 15825, 15844, 15847, 15849, 15855, 15856, 15857,
+  15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905,
+  15909, 15917, 15919, 15921, 15923, 15939, 15948, 15963, 15966, 15985,
+  15988, 15997, 16032, 16034, 16036, 16037, 16041, 16055, 16071, 16072,
+  16074, 16078, 16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153,
+  16167, 16172.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

diff --git a/libio/tst-widetext.input b/libio/tst-widetext.input
index bef07cef3dfa0602fccc9896a00c7a8185666e2e..b4382c000896bf0dede16855d0dc16325eff6a1b 100644 (file)
--- a/libio/tst-widetext.input
+++ b/libio/tst-widetext.input
@@ -126,7 +126,7 @@ Gujarati (U+0A80-U+0AFF):
 ઀◌ઁ◌ંઃ઄અઆઇઈઉઊઋઌઍ઎એઐઑ઒ઓઔકખગઘઙચછજઝઞટઠડઢણતથદધન઩પફબભમયર઱લળ઴વશષસહ઺઻◌઼ઽાિ
 ી◌ુ◌ૂ◌ૃ◌ૄ◌ૅ૆◌ે◌ૈૉ૊ોૌ◌્૎૏ૐ૑૒૓૔૕૖૗૘૙૚૛૜૝૞૟ૠૡૢૣ૤૥૦૧૨૩૪૫૬૭૮૯૰૱૲૳૴૵૶૷૸ૹૺૻૼ૽૾૿
 
-Oriya (U+0B00-U+0B7F):
+Odia (U+0B00-U+0B7F):
 
 ଀◌ଁଂଃ଄ଅଆଇଈଉଊଋଌ଍଎ଏଐ଑଒ଓଔକଖଗଘଙଚଛଜଝଞଟଠଡଢଣତଥଦଧନ଩ପଫବଭମଯର଱ଲଳ଴ଵଶଷସହ଺଻◌଼ଽା◌ି
 ୀ◌ୁ◌ୂ◌ୃୄ୅୆େୈ୉୊ୋୌ◌୍୎୏୐୑୒୓୔୕◌ୖୗ୘୙୚୛ଡ଼ଢ଼୞ୟୠୡୢୣ୤୥୦୧୨୩୪୫୬୭୮୯୰ୱ୲୳୴୵୶୷୸୹୺୻୼୽୾୿

diff --git a/locale/iso-639.def b/locale/iso-639.def
index 56db3c81d53709194486bc579f0ec5cc4a14cc3d..994792e085d01cd0373030f825e75d77c6617915 100644 (file)
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -361,7 +361,7 @@ DEFINE_LANGUAGE_CODE3 ("Nyoro", nyo, nyo)
 DEFINE_LANGUAGE_CODE3 ("Nzima", nzi, nzi)
 DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Provençal", oc, oci, oci)
 DEFINE_LANGUAGE_CODE ("Ojibwa", oj, oji, oji)
-DEFINE_LANGUAGE_CODE ("Oriya", or, ori, ori)
+DEFINE_LANGUAGE_CODE ("Odia", or, ori, ori)
 DEFINE_LANGUAGE_CODE ("Oromo", om, orm, orm)
 DEFINE_LANGUAGE_CODE3 ("Osage", osa, osa)
 DEFINE_LANGUAGE_CODE ("Ossetian; Ossetic", os, oss, oss)

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5ee812c90eda17f9a196668d0f8db21970e97f6d..0bb8bb195d834ef945f6f819a361c3ab1cecd5d6 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       [BZ #15601]
+       * locales/or_IN: Rename Oriya to Odia.
+
 2013-11-18  Chris Leonard  <cjl@sugarlabs.org>
 
        [BZ #16144]

diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index 97e9479a96b39ca4697b73f910b8f6168b00c7a6..71e0f83e70a62641bac2d780d93722cedb98db2e 100644 (file)
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -1,19 +1,19 @@
 comment_char %
 escape_char /
 
-% Oriya locale for India.
+% Odia locale for India.
 % Contributed by Masahide Washizawa <washi at jp ibm com>
 
 %%%%%%%%%%%%%
 LC_IDENTIFICATION
-title       "Oriya language locale for India"
+title       "Odia language locale for India"
 source      "IBM AP Linux Technology Center, Yamato Software Laboratory"
 address     "1623-14, Shimotsuruma, Yamato-shi, Kanagawa-ken, 242-8502, Japan"
 contact     ""
 email       "bug-glibc@gnu.org"
 tel         ""
 fax         ""
-language    "Oriya"
+language    "Odia"
 territory   "India"
 revision    "1.0"
 date        "2006-05-25"
@@ -36,10 +36,10 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
-% Oriya uses the alternate digits U+0B66..U+0B6F
+% Odia uses the alternate digits U+0B66..U+0B6F
 outdigit <U0B66>..<U0B6F>
 
-% This is used in the scanf family of functions to read Oriya numbers
+% This is used in the scanf family of functions to read Odia numbers
 % using "%Id" and such.
 map to_inpunct; /
   (<U0030>,<U0B66>); /