Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Make it possible to change the language with --language, or an option in the settings dialog. Fixes issue #583

This commit is contained in:
David Sansome 2010-08-02 19:02:21 +00:00
parent aad6093b63
commit 6604e97493
37 changed files with 467 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/commandlineoptions.cpp
View File

@ -47,7 +47,8 @@ const char* CommandlineOptions::kHelpText =
"\n"
"%20:\n"
" -o, --show-osd %21\n"
" -e, --engine %22\n";
" -e, --engine %22\n"
" -g, --language <lang> %23\n";
CommandlineOptions::CommandlineOptions(int argc, char** argv)
@ -109,6 +110,7 @@ bool CommandlineOptions::Parse() {
{"show-osd", no_argument, 0, 'o'},
{"engine", required_argument, 0, 'e'},
{"language", required_argument, 0, 'g'},
{0, 0, 0, 0}
};
@ -116,7 +118,7 @@ bool CommandlineOptions::Parse() {
// Parse the arguments
bool ok = false;
forever {
int c = getopt_long(argc_, argv_, "hptusrfv:alk:oe:", kOptions, NULL);
int c = getopt_long(argc_, argv_, "hptusrfv:alk:oe:g:", kOptions, NULL);
// End of the options
if (c == -1)
@ -143,7 +145,8 @@ bool CommandlineOptions::Parse() {
tr("Play the <n>th track in the playlist"),
tr("Other options"),
tr("Display the on-screen-display"),
tr("Select engine"));
tr("Select engine"),
tr("Change the language"));
std::cout << translated_help_text.toLocal8Bit().constData();
return false;
@ -158,6 +161,7 @@ bool CommandlineOptions::Parse() {
case 'a': url_list_action_ = UrlList_Append; break;
case 'l': url_list_action_ = UrlList_Load; break;
case 'o': show_osd_ = true; break;
case 'g': language_ = QString(optarg); break;
case VolumeUp: volume_modifier_ = +4; break;
case VolumeDown: volume_modifier_ = -4; break;

2
src/core/commandlineoptions.h
View File

@ -62,6 +62,7 @@ class CommandlineOptions {
bool show_osd() const { return show_osd_; }
QList<QUrl> urls() const { return urls_; }
Engine::Type engine() const { return engine_; }
QString language() const { return language_; }
QByteArray Serialize() const;
void Load(const QByteArray& serialized);
@ -93,6 +94,7 @@ class CommandlineOptions {
int play_track_at_;
bool show_osd_;
Engine::Type engine_;
QString language_;
QList<QUrl> urls_;
};

24
src/main.cpp
View File

@ -64,7 +64,8 @@
Q_IMPORT_PLUGIN(qsqlite)
#endif
void LoadTranslation(const QString& prefix, const QString& path) {
void LoadTranslation(const QString& prefix, const QString& path,
const QString& override_language = QString()) {
#if QT_VERSION < 0x040700
// QTranslator::load will try to open and read "clementine" if it exists,
// without checking if it's a file first.
@ -74,8 +75,11 @@ void LoadTranslation(const QString& prefix, const QString& path) {
return;
#endif
QString language = override_language.isEmpty() ?
QLocale::system().name() : override_language;
QTranslator* t = new PoTranslator;
if (t->load(prefix + "_" + QLocale::system().name(), path))
if (t->load(prefix + "_" + language, path))
QCoreApplication::installTranslator(t);
else
delete t;
@ -168,11 +172,19 @@ int main(int argc, char *argv[]) {
Q_INIT_RESOURCE(data);
Q_INIT_RESOURCE(translations);
// Has the user forced a different language?
QString language = options.language();
if (language.isEmpty()) {
QSettings s;
s.beginGroup("General");
language = s.value("language").toString();
}
// Translations
LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
LoadTranslation("clementine", ":/translations");
LoadTranslation("clementine", a.applicationDirPath());
LoadTranslation("clementine", QDir::currentPath());
LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
LoadTranslation("clementine", ":/translations", language);
LoadTranslation("clementine", a.applicationDirPath(), language);
LoadTranslation("clementine", QDir::currentPath(), language);
// Icons
IconLoader::Init();

12
src/translations/ar.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -843,6 +846,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1653,6 +1659,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1722,6 +1731,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/bg.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -843,6 +846,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1653,6 +1659,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1722,6 +1731,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/cs.po
View File

@ -296,6 +296,9 @@ msgstr "Procházet…"
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Hledáni aktualizaci..."
@ -847,6 +850,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Notebook/Sluchátka"
@ -1657,6 +1663,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1726,6 +1735,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "vaše přihlašovací údaje k Last.fm byly neplatné"

12
src/translations/da.po
View File

@ -296,6 +296,9 @@ msgstr "Gennemse..."
msgid "Change shortcut..."
msgstr "Ændrer smutvej..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Tjek efter opdateringer..."
@ -848,6 +851,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Bærbar/hovedtelefoner"
@ -1660,6 +1666,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1729,6 +1738,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Dine Last.fm login-oplysninger var forkerte"

12
src/translations/de.po
View File

@ -300,6 +300,9 @@ msgstr "Durchsuchen…"
msgid "Change shortcut..."
msgstr "Tastenkürzel ändern..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Suche nach Aktualisierungen..."
@ -859,6 +862,9 @@ msgstr "Zum aktuellen Stück springen"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Kopfhörer"
@ -1674,6 +1680,9 @@ msgstr "Gnome Tastenkürzel verwenden"
msgid "Use Replay Gain metadata if it is available"
msgstr "Benutze Replay Gain Metadaten wenn verfügbar"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1752,6 +1761,9 @@ msgstr ""
"style:italic;\">Zugriff für Hilfsgeräte aktivieren</span>\" in \"Bedienhilfen"
"\" um Clementines Tastenkürzel zu benutzen."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Ihre Last.fm Daten sind falsch"

12
src/translations/el.po
View File

@ -302,6 +302,9 @@ msgstr "Αναζήτηση..."
msgid "Change shortcut..."
msgstr "Αλλαγή συντόμευσης..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Έλεγχος για ενημερώσεις"
@ -862,6 +865,9 @@ msgstr "Μετάβαση στο τρέχον κομμάτι που παίζει"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Φορητός/ακουστικά"
@ -1678,6 +1684,9 @@ msgstr "Χρήση πλήκτρων συντόμευσης του Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Χρήση των μετα δεδομένων Replay Gain αν είναι διαθέσημα"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1757,6 +1766,9 @@ msgstr ""
"Ενεργοποίηση πρόσβασης σε βοηθητικές συσκευές</span>\" για να "
"χρησιμοποιήσετε καθολικές συντομεύσεις στον Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Τα στοιχεία σας στο Last.fm ήταν εσφαλμένα"

12
src/translations/en_CA.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr "Change shortcut..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Check for updates..."
@ -847,6 +850,9 @@ msgstr "Jump to the currently playing track"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Headphones"
@ -1658,6 +1664,9 @@ msgstr "Use Gnome's shortcut keys"
msgid "Use Replay Gain metadata if it is available"
msgstr "Use Replay Gain metadata if it is available"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1727,6 +1736,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Your Last.fm credentials were incorrect"

12
src/translations/en_GB.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Check for updates..."
@ -845,6 +848,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Headphones"
@ -1655,6 +1661,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1724,6 +1733,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Your Last.fm credentials were incorrect"

12
src/translations/es.po
View File

@ -303,6 +303,9 @@ msgstr "Explorar..."
msgid "Change shortcut..."
msgstr "Cambiar combinación de teclas"
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Buscar actualizaciones..."
@ -864,6 +867,9 @@ msgstr "Ir a la pista actualmente reproduciéndose"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Auriculares"
@ -1679,6 +1685,9 @@ msgstr "Usar las combinaciones de teclas de Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Usar metadatos de ganancia de repetición si están disponibles"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1758,6 +1767,9 @@ msgstr ""
"style: italic;\">Activar acceso para dispositivos de asistencia</span>\" "
"para utilizar los atajos de teclado globales en Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Sus credenciales de Last.fm fueron incorrectas"

12
src/translations/fi.po
View File

@ -295,6 +295,9 @@ msgstr "Selaa..."
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Tarkista päivitykset..."
@ -844,6 +847,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1655,6 +1661,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1724,6 +1733,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/fr.po
View File

@ -296,6 +296,9 @@ msgstr "Parcourir..."
msgid "Change shortcut..."
msgstr "Changer le raccourci..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Vérifier les mises à jour"
@ -851,6 +854,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Portable/Ecouteurs"
@ -1667,6 +1673,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1738,6 +1747,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Vos identifiants Last.fm sont incorrects"

12
src/translations/gl.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Verificar se há actualizazóns..."
@ -844,6 +847,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Portátil/Auscultadores"
@ -1655,6 +1661,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1724,6 +1733,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "A suas credenciais da Last.fm son incorrectas"

12
src/translations/it.po
View File

@ -302,6 +302,9 @@ msgstr "Sfoglia..."
msgid "Change shortcut..."
msgstr "Cambia la scorciatoia"
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Controlla aggiornamenti..."
@ -863,6 +866,9 @@ msgstr "Salta alla traccia in riproduzione"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Portatile/Cuffie"
@ -1684,6 +1690,9 @@ msgstr "Utilizza le scorciatoie di Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Utilizza i metadati del guadagno di riproduzione se disponibili"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1762,6 +1771,9 @@ msgstr ""
"italic;\">Abilita l'accesso per i dispositivi di assistenza</span>\" per "
"utilizzare le scorciatoie globali in Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Le credenziali Last.fm non sono corrette"

12
src/translations/kk.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -845,6 +848,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1655,6 +1661,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1724,6 +1733,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/lt.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -843,6 +846,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1653,6 +1659,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1722,6 +1731,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/nb.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -846,6 +849,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Hodetelefoner"
@ -1657,6 +1663,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1726,6 +1735,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Din last.fm brukerinformasjon var ikke korrekt"

12
src/translations/nl.po
View File

@ -299,6 +299,9 @@ msgstr "Bladeren..."
msgid "Change shortcut..."
msgstr "Sneltoets wijzigen"
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Zoeken naar updates..."
@ -859,6 +862,9 @@ msgstr "Spring naar de nu spelende track"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/koptelefoon"
@ -1676,6 +1682,9 @@ msgstr "Gebruik Gnome's sneltoetsen"
msgid "Use Replay Gain metadata if it is available"
msgstr "Gebruik Replay Gain metadata indien beschikbaar"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1751,6 +1760,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Uw Last.fm gegevens zijn incorrect"

12
src/translations/oc.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -843,6 +846,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1653,6 +1659,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1722,6 +1731,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/pl.po
View File

@ -296,6 +296,9 @@ msgstr "Przeglądaj..."
msgid "Change shortcut..."
msgstr "Zmień skrót..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Sprawdź aktualizacje..."
@ -850,6 +853,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Słuchawki"
@ -1664,6 +1670,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1733,6 +1742,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Twoje dane dla Last.fm są niepoprawne"

12
src/translations/pt.po
View File

@ -300,6 +300,9 @@ msgstr "Procurar..."
msgid "Change shortcut..."
msgstr "Alterar atalho..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Verificar por actualizações..."
@ -856,6 +859,9 @@ msgstr "Ir para a faixa de reprodução actual"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Portátil/Auscultadores"
@ -1671,6 +1677,9 @@ msgstr "Usar teclas de atalho Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Usar Consistência de meta-dados se estiver disponível"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1748,6 +1757,9 @@ msgstr ""
"font-style:italic;\">Activar acesso de apoio a dispositivos</span>\" de modo "
"a utilizar os atalhos globais do Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "A suas credenciais da Last.fm estão incorrectas"

12
src/translations/pt_BR.po
View File

@ -298,6 +298,9 @@ msgstr "Procurar..."
msgid "Change shortcut..."
msgstr "Mudar atalho..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Checar atualizações..."
@ -851,6 +854,9 @@ msgstr "Pular para a faixa em execução"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Notebook / fones de ouvido"
@ -1666,6 +1672,9 @@ msgstr "Usar teclas de atalho do Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Usar metadados do fator de ganho se ele estiver disponível"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1742,6 +1751,9 @@ msgstr ""
"style=\" font-style:italic;\">Ativar acesso por dispositivos assistidos</"
"span>\" para utilizar os atalhos globais no Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Suas credencias do Last.fm estavam incorretas"

12
src/translations/ro.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -844,6 +847,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Laptop/Căști"
@ -1654,6 +1660,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1723,6 +1732,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/ru.po
View File

@ -298,6 +298,9 @@ msgstr "Обзор..."
msgid "Change shortcut..."
msgstr "Изменить горячую клавишу..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Проверить обновления..."
@ -854,6 +857,9 @@ msgstr "Перейти к текущей композиции"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Портативный компьютер/наушники"
@ -1671,6 +1677,9 @@ msgstr "Использовать горячие клавиши Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Использовать метаданные Replay Gain если возможно"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1748,6 +1757,9 @@ msgstr ""
"функцию \"Разрешить доступ для вспомогательных устройств\" для "
"использования глобальных горячих клавиш в Clementine"
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Ваши данные Last.fm некорректны"

12
src/translations/sk.po
View File

@ -300,6 +300,9 @@ msgstr "Prehľadávať..."
msgid "Change shortcut..."
msgstr "Zmeniť skratku..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Skontrolovať aktualizácie..."
@ -857,6 +860,9 @@ msgstr "Skočiť na práve prehrávanú skladbu"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Notebook/sluchátka"
@ -1670,6 +1676,9 @@ msgstr "Použiť klávesové skratky GNOME"
msgid "Use Replay Gain metadata if it is available"
msgstr "Použiť metadáta na vyrovnanie hlasitosti ak sú dostupné"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1746,6 +1755,9 @@ msgstr ""
"style:italic;\">Povoliť prístup pre pomocné zariadenia</span>\" na použitie "
"globálnych skratiek v Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Vaše Last.fm poverenie bolo nekorektné"

12
src/translations/sr.po
View File

@ -295,6 +295,9 @@ msgstr "Прегледај..."
msgid "Change shortcut..."
msgstr "Промени пречицу..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Потражи ажурирања..."
@ -847,6 +850,9 @@ msgstr "Скочи на нумеру која се тренутно пушта"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Лаптоп/слушалице"
@ -1658,6 +1664,9 @@ msgstr "Користи Гномове пречице"
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1729,6 +1738,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Акредитиви за ЛастФМ које сте унели су нетачни"

12
src/translations/sv.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr "Ändra genväg..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Kontrollera efter uppdateringar..."
@ -848,6 +851,9 @@ msgstr "Hoppa till det spår som spelas för tillfället"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "Bärbar dator/Hörlurar"
@ -1661,6 +1667,9 @@ msgid "Use Replay Gain metadata if it is available"
msgstr ""
"Använd metadata för uppspelningsförstärkning om de de finns tillgängliga."
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1730,6 +1739,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Dina referenser för Last.fm var felaktiga"

12
src/translations/tr.po
View File

@ -295,6 +295,9 @@ msgstr "Gözat..."
msgid "Change shortcut..."
msgstr "Kısayolu değiştir..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Güncellemeleri denetle..."
@ -845,6 +848,9 @@ msgstr "Şu anda çalınan parçaya atla"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1659,6 +1665,9 @@ msgstr "Gnome kısayol tuşlarını kullan"
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1728,6 +1737,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Last.fm giriş bilgileriniz doğru değil"

12
src/translations/translations.pot
View File

@ -285,6 +285,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -833,6 +836,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1643,6 +1649,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1712,6 +1721,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/uk.po
View File

@ -299,6 +299,9 @@ msgstr "Огляд..."
msgid "Change shortcut..."
msgstr "Змінити комбінацію клавіш..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "Перевірити оновлення..."
@ -856,6 +859,9 @@ msgstr "Перейти до відтворюваної доріжки"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "портативний комп’ютер/навушники"
@ -1670,6 +1676,9 @@ msgstr "Використовувати комбінації клавіш Gnome"
msgid "Use Replay Gain metadata if it is available"
msgstr "Використовувати метадані Replay Gain, якщо наявні"
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1747,6 +1756,9 @@ msgstr ""
"style=\" font-style:italic;\">Увімкнути доступ для допоміжних пристроїв</"
"span>\", щоб використовувати глобальні комбінації клавіш в Clementine."
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr "Ваші облікові дані Last.fm неправильні"

12
src/translations/zh_CN.po
View File

@ -295,6 +295,9 @@ msgstr ""
msgid "Change shortcut..."
msgstr ""
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr ""
@ -843,6 +846,9 @@ msgstr ""
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr ""
@ -1653,6 +1659,9 @@ msgstr ""
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1722,6 +1731,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

12
src/translations/zh_TW.po
View File

@ -299,6 +299,9 @@ msgstr "瀏覽..."
msgid "Change shortcut..."
msgstr "更改快速鍵..."
msgid "Change the language"
msgstr ""
msgid "Check for updates..."
msgstr "檢查更新..."
@ -848,6 +851,9 @@ msgstr "跳轉到目前播放的歌曲"
msgid "Keep the original files"
msgstr ""
msgid "Language"
msgstr ""
msgid "Laptop/Headphones"
msgstr "筆記本電腦 /耳機"
@ -1658,6 +1664,9 @@ msgstr "使用Gnome的快速鍵"
msgid "Use Replay Gain metadata if it is available"
msgstr ""
msgid "Use the system default"
msgstr ""
msgid "Used"
msgstr ""
@ -1729,6 +1738,9 @@ msgid ""
"shortcuts in Clementine."
msgstr ""
msgid "You will need to restart Clementine if you change the language."
msgstr ""
msgid "Your Last.fm credentials were incorrect"
msgstr ""

40
src/ui/settingsdialog.cpp
View File

@ -27,8 +27,9 @@
# include "engines/gstengine.h"
#endif
#include <QSettings>
#include <QColorDialog>
#include <QDir>
#include <QSettings>
#include <QtDebug>
@ -64,6 +65,30 @@ SettingsDialog::SettingsDialog(QWidget* parent)
// Behaviour
connect(ui_->b_show_tray_icon_, SIGNAL(toggled(bool)), SLOT(ShowTrayIconToggled(bool)));
// Populate the language combo box. We do this by looking at all the
// compiled in translations.
QDir dir(":/translations/");
QStringList codes(dir.entryList(QStringList() << "*.qm"));
QRegExp lang_re("^clementine_(.*).qm$");
foreach (const QString& filename, codes) {
// The regex captures the "ru" from "clementine_ru.qm"
if (!lang_re.exactMatch(filename))
continue;
QString code = lang_re.cap(1);
QString name = QString("%1 (%2)").arg(
QLocale::languageToString(QLocale(code).language()), code);
language_map_[name] = code;
}
language_map_["English (en)"] = "en";
// Sort the names and show them in the UI
QStringList names = language_map_.keys();
qStableSort(names);
ui_->language->addItems(names);
// Global shortcuts
#ifdef Q_OS_MAC
if (QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD) {
@ -152,6 +177,11 @@ void SettingsDialog::accept() {
s.setValue("startupbehaviour", int(behaviour));
s.endGroup();
s.beginGroup("General");
s.setValue("language", language_map_.contains(ui_->language->currentText()) ?
language_map_[ui_->language->currentText()] : QString());
s.endGroup();
// Playback
s.beginGroup(Engine::Base::kSettingsGroup);
s.setValue("FadeoutEnabled", ui_->fading_out->isChecked());
@ -216,6 +246,14 @@ void SettingsDialog::showEvent(QShowEvent*) {
}
s.endGroup();
s.beginGroup("General");
QString name = language_map_.key(s.value("language").toString());
if (name.isEmpty())
ui_->language->setCurrentIndex(0);
else
ui_->language->setCurrentIndex(ui_->language->findText(name));
s.endGroup();
// Last.fm
ui_->lastfm->Load();

3
src/ui/settingsdialog.h
View File

@ -18,6 +18,7 @@
#define SETTINGSDIALOG_H
#include <QDialog>
#include <QMap>
#include "config.h"
@ -83,6 +84,8 @@ class SettingsDialog : public QDialog {
bool loading_settings_;
OSDPretty* pretty_popup_;
QMap<QString, QString> language_map_;
};
#endif // SETTINGSDIALOG_H

27
src/ui/settingsdialog.ui
View File

@ -114,7 +114,7 @@
<item>
<widget class="QStackedWidget" name="stacked_widget">
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="playback_page">
<layout class="QVBoxLayout" name="verticalLayout_10">
@ -399,6 +399,31 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Language</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QComboBox" name="language">
<item>
<property name="text">
<string>Use the system default</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_10">
<property name="text">
<string>You will need to restart Clementine if you change the language.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">