summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog7
-rw-r--r--src/desktop_file.c6
3 files changed, 11 insertions, 3 deletions
diff --git a/.cvsignore b/.cvsignore
index 18e3763..550cca2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,6 +10,7 @@ config.status
config.sub
configure
depcomp
+elisp-comp
install-sh
libtool
ltmain.sh
diff --git a/ChangeLog b/ChangeLog
index 94c531e..e5bc5af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-23 Mark McLoughlin <mark@skynet.ie>
+
+ Patch from Ville Skyttä <ville.skytta@iki.fi>
+
+ * src/desktop_file.c: fix the lang -> encoding mapping
+ to what the Desktop Entry Specification specifies.
+
2004-11-11 Mark McLoughlin <mark@skynet.ie>
* configure.in: post-release bump to 0.11.
diff --git a/src/desktop_file.c b/src/desktop_file.c
index 3fa5e97..bd8a058 100644
--- a/src/desktop_file.c
+++ b/src/desktop_file.c
@@ -1479,15 +1479,15 @@ struct {
const char *encoding;
const char *langs[N_LANG];
} known_encodings[] = {
- {"ARMSCII-8", {"by"}},
+ {"ARMSCII-8", {"hy"}},
{"BIG5", {"zh_TW"}},
{"CP1251", {"be", "bg"}},
- {"EUC-CN", {"zh_TW"}},
+ {"EUC-CN", {"zh_CN"}},
{"EUC-JP", {"ja"}},
{"EUC-KR", {"ko"}},
{"GEORGIAN-ACADEMY", {}},
{"GEORGIAN-PS", {"ka"}},
- {"ISO-8859-1", {"br", "ca", "da", "de", "en", "es", "eu", "fi", "fr", "gl", "it", "nl", "wa", "no", "pt", "pt", "sv"}},
+ {"ISO-8859-1", {"br", "ca", "da", "de", "en", "es", "eu", "fi", "fr", "gl", "it", "nl", "no", "pt", "sv", "wa" }},
{"ISO-8859-2", {"cs", "hr", "hu", "pl", "ro", "sk", "sl", "sq", "sr"}},
{"ISO-8859-3", {"eo"}},
{"ISO-8859-5", {"mk", "sp"}},