summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-09-25 18:26:41 +0000
committerUlrich Drepper <drepper@redhat.com>2005-09-25 18:26:41 +0000
commitc1e3681907d81f8738bdcb3582f6a563e65b6f11 (patch)
tree4fb4348d9135aa95431df4b6f60590a0914ec79f /localedata
parent2cf8a390dd0f7bd851f13aac6e67de9841331744 (diff)
downloadglibc-c1e3681907d81f8738bdcb3582f6a563e65b6f11.tar.gz
glibc-c1e3681907d81f8738bdcb3582f6a563e65b6f11.tar.xz
glibc-c1e3681907d81f8738bdcb3582f6a563e65b6f11.zip
[BZ #278]
	* manual/stdio.texi (Hook Functions): Correct type of position
	parameter of seeker and fix fallout of the change in the text.

	* wcsmbs/tst-mbrtowc2.c: New file.
	* wcsmbs/Makefile (tests): Add tst-mbrtowc2.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/locales/zh_CN6
2 files changed, 6 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e1dd5edb72..1934f15632 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-25  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #811]
+	* locales/zh_CN: Fix date_fmt information.
+
 	* SUPPORTED (SUPPORTED-LOCALES): Add km_KH.
 
 	[BZ #826]
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index 152411da10..89fcf3b819 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -128,9 +128,9 @@ am_pm   "<U4E0A><U5348>";"<U4E0B><U5348>"
 
 t_fmt_ampm "<U0025><U0070><U0020><U0025><U0049><U65F6><U0025><U004D><U5206><U0025><U0053><U79D2>"
 
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt       "<U0025><U0059><U5E74><U0020><U0025><U006D><U6708><U0020>/
+<U0025><U0064><U65E5><U0020><U0025><U0041><U0020><U0025><U0048><U003A>/
+<U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
 END LC_TIME
 
 LC_MESSAGES