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/sl_SI | |
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/sl_SI')
-rw-r--r-- | libc/localedata/locales/sl_SI | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libc/localedata/locales/sl_SI b/libc/localedata/locales/sl_SI index 353933eb0..9fb44da08 100644 --- a/libc/localedata/locales/sl_SI +++ b/libc/localedata/locales/sl_SI @@ -44,7 +44,7 @@ category "sl_SI:2000";LC_PAPER category "sl_SI:2000";LC_NAME category "sl_SI:2000";LC_ADDRESS category "sl_SI:2000";LC_TELEPHONE - +category "sl_SI:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2205,8 +2205,8 @@ int_prefix "<U0033><U0038><U0036>" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME @@ -2225,6 +2225,8 @@ country_ab3 "<U0053><U0056><U004E>" country_num 705 % SLO country_car "<U0053><U004C><U004F>" +% slovenščina +lang_name "<U0073><U006C><U006F><U0076><U0065><U006E><U0161><U010D><U0069><U006E><U0061>" % sl lang_ab "<U0073><U006C>" % slv |