diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
| commit | f71e9a28759c1f5d6e8dc0baced440e72507b433 (patch) | |
| tree | d1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/localedata/locales/nb_NO | |
| parent | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff) | |
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/localedata/locales/nb_NO')
| -rw-r--r-- | libc/localedata/locales/nb_NO | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libc/localedata/locales/nb_NO b/libc/localedata/locales/nb_NO index 07df38cc8..513d50c20 100644 --- a/libc/localedata/locales/nb_NO +++ b/libc/localedata/locales/nb_NO @@ -42,7 +42,7 @@ category "nb_NO:2000";LC_PAPER category "nb_NO:2000";LC_NAME category "nb_NO:2000";LC_ADDRESS category "nb_NO:2000";LC_TELEPHONE - +category "nb_NO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -224,7 +224,8 @@ int_prefix "<U0034><U0037>" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME @@ -243,6 +244,8 @@ country_ab3 "<U004E><U004F><U0052>" country_num 578 % N country_car "<U004E>" +% Bokmål +lang_name "<U0042><U006F><U006B><U006D><U00E5><U006C>" % nb lang_ab "<U006E><U0062>" % nob |