From: Benjamin Leduc <benjaminleduc@Machin-chose-de-Benjamin.local>
Date: Tue, 17 Dec 2013 16:21:34 +0000 (+0100)
Subject: trouble in coding-UTF-8
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=68daf3fb3232a1ab632f1f65870b689ca0860492;p=supertux.git

trouble in coding-UTF-8
---

diff --git a/external/tinygettext/tinygettext/language.cpp b/external/tinygettext/tinygettext/language.cpp
index a62fc38b8..69194257f 100644
--- a/external/tinygettext/tinygettext/language.cpp
+++ b/external/tinygettext/tinygettext/language.cpp
@@ -70,7 +70,6 @@ LanguageSpec languages[] = {
   { "ca", "ES", "valencia", "Catalan (valencia)" },
   { "ca", "ES", 0, "Catalan (Spain)"             },
   { "ca", 0,    "valencia", "Catalan (valencia)" },
-  { "cmn", 0,    0, "Mandarin"                   },
   { "ca", 0,    0, "Catalan"                     },
   { "co", 0,    0, "Corsican"                    },
   { "cs", 0,    0, "Czech"                       },
@@ -192,7 +191,7 @@ LanguageSpec languages[] = {
   { "my", 0,    0, "Burmese"                     },
   { "my", "MM", 0, "Burmese (Myanmar)"           },
   { "nb", 0,    0, "Norwegian Bokmal"            },
-  { "nb", "NO", 0, "Norwegian Bokmål (Norway)"   },
+  { "nb", "NO", 0, "Norwegian Bokmål (Norway)"   },
   { "ne", 0,    0, "Nepali"                      },
   { "nl", 0,    0, "Dutch"                       },
   { "nl", "BE", 0, "Dutch (Belgium)"             },
@@ -296,7 +295,7 @@ resolve_language_alias(const std::string& name)
 
     // Aliases taken from /etc/locale.alias
     language_aliases["bokmal"]           = "nb_NO.ISO-8859-1";
-    language_aliases["bokmål"]           = "nb_NO.ISO-8859-1";
+    language_aliases["bokmål"]           = "nb_NO.ISO-8859-1";
     language_aliases["catalan"]          = "ca_ES.ISO-8859-1";
     language_aliases["croatian"]         = "hr_HR.ISO-8859-2";
     language_aliases["czech"]            = "cs_CZ.ISO-8859-2";
@@ -307,7 +306,7 @@ resolve_language_alias(const std::string& name)
     language_aliases["eesti"]            = "et_EE.ISO-8859-1";
     language_aliases["estonian"]         = "et_EE.ISO-8859-1";
     language_aliases["finnish"]          = "fi_FI.ISO-8859-1";
-    language_aliases["français"]         = "fr_FR.ISO-8859-1";
+    language_aliases["français"]         = "fr_FR.ISO-8859-1";
     language_aliases["french"]           = "fr_FR.ISO-8859-1";
     language_aliases["galego"]           = "gl_ES.ISO-8859-1";
     language_aliases["galician"]         = "gl_ES.ISO-8859-1";