+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry. If not, see .
+ *
+ */
#ifndef UDISKS2LISTER_H
#define UDISKS2LISTER_H
diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp
index 0e3a3b14..24ee9872 100644
--- a/src/dialogs/about.cpp
+++ b/src/dialogs/about.cpp
@@ -75,7 +75,7 @@ About::About(QWidget *parent):QDialog(parent) {
<< Person("Valeriy Malov", "jazzvoid@gmail.com")
<< Person("Nick Lanham", "nick@afternight.org");
- QString Title("About Strawberry");
+ QString Title(tr("About Strawberry"));
QFont title_font;
title_font.setBold(true);
@@ -99,28 +99,27 @@ QString About::MainHtml() const {
QString ret;
- ret = QString("Version %1
").arg(QCoreApplication::applicationVersion());
+ ret = tr("Version %1
").arg(QCoreApplication::applicationVersion());
- ret += QString("");
- ret += QString("Strawberry is a audio player and music collection organizer.
");
- ret += QString("It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles.
");
- ret += QString("The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.");
- ret += QString("
");
- //ret += QString("Website: http://www.strawbs.org/
");
- ret += QString("");
- ret += QString("Strawberry is free software: you can redistribute it and/or modify
");
- ret += QString("it under the terms of the GNU General Public License as published by
");
- ret += QString("the Free Software Foundation, either version 3 of the License, or
");
- ret += QString("(at your option) any later version.
");
- ret += QString("
");
- ret += QString("Strawberry is distributed in the hope that it will be useful,
");
- ret += QString("but WITHOUT ANY WARRANTY; without even the implied warranty of
");
- ret += QString("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
");
- ret += QString("GNU General Public License for more details.
");
- ret += QString("
");
- ret += QString("You should have received a copy of the GNU General Public License
");
- ret += QString("along with Strawberry. If not, see http://www.gnu.org/licenses/.");
- ret += QString("
");
+ ret += "";
+ ret += tr("Strawberry is a audio player and music collection organizer.
");
+ ret += tr("It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles.
");
+ ret += tr("The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.");
+ ret += "
";
+ ret += "";
+ ret += tr("Strawberry is free software: you can redistribute it and/or modify
");
+ ret += tr("it under the terms of the GNU General Public License as published by
");
+ ret += tr("the Free Software Foundation, either version 3 of the License, or
");
+ ret += tr("(at your option) any later version.
");
+ ret += "
";
+ ret += tr("Strawberry is distributed in the hope that it will be useful,
");
+ ret += tr("but WITHOUT ANY WARRANTY; without even the implied warranty of
");
+ ret += tr("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
");
+ ret += tr("GNU General Public License for more details.
");
+ ret += "
";
+ ret += tr("You should have received a copy of the GNU General Public License
");
+ ret += tr("along with Strawberry. If not, see http://www.gnu.org/licenses/.");
+ ret += "
";
return ret;
@@ -130,25 +129,25 @@ QString About::ContributorsHtml() const {
QString ret;
- ret += QString("Strawberry Authors");
+ ret += tr("
Strawberry Authors");
for (const Person &person : strawberry_authors_) {
ret += "
" + PersonToHtml(person);
}
- ret += QString("
");
+ ret += "";
- ret += QString("Clementine Authors");
+ ret += tr("
Clementine Authors");
for (const Person &person : clementine_authors_) {
ret += "
" + PersonToHtml(person);
}
- ret += QString("
");
+ ret += "";
- ret += QString("Clementine Contributors");
+ ret += tr("
Clementine Contributors");
for (const Person &person : constributors_) {
ret += "
" + PersonToHtml(person);
}
- ret += QString("
");
+ ret += "";
- ret += QString("Thanks to all the Amarok and Clementine contributors.
");
+ ret += tr("Thanks to all the Amarok and Clementine contributors.
");
return ret;
}
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index caf52438..ab5a3972 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -899,7 +899,7 @@ void EditTagDialog::SongSaveComplete(TagReaderReply *reply, const QString filena
pending_--;
if (!reply->message().save_file_response().success()) {
- QString message = QString("An error occurred writing metadata to '%1'").arg(filename);
+ QString message = tr("An error occurred writing metadata to '%1'").arg(filename);
emit Error(message);
}
else if (song.directory_id() != -1) {
diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp
index 1ce16043..bfcb4f51 100644
--- a/src/engine/enginebase.cpp
+++ b/src/engine/enginebase.cpp
@@ -17,7 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Clementine. If not, see .
+ * along with Strawberry. If not, see .
*
*/
diff --git a/src/engine/enginebase.h b/src/engine/enginebase.h
index 7f016a36..f610c438 100644
--- a/src/engine/enginebase.h
+++ b/src/engine/enginebase.h
@@ -17,7 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Clementine. If not, see .
+ * along with Strawberry. If not, see .
*
*/
diff --git a/src/internet/internetsearchview.cpp b/src/internet/internetsearchview.cpp
index 5b74fffc..2486cc6b 100644
--- a/src/internet/internetsearchview.cpp
+++ b/src/internet/internetsearchview.cpp
@@ -141,7 +141,7 @@ InternetSearchView::InternetSearchView(Application *app, InternetSearch *engine,
QMenu *settings_menu = new QMenu(this);
settings_menu->addActions(group_by_actions_->actions());
settings_menu->addSeparator();
- settings_menu->addAction(IconLoader::Load("configure"), QString("Configure %1...").arg(Song::TextForSource(engine->source())), this, SLOT(OpenSettingsDialog()));
+ settings_menu->addAction(IconLoader::Load("configure"), tr("Configure %1...").arg(Song::TextForSource(engine->source())), this, SLOT(OpenSettingsDialog()));
ui_->settings->setMenu(settings_menu);
connect(ui_->radiobutton_search_artists, SIGNAL(clicked(bool)), SLOT(SearchArtistsClicked(bool)));
@@ -430,7 +430,7 @@ bool InternetSearchView::ResultsContextMenuEvent(QContextMenuEvent *event) {
context_menu_->addSeparator();
context_menu_->addMenu(tr("Group by"))->addActions(group_by_actions_->actions());
- context_menu_->addAction(IconLoader::Load("configure"), QString("Configure %1...").arg(Song::TextForSource(engine_->source())), this, SLOT(OpenSettingsDialog()));
+ context_menu_->addAction(IconLoader::Load("configure"), tr("Configure %1...").arg(Song::TextForSource(engine_->source())), this, SLOT(OpenSettingsDialog()));
const bool enable_context_actions = ui_->results->selectionModel() && ui_->results->selectionModel()->hasSelection();
diff --git a/src/main.cpp b/src/main.cpp
index 207d2418..f8044f82 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -51,11 +51,13 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -64,6 +66,9 @@
#ifdef HAVE_DBUS
# include
#endif
+#ifdef HAVE_TRANSLATIONS
+# include
+#endif
#include "main.h"
@@ -84,6 +89,10 @@
#include "core/application.h"
#include "core/networkproxyfactory.h"
#include "core/scangiomodulepath.h"
+#ifdef HAVE_TRANSLATIONS
+# include "core/potranslator.h"
+#endif
+#include "settings/behavioursettingspage.h"
#include "widgets/osd.h"
@@ -206,11 +215,31 @@ int main(int argc, char* argv[]) {
// Resources
Q_INIT_RESOURCE(data);
Q_INIT_RESOURCE(icons);
+#ifdef HAVE_TRANSLATIONS
+ Q_INIT_RESOURCE(translations);
+#endif
#ifdef DEBUG
QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
#endif
+#ifdef HAVE_TRANSLATIONS
+ QString override_language = options.language();
+ if (override_language.isEmpty()) {
+ QSettings s;
+ s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
+ override_language = s.value("language").toString();
+ s.endGroup();
+ }
+
+ const QString language = override_language.isEmpty() ? Utilities::SystemLanguageName() : override_language;
+
+ Utilities::LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
+ Utilities::LoadTranslation("strawberry", ":/translations", language);
+ Utilities::LoadTranslation("strawberry", a.applicationDirPath(), language);
+ Utilities::LoadTranslation("strawberry", QDir::currentPath(), language);
+#endif
+
Application app;
// Network proxy
diff --git a/src/queue/queueview.ui b/src/queue/queueview.ui
index 547dee15..95affed1 100644
--- a/src/queue/queueview.ui
+++ b/src/queue/queueview.ui
@@ -55,7 +55,7 @@
- Ctrl+↑
+ Ctrl+Up
@@ -74,7 +74,7 @@
- Ctrl+↓
+ Ctrl+Down
diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp
index fa034377..bd062bcd 100644
--- a/src/scrobbler/listenbrainzscrobbler.cpp
+++ b/src/scrobbler/listenbrainzscrobbler.cpp
@@ -141,7 +141,7 @@ void ListenBrainzScrobbler::Authenticate() {
bool result = QDesktopServices::openUrl(url);
if (!result) {
- QMessageBox messagebox(QMessageBox::Information, "ListenBrainz Authentication", QString("Please open this URL in your browser:
%1").arg(url.toString()), QMessageBox::Ok);
+ QMessageBox messagebox(QMessageBox::Information, tr("ListenBrainz Authentication"), tr("Please open this URL in your browser:
%1").arg(url.toString()), QMessageBox::Ok);
messagebox.setTextFormat(Qt::RichText);
messagebox.exec();
}
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index e5628bd4..d91bda43 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -132,7 +132,7 @@ void ScrobblingAPI20::Authenticate() {
url_query.addQueryItem("cb", redirect_url.toString());
url.setQuery(url_query);
- QMessageBox messagebox(QMessageBox::Information, QString("%1 Scrobbler Authentication").arg(name_), QString("Open URL in web browser?
%1
Press \"Save\" to copy the URL to clipboard and manually open it in a web browser.").arg(url.toString()), QMessageBox::Open|QMessageBox::Save|QMessageBox::Cancel);
+ QMessageBox messagebox(QMessageBox::Information, tr("%1 Scrobbler Authentication").arg(name_), tr("Open URL in web browser?
%1
Press \"Save\" to copy the URL to clipboard and manually open it in a web browser.").arg(url.toString()), QMessageBox::Open|QMessageBox::Save|QMessageBox::Cancel);
messagebox.setTextFormat(Qt::RichText);
int result = messagebox.exec();
switch (result) {
@@ -141,7 +141,7 @@ void ScrobblingAPI20::Authenticate() {
if (openurl_result) {
break;
}
- QMessageBox messagebox_error(QMessageBox::Warning, QString("%1 Scrobbler Authentication").arg(name_), QString("Could not open URL. Please open this URL in your browser:
%1").arg(url.toString()), QMessageBox::Ok);
+ QMessageBox messagebox_error(QMessageBox::Warning, tr("%1 Scrobbler Authentication").arg(name_), tr("Could not open URL. Please open this URL in your browser:
%1").arg(url.toString()), QMessageBox::Ok);
messagebox_error.setTextFormat(Qt::RichText);
messagebox_error.exec();
}
@@ -149,7 +149,7 @@ void ScrobblingAPI20::Authenticate() {
QApplication::clipboard()->setText(url.toString());
break;
case QMessageBox::Cancel:
- AuthError("Authentication was cancelled.");
+ AuthError(tr("Authentication was cancelled."));
break;
default:
break;
@@ -436,7 +436,7 @@ void ScrobblingAPI20::Scrobble(const Song &song) {
if (app_->scrobbler()->IsOffline()) return;
if (!IsAuthenticated()) {
- emit ErrorMessage(QString("Scrobbler %1 is not authenticated!").arg(name_));
+ emit ErrorMessage(tr("Scrobbler %1 is not authenticated!").arg(name_));
return;
}
diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp
index 884c60d8..a7f93c62 100644
--- a/src/settings/behavioursettingspage.cpp
+++ b/src/settings/behavioursettingspage.cpp
@@ -21,6 +21,10 @@
#include "config.h"
#include
+#include
+#include
+#include
+#include
#include
#include
#include
@@ -37,6 +41,14 @@ class SettingsDialog;
const char *BehaviourSettingsPage::kSettingsGroup = "Behaviour";
+#ifdef HAVE_TRANSLATIONS
+namespace {
+bool LocaleAwareCompare(const QString &a, const QString &b) {
+ return a.localeAwareCompare(b) < 0;
+}
+} // namespace
+#endif
+
BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog) : SettingsPage(dialog), ui_(new Ui_BehaviourSettingsPage) {
ui_->setupUi(this);
@@ -71,6 +83,43 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog) : SettingsP
ui_->combobox_menuplaymode->setItemData(1, MainWindow::PlayBehaviour_IfStopped);
ui_->combobox_menuplaymode->setItemData(2, MainWindow::PlayBehaviour_Always);
+#ifdef HAVE_TRANSLATIONS
+ // 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("^strawberry_(.*).qm$");
+ for (const QString &filename : codes) {
+
+ // The regex captures the "ru" from "strawberry_ru.qm"
+ if (!lang_re.exactMatch(filename)) continue;
+
+ QString code = lang_re.cap(1);
+ QString lookup_code = QString(code)
+ .replace("@latin", "_Latn")
+ .replace("_CN", "_Hans_CN")
+ .replace("_TW", "_Hant_TW");
+
+ QString language_name = QLocale::languageToString(QLocale(lookup_code).language());
+ QString native_name = QLocale(lookup_code).nativeLanguageName();
+ if (!native_name.isEmpty()) {
+ language_name = native_name;
+ }
+ QString name = QString("%1 (%2)").arg(language_name, code);
+
+ language_map_[name] = code;
+ }
+
+ language_map_["English (en)"] = "en";
+
+ // Sort the names and show them in the UI
+ QStringList names = language_map_.keys();
+ std::stable_sort(names.begin(), names.end(), LocaleAwareCompare);
+ ui_->combobox_language->addItems(names);
+#else
+ ui_->groupbox_language->setEnabled(false);
+ ui_->groupbox_language->setVisible(false);
+#endif
+
}
BehaviourSettingsPage::~BehaviourSettingsPage() {
@@ -114,6 +163,12 @@ void BehaviourSettingsPage::Load() {
ui_->spinbox_seekstepsec->setValue(s.value("seek_step_sec", 10).toInt());
+ QString name = language_map_.key(s.value("language").toString());
+ if (name.isEmpty())
+ ui_->combobox_language->setCurrentIndex(0);
+ else
+ ui_->combobox_language->setCurrentIndex(ui_->combobox_language->findText(name));
+
s.endGroup();
}
@@ -141,6 +196,9 @@ void BehaviourSettingsPage::Save() {
s.setValue("doubleclick_playmode", doubleclick_playmode);
s.setValue("menu_playmode", menu_playmode);
s.setValue("seek_step_sec", ui_->spinbox_seekstepsec->value());
+
+ s.setValue("language", language_map_.contains(ui_->combobox_language->currentText()) ? language_map_[ui_->combobox_language->currentText()] : QString());
+
s.endGroup();
}
diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h
index a059a470..4d84e19f 100644
--- a/src/settings/behavioursettingspage.h
+++ b/src/settings/behavioursettingspage.h
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include "settingspage.h"
@@ -49,6 +50,7 @@ private slots:
private:
Ui_BehaviourSettingsPage *ui_;
+ QMap language_map_;
};
diff --git a/src/settings/behavioursettingspage.ui b/src/settings/behavioursettingspage.ui
index 4776a0c2..dc2dcbfe 100644
--- a/src/settings/behavioursettingspage.ui
+++ b/src/settings/behavioursettingspage.ui
@@ -101,6 +101,38 @@
+ -
+
+
+ Language
+
+
+
-
+
+
-
+
+ Use the system default
+
+
+
+
+ -
+
+
+ You will need to restart Strawberry if you change the language.
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
-
@@ -243,7 +275,7 @@
-
-
+
Qt::Horizontal
diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp
index 3d97e0be..5a71d27c 100644
--- a/src/settings/shortcutssettingspage.cpp
+++ b/src/settings/shortcutssettingspage.cpp
@@ -237,7 +237,7 @@ void GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties() {
if (!QProcess::startDetached("gnome-keybinding-properties")) {
if (!QProcess::startDetached("gnome-control-center", QStringList() << "keyboard")) {
- QMessageBox::warning(this, "Error", QString("The \"%1\" command could not be started.").arg("gnome-keybinding-properties"));
+ QMessageBox::warning(this, "Error", tr("The \"%1\" command could not be started.").arg("gnome-keybinding-properties"));
}
}
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index f3791e91..b10fd058 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -148,7 +148,7 @@ void TidalService::SendLogin() {
void TidalService::SendLogin(const QString &username, const QString &password) {
- if (search_id_ != 0) emit UpdateStatus("Authenticating...");
+ if (search_id_ != 0) emit UpdateStatus(tr("Authenticating..."));
login_sent_ = true;
login_attempts_++;
@@ -471,7 +471,7 @@ int TidalService::Search(const QString &text, InternetSearch::SearchType type) {
void TidalService::StartSearch() {
if (username_.isEmpty() || password_.isEmpty()) {
- emit SearchError(pending_search_id_, "Missing username and/or password.");
+ emit SearchError(pending_search_id_, tr("Missing username and/or password."));
next_pending_search_id_ = 1;
ShowConfig();
return;
@@ -509,7 +509,7 @@ void TidalService::ClearSearch() {
void TidalService::SendSearch() {
- emit UpdateStatus("Searching...");
+ emit UpdateStatus(tr("Searching..."));
switch (pending_search_type_) {
case InternetSearch::SearchType_Artists:
@@ -582,7 +582,7 @@ void TidalService::ArtistsReceived(QNetworkReply *reply, int search_id) {
QJsonArray json_items = json_value.toArray();
if (json_items.isEmpty()) {
artist_search_ = false;
- Error("No match.");
+ Error(tr("No match."));
return;
}
@@ -610,7 +610,8 @@ void TidalService::ArtistsReceived(QNetworkReply *reply, int search_id) {
}
if (artist_albums_requested_ > 0) {
- emit UpdateStatus(QString("Retrieving albums for %1 artist%2...").arg(artist_albums_requested_).arg(artist_albums_requested_ == 1 ? "" : "s"));
+ if (artist_albums_requested_ == 1) emit UpdateStatus(tr("Retrieving albums for %1 artist...").arg(artist_albums_requested_));
+ else emit UpdateStatus(tr("Retrieving albums for %1 artists...").arg(artist_albums_requested_));
emit ProgressSetMaximum(artist_albums_requested_);
emit UpdateProgress(0);
}
@@ -802,7 +803,8 @@ void TidalService::AlbumsFinished(const int artist_id, const int offset_requeste
}
if (album_songs_requested_ > 0) {
- emit UpdateStatus(QString("Retrieving songs for %1 album%2...").arg(album_songs_requested_).arg(album_songs_requested_ == 1 ? "" : "s"));
+ if (album_songs_requested_ == 1) emit UpdateStatus(tr("Retrieving songs for %1 album...").arg(album_songs_requested_));
+ else emit UpdateStatus(tr("Retrieving songs for %1 albums...").arg(album_songs_requested_));
emit ProgressSetMaximum(album_songs_requested_);
emit UpdateProgress(0);
}
diff --git a/src/translations/header b/src/translations/header
new file mode 100644
index 00000000..6a423af2
--- /dev/null
+++ b/src/translations/header
@@ -0,0 +1,8 @@
+# Strawberry Music Player
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+