13 files changed, 69 insertions, 9 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 83f8119128..76da733ea9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,18 @@
+2013-11-01  Chris Leonard  <cjl@sugarlabs.org>
+
+	* locales/nb_NO: Adjust language-code fields of LC_ADDRESS.
+	* locales/ne_NP: Likewise.
+	* locales/nhn_MX: Likewise.
+	* locales/niu_NU: Likewise.
+	* locales/niu_NZ: Likewise.
+	* locales/nl_AW: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/nn_NO: Likewise.
+	* locales/nr_ZA: Likewise.
+	* locales/oc_FR: Likewise.
+	* locales/or_IN: Likewise.
+	* locales/os_RU: Likewise.
+
 2013-10-31  Chris Leonard  <cjl@sugarlabs.org>
 
 	* locales/mag_IN: Adjust language-code fields of LC_ADDRESS.
diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
index 66b590f6db..07df38cc8b 100644
--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@@ -243,5 +243,10 @@ country_ab3 "<U004E><U004F><U0052>"
 country_num 578
 % N
 country_car    "<U004E>"
-
+% nb
+lang_ab      "<U006E><U0062>"
+% nob
+lang_term    "<U006E><U006F><U0062>"
+% nob
+lang_lib    "<U006E><U006F><U0062>"
 END LC_ADDRESS
diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP
index 7574772cbd..9ee000a948 100644
--- a/localedata/locales/ne_NP
+++ b/localedata/locales/ne_NP
@@ -197,7 +197,12 @@ country_ab3 "<U004E><U0050><U004C>"
 country_num 524
 % NEP
 country_car    "<U004E><U0045><U0050>"
-
+% ne
+lang_ab      "<U006E><U0065>"
+% nep
+lang_term    "<U006E><U0065><U0070>"
+% nep
+lang_lib    "<U006E><U0065><U0070>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
index 9029fb08f8..6534b78a8d 100644
--- a/localedata/locales/nhn_MX
+++ b/localedata/locales/nhn_MX
@@ -150,5 +150,8 @@ country_ab3   "<U004D><U0045><U0058>"
 country_num   484
 % MEX
 country_car    "<U004D><U0045><U0058>"
-
+% nhn
+lang_term    "<U006E><U0068><U006E>"
+% nhn
+lang_lib    "<U006E><U0068><U006E>"
 END LC_ADDRESS
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index 9b2c4510d1..440b497f8a 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -183,6 +183,8 @@ country_ab3  "<U004E><U0049><U0055>"
 country_num  570
 % niu
 lang_term    "<U006E><U0069><U0075>"
+% niu
+lang_lib    "<U006E><U0069><U0075>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index 9a7e333aff..0afacda7e0 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -185,6 +185,8 @@ country_num  554
 country_car    "<U004E><U005A>"
 % niu
 lang_term    "<U006E><U0069><U0075>"
+% niu
+lang_lib    "<U006E><U0069><U0075>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index e9fe8f82e1..3da454b657 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -85,6 +85,9 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0041><U0057>"
 country_ab3   "<U0041><U0042><U0057>"
 country_num   533
+lang_ab "<U006E><U006C>"
+lang_term "<U006E><U006C><U0064>"
+lang_lib "<U0064><U0075><U0074>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index a3d72dca02..3d1615b6ca 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -136,5 +136,7 @@ country_ab3 "<U0042><U0045><U004C>"
 country_num 056
 % B
 country_car    "<U0042>"
-
+lang_ab "<U006E><U006C>"
+lang_term "<U006E><U006C><U0064>"
+lang_lib "<U0064><U0075><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
index c9fe730869..b1a829fa68 100644
--- a/localedata/locales/nn_NO
+++ b/localedata/locales/nn_NO
@@ -161,6 +161,12 @@ country_ab3 "<U004E><U004F><U0052>"
 country_num 578
 % N
 country_car    "<U004E>"
+% nn
+lang_ab      "<U006E><U006E>"
+% nno
+lang_term    "<U006E><U006E><U006F>"
+% nno
+lang_lib    "<U006E><U006E><U006F>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index 32c2e693da..62d7567c12 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -239,9 +239,12 @@ lang_name "<U0049><U0073><U0069><U004E><U0064><U0065><U0062><U0065><U006C><U0065
 
 % ISO 639 two and three letter language names
 % see http://www.loc.gov/standards/iso639-2/englangn.html
-% "nr", "nbl"
+% nr
 lang_ab   "<U006E><U0072>"
+% nbl
 lang_term "<U006E><U0062><U006C>"
+% nbl
+lang_lib "<U006E><U0062><U006C>"
 
 % Representation of postal addresses (minus the addressee's name) in South
 % Africa. (Ignored for now)
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index 2a7f836434..dfdc095079 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -47,9 +47,12 @@ country_num 250
 country_isbn "2"
 country_car "F"
 % FIXME lang_name "Occitan" in Occitan ?
-lang_ab "oc"
-lang_term "oci"
-lang_lib "oci"
+% oc
+lang_ab      "<U006F><U0063>"
+% oci
+lang_term    "<U006F><U0063><U0069>"
+% oci
+lang_lib     "<U006F><U0063><U0069>"
 END LC_ADDRESS
 
 LC_CTYPE
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index a291cc3ecb..15ed7ce4c6 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -815,6 +815,12 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
+% or
+lang_ab      "<U006F><U0072>"
+% ori
+lang_term    "<U006F><U0072><U0069>"
+% ori
+lang_lib    "<U006F><U0072><U0069>"
 END LC_ADDRESS
 
 %%%%%%%%%%%%%
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index fe66c28643..91743dd651 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -176,5 +176,10 @@ country_ab3 "<U0052><U0055><U0053>"
 country_num 643
 % RUS
 country_car    "<U0052><U0055><U0053>"
-
+% os
+lang_ab      "<U006F><U0073>"
+% oss
+lang_term    "<U006F><U0073><U0073>"
+% oss
+lang_lib    "<U006F><U0073><U0073>"
 END LC_ADDRESS