From 7dcf35f775f8a867195b660b1d9fb6d627a5b002 Mon Sep 17 00:00:00 2001 From: Marko Myllynen Date: Fri, 2 Nov 2012 11:37:02 +0200 Subject: [PATCH] Fix LC_IDENTIFICATION in fi_FI@euro --- NEWS | 2 +- localedata/ChangeLog | 6 ++++++ localedata/locales/fi_FI@euro | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 12184f8..ad8197f 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ Version 2.17 14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660, - 14661, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785. + 14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785. * Support for STT_GNU_IFUNC symbols added for s390 and s390x. Optimized versions of memcpy, memset, and memcmp added for System z10 and diff --git a/localedata/ChangeLog b/localedata/ChangeLog index fbfd189..1b36e02 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2012-11-02 Marko Myllynen + + [BZ #14669] + * locales/fi_FI@euro (LC_IDENTIFICATION): Add missing + LC_MEASUREMENT, fix LC_TELEPHONE category. + 2012-10-31 Joseph Myers * Makefile [$(run-built-tests) = yes] (LOCALES): Add en_US.UTF-8. diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro index 39c51d6..8c610cc 100644 --- a/localedata/locales/fi_FI@euro +++ b/localedata/locales/fi_FI@euro @@ -1,4 +1,4 @@ -escape_char / +escape_char / comment_char % % Finnish language locale for Finland with Euro @@ -33,10 +33,10 @@ category "fi_FI@euro:2000";LC_NUMERIC category "fi_FI@euro:2000";LC_MONETARY category "fi_FI@euro:2000";LC_MESSAGES category "fi_FI@euro:2000";LC_PAPER +category "fi_FI@euro:2000";LC_MEASUREMENT category "fi_FI@euro:2000";LC_NAME category "fi_FI@euro:2000";LC_ADDRESS -category "fi_FI:2000";LC_TELEPHONE - +category "fi_FI@euro:2000";LC_TELEPHONE END LC_IDENTIFICATION LC_COLLATE -- 2.7.4