about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--NEWS8
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/locales/et_EE4
3 files changed, 10 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index b1e74b5395..1aca1e0cca 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,10 @@ Version 2.14
 
 * The following bugs are resolved with this release:
 
-  11724, 12393, 12420, 12445, 12449, 12454, 12460, 12469, 12489, 12509,
-  12510, 12518, 12541, 12545, 12551, 12583, 12587, 12597, 12611, 12631,
-  12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717,
-  12723, 12734, 12738
+  11724, 12346, 12393, 12420, 12445, 12449, 12454, 12460, 12469, 12489,
+  12509, 12510, 12518, 12541, 12545, 12551, 12583, 12587, 12597, 12611,
+  12631, 12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714,
+  12717, 12723, 12734, 12738
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 06766c9fed..9ac93fd99a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-09  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #12346]
+	* locales/et_EE (LC_MONETARY): Change to Euro.
+	Patch by Priit Laes <plaes@plaes.org>.
+
 	[BZ #12449]
 	* locales/lb_LU: New file.
 	* SUPPORTED (SUPPORTED-LOCALES): Add appropriate entry.
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 33d31102f4..c8bdc6b93d 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -2128,8 +2128,8 @@ translit_end
 END LC_CTYPE
 
 LC_MONETARY
-int_curr_symbol     "<U0045><U0045><U004B><U0020>"
-currency_symbol     "<U006B><U0072>"
+int_curr_symbol     "<U0045><U0055><U0052><U0020>"
+currency_symbol     "<U20AC>"
 mon_decimal_point   "<U002C>"
 mon_thousands_sep   "<U00A0>"
 mon_grouping        3;3