diff --git a/mythplugins/mythmusic/i18n/translate.pro b/mythplugins/mythmusic/i18n/translate.pro index 262971f..b733344 100644 --- a/mythplugins/mythmusic/i18n/translate.pro +++ b/mythplugins/mythmusic/i18n/translate.pro @@ -1,5 +1,7 @@ SOURCES += ../mythmusic/*.cpp SOURCES += ../mythmusic/*.h +SOURCES += ../mythmusic/goom/*.cpp +SOURCES += ../mythmusic/goom/*.h SOURCES += ./themestrings.h TRANSLATIONS = mythmusic_it.ts mythmusic_es.ts mythmusic_ca.ts diff --git a/mythplugins/mythmusic/mythmusic/bumpscope.cpp b/mythplugins/mythmusic/mythmusic/bumpscope.cpp index d1421b1..922c1ac 100644 --- a/mythplugins/mythmusic/mythmusic/bumpscope.cpp +++ b/mythplugins/mythmusic/mythmusic/bumpscope.cpp @@ -14,6 +14,7 @@ #include using namespace std; +#include #include BumpScope::BumpScope() : @@ -560,7 +561,8 @@ static class BumpScopeFactory : public VisFactory public: const QString &name(void) const { - static QString name("BumpScope"); + static QString name = QCoreApplication::translate("Visualizers", + "BumpScope"); return name; } diff --git a/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp index 10dac9e..2d70699 100644 --- a/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp +++ b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp @@ -6,6 +6,7 @@ #include using namespace std; +#include #include #include @@ -107,7 +108,8 @@ static class GoomFactory : public VisFactory public: const QString &name(void) const { - static QString name("Goom"); + static QString name = QCoreApplication::translate("Visualizers", + "Goom"); return name; } diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp index 5b2ef71..9108572 100644 --- a/mythplugins/mythmusic/mythmusic/musiccommon.cpp +++ b/mythplugins/mythmusic/mythmusic/musiccommon.cpp @@ -1125,7 +1125,7 @@ void MusicCommon::customEvent(QEvent *event) LOG(VB_GENERAL, LOG_ERR, QString("%1 %2").arg(statusString) .arg(*aoe->errorMessage())); - ShowOkPopup(QString("MythMusic has encountered the following error:\n%1") + ShowOkPopup(QString(tr("MythMusic has encountered the following error:\n%1")) .arg(*aoe->errorMessage())); stopAll(); } @@ -1167,7 +1167,7 @@ void MusicCommon::customEvent(QEvent *event) LOG(VB_GENERAL, LOG_ERR, QString("%1 %2").arg(statusString) .arg(*dxe->errorMessage())); - ShowOkPopup(QString("MythMusic has encountered the following error:\n%1") + ShowOkPopup(QString(tr("MythMusic has encountered the following error:\n%1")) .arg(*dxe->errorMessage())); } else if (event->type() == DialogCompletionEvent::kEventType) @@ -1880,7 +1880,7 @@ void MusicCommon::updatePlaylistStats(void) QString playlistcurrent = QLocale::system().toString(m_currentTrack + 1); QString playlisttotal = QLocale::system().toString(trackCount); - map["playlistposition"] = QString("%1 of %2").arg(playlistcurrent) + map["playlistposition"] = QString(tr("%1 of %2")).arg(playlistcurrent) .arg(playlisttotal); map["playlistcurrent"] = playlistcurrent; map["playlistcount"] = playlisttotal; diff --git a/mythplugins/mythmusic/mythmusic/synaesthesia.cpp b/mythplugins/mythmusic/mythmusic/synaesthesia.cpp index 81e10ef..4f10f27 100644 --- a/mythplugins/mythmusic/mythmusic/synaesthesia.cpp +++ b/mythplugins/mythmusic/mythmusic/synaesthesia.cpp @@ -19,6 +19,7 @@ using namespace std; // Qt +#include #include #include @@ -646,7 +647,8 @@ static class SynaesthesiaFactory : public VisFactory public: const QString &name(void) const { - static QString name("Synaesthesia"); + static QString name = QCoreApplication::translate("Visualizers", + "Synaesthesia"); return name; } diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp index b4437f5..66b050c 100644 --- a/mythplugins/mythmusic/mythmusic/visualize.cpp +++ b/mythplugins/mythmusic/mythmusic/visualize.cpp @@ -17,6 +17,7 @@ using namespace std; // Qt +#include #include #include @@ -531,7 +532,8 @@ static class StereoScopeFactory : public VisFactory public: const QString &name(void) const { - static QString name("StereoScope"); + static QString name = QCoreApplication::translate("Visualizers", + "StereoScope"); return name; } @@ -558,7 +560,8 @@ static class MonoScopeFactory : public VisFactory public: const QString &name(void) const { - static QString name("MonoScope"); + static QString name = QCoreApplication::translate("Visualizers", + "MonoScope"); return name; } @@ -804,7 +807,8 @@ static class SpectrumFactory : public VisFactory public: const QString &name(void) const { - static QString name("Spectrum"); + static QString name = QCoreApplication::translate("Visualizers", + "Spectrum"); return name; } @@ -897,7 +901,8 @@ static class SquaresFactory : public VisFactory public: const QString &name(void) const { - static QString name("Squares"); + static QString name = QCoreApplication::translate("Visualizers", + "Squares"); return name; } @@ -1368,7 +1373,8 @@ static class PianoFactory : public VisFactory public: const QString &name(void) const { - static QString name("Piano"); + static QString name = QCoreApplication::translate("Visualizers", + "Piano"); return name; } @@ -1553,7 +1559,8 @@ static class AlbumArtFactory : public VisFactory public: const QString &name(void) const { - static QString name("AlbumArt"); + static QString name = QCoreApplication::translate("Visualizers", + "AlbumArt"); return name; } @@ -1605,7 +1612,8 @@ static class BlankFactory : public VisFactory public: const QString &name(void) const { - static QString name("Blank"); + static QString name = QCoreApplication::translate("Visualizers", + "Blank"); return name; } diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp index e27820c..e506233 100644 --- a/mythtv/programs/mythfrontend/scheduleeditor.cpp +++ b/mythtv/programs/mythfrontend/scheduleeditor.cpp @@ -1872,9 +1872,9 @@ void MetadataOptions::customEvent(QEvent *levent) delete lookup; lookup = NULL; - QString title = "No match found for this recording. You can " - "try entering a TVDB/TMDB number, season, and " - "episode manually."; + QString title = tr("No match found for this recording. You can " + "try entering a TVDB/TMDB number, season, and " + "episode manually."); MythConfirmationDialog *okPopup = new MythConfirmationDialog(m_popupStack, title, false); @@ -1918,9 +1918,10 @@ void MetadataOptions::customEvent(QEvent *levent) { MetadataLookup *lookup = lul.takeFirst(); - QString title = "This number, season, and episode combination " - "does not appear to be valid (or the site may " - "be down). Check your information and try again."; + QString title = tr("This number, season, and episode combination " + "does not appear to be valid (or the site may " + "be down). Check your information and try " + "again."); MythConfirmationDialog *okPopup = new MythConfirmationDialog(m_popupStack, title, false);