2 files changed, 15 insertions, 2 deletions
diff --git a/common/ini-file.cpp b/common/ini-file.cpp
index 90d40b7c7d..4c4acc9e60 100644
--- a/common/ini-file.cpp
+++ b/common/ini-file.cpp
@@ -29,12 +29,18 @@
 namespace Common {
 
 bool INIFile::isValidName(const String &name) const {
+	if (_allowNonEnglishCharacters)
+		return true;
 	const char *p = name.c_str();
 	while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
 		p++;
 	return *p == 0;
 }
 
+INIFile::INIFile() {
+	_allowNonEnglishCharacters = false;
+}
+
 void INIFile::clear() {
 	_sections.clear();
 }
@@ -102,7 +108,7 @@ bool INIFile::loadFromStream(SeekableReadStream &stream) {
 			// is, verify that it only consists of alphanumerics,
 			// periods, dashes and underscores). Mohawk Living Books games
 			// can have periods in their section names.
-			while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
+			while (*p && ((_allowNonEnglishCharacters && *p != ']') || isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
 				p++;
 
 			if (*p == '\0')
@@ -435,4 +441,8 @@ void INIFile::Section::removeKey(const String &key) {
 	}
 }
 
+void INIFile::allowNonEnglishCharacters() {
+	_allowNonEnglishCharacters = true;
+}
+
 } // End of namespace Common
diff --git a/common/ini-file.h b/common/ini-file.h
index 98be1e08bb..5d72f23bb9 100644
--- a/common/ini-file.h
+++ b/common/ini-file.h
@@ -77,7 +77,7 @@ public:
 	typedef List<Section> SectionList;
 
 public:
-	INIFile() {}
+	INIFile();
 	~INIFile() {}
 
 	// TODO: Maybe add a copy constructor etc.?
@@ -115,8 +115,11 @@ public:
 
 	void listKeyValues(StringMap &kv);
 
+	void allowNonEnglishCharacters();
+
 private:
 	SectionList _sections;
+	bool _allowNonEnglishCharacters;
 
 	Section *getSection(const String &section);
 	const Section *getSection(const String &section) const;