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/zh_CN | |
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/zh_CN')
-rw-r--r-- | libc/localedata/locales/zh_CN | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/localedata/locales/zh_CN b/libc/localedata/locales/zh_CN index 1ed9d252e..ff21c8553 100644 --- a/libc/localedata/locales/zh_CN +++ b/libc/localedata/locales/zh_CN @@ -39,7 +39,7 @@ category "zh_CN:2000";LC_PAPER category "zh_CN:2000";LC_NAME category "zh_CN:2000";LC_ADDRESS category "zh_CN:2000";LC_TELEPHONE - +category "zh_CN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -188,5 +188,6 @@ lang_lib "<U0063><U0068><U0069>" END LC_ADDRESS LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT |