aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog4
-rw-r--r--widgets/misc/e-charset-picker.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 6628f3d325..31ad2b2761 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-12 Jeffrey Stedfast <fejj@novell.com>
+
+ * e-charset-picker.c: s/GB-2312/GB2312/ - fixes bug #61385.
+
2004-06-24 Rodney Dawes <dobey@novell.com>
* e-error.c (e_error_newv): Fix alignment of the icon to be 0x0
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 15f50b7921..79693ace1b 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -92,7 +92,7 @@ static ECharset charsets[] = {
{ "BIG5HKSCS", E_CHARSET_CHINESE, N_("Traditional") },
{ "EUC-TW", E_CHARSET_CHINESE, N_("Traditional") },
{ "GB18030", E_CHARSET_CHINESE, N_("Simplified") },
- { "GB-2312", E_CHARSET_CHINESE, N_("Simplified") },
+ { "GB2312", E_CHARSET_CHINESE, N_("Simplified") },
{ "HZ", E_CHARSET_CHINESE, N_("Simplified") },
{ "ISO-2022-CN", E_CHARSET_CHINESE, N_("Simplified") },
{ "KOI8-R", E_CHARSET_CYRILLIC, NULL },