Merge branch 'pr1900'

res.qrc

@@ -53,8 +53,6 @@
         <file>translations/nl.qm</file>
         <file>translations/no_nb.qm</file>
         <file>translations/lt.qm</file>
-        <file>translations/mannol.qm</file>
-        <file>translations/pirate.qm</file>
         <file>translations/pl.qm</file>
         <file>translations/pt.qm</file>
         <file>translations/ru.qm</file>

src/widget/form/settings/generalform.cpp

@@ -36,8 +36,8 @@
 #include <QStandardPaths>
 #include <QDebug>
 
-static QStringList locales = {"bg", "de", "en", "es", "fr", "hr", "hu", "it", "lt", "mannol", "nl", "no_nb", "pirate", "pl", "pt", "ru", "sl", "fi", "sv", "uk", "zh"};
+static QStringList locales = {"bg", "de", "en", "es", "fr", "hr", "hu", "it", "lt", "nl", "no_nb", "pl", "pt", "ru", "sl", "fi", "sv", "uk", "zh"};
-static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Hrvatski", "Magyar", "Italiano", "Lietuvių", "mannol", "Nederlands", "Norsk Bokmål", "Pirate", "Polski", "Português", "Русский", "Slovenščina", "Suomi", "Svenska", "Українська", "简体中文"};
+static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Hrvatski", "Magyar", "Italiano", "Lietuvių", "Nederlands", "Norsk Bokmål", "Polski", "Português", "Русский", "Slovenščina", "Suomi", "Svenska", "Українська", "简体中文"};
 
 static QStringList timeFormats = {"hh:mm AP", "hh:mm", "hh:mm:ss AP", "hh:mm:ss"};
 // http://doc.qt.io/qt-4.8/qdate.html#fromString

translations/i18n.pri

@@ -11,8 +11,6 @@ TRANSLATIONS = translations/es.ts \
                translations/nl.ts \
                translations/no_nb.ts \
                translations/lt.ts \
-               translations/mannol.ts \
-               translations/pirate.ts \
                translations/pl.ts \
                translations/ru.ts \
                translations/sl.ts \