Merge branch 'pr1194'

Reduced merge that drops the unnecessary changes

res.qrc

@@ -63,6 +63,7 @@
         <file>translations/ru.qm</file>
         <file>translations/sv.qm</file>
         <file>translations/uk.qm</file>
+        <file>translations/zh.qm</file>
         <file>ui/acceptFileButton/default.png</file>
         <file>ui/acceptFileButton/hover.png</file>
         <file>ui/acceptFileButton/pressed.png</file>

src/widget/form/settings/generalform.cpp

@@ -30,8 +30,8 @@
 
 #include "src/autoupdate.h"
 
-static QStringList locales = {"bg", "de", "en", "es", "fr", "it", "lt", "mannol", "nl", "pirate", "pl", "pt", "ru", "fi", "sv", "uk"};
-static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Italiano", "Lietuvių", "mannol", "Nederlands", "Pirate", "Polski", "Português", "Русский", "Suomi", "Svenska", "Українська"};
+static QStringList locales = {"bg", "de", "en", "es", "fr", "it", "lt", "mannol", "nl", "pirate", "pl", "pt", "ru", "fi", "sv", "uk", "zh"};
+static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Italiano", "Lietuvių", "mannol", "Nederlands", "Pirate", "Polski", "Português", "Русский", "Suomi", "Svenska", "Українська", "简体中文"};
 
 static QStringList timeFormats = {"hh:mm AP", "hh:mm", "hh:mm:ss AP", "hh:mm:ss"};
 

translations/i18n.pri

@@ -14,6 +14,7 @@ TRANSLATIONS = translations/es.ts \
                translations/ru.ts \
                translations/sv.ts \
                translations/uk.ts \
+               translations/zh.ts \
                translations/pt.ts
 
 #rules to generate ts