Merge pull request #2874 from Jojo-Schmitz/master-palette-translation

fix #138721: translate master palette items
musescore · Nov 15, 2016 · f06217b · f06217b
2 parents 8ce08ce + ec784b9
commit f06217b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/mscore/masterpalette.cpp b/mscore/masterpalette.cpp
@@ -129,6 +129,7 @@ void MasterPalette::addPalette(Palette* sp)
       psa->setRestrictHeight(false);
       QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(sp->name()));
       item->setData(0, Qt::UserRole, stack->count());
+      item->setText(0, qApp->translate("Palette", sp->name().toUtf8().data()).replace("&&","&"));
       stack->addWidget(psa);
       treeWidget->addTopLevelItem(item);
       }
@@ -184,6 +185,7 @@ MasterPalette::MasterPalette(QWidget* parent)
 
       symbolItem = new QTreeWidgetItem();
       symbolItem->setData(0, Qt::UserRole, -1);
+      symbolItem->setText(0, QT_TRANSLATE_NOOP("MasterPalette", "Symbols"));
       treeWidget->addTopLevelItem(symbolItem);
 
       for (const QString& s : smuflRanges()->keys()) {
@@ -206,9 +208,9 @@ MasterPalette::MasterPalette(QWidget* parent)
 
 void MasterPalette::retranslate(bool firstTime)
       {
-      keyItem->setText(0, tr("Key Signatures"));
-      timeItem->setText(0, tr("Time Signatures"));
-      symbolItem->setText(0, tr("Symbols"));
+      keyItem->setText(0, qApp->translate("Palette", "Key Signatures"));
+      timeItem->setText(0, qApp->translate("Palette", "Time Signatures"));
+      symbolItem->setText(0, qApp->translate("MasterPalette", "Symbols"));
       if (!firstTime)
             retranslateUi(this);
       }

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -4643,11 +4643,11 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
       else if (cmd == "masterpalette")
             showMasterPalette();
       else if (cmd == "key-signatures")
-            showMasterPalette(tr("Key Signatures"));
+            showMasterPalette(qApp->translate("Palette", "Key Signatures"));
       else if (cmd == "time-signatures")
-            showMasterPalette(tr("Time Signatures"));
+            showMasterPalette(qApp->translate("Palette", "Time Signatures"));
       else if (cmd == "symbols")
-            showMasterPalette(tr("Symbols"));
+            showMasterPalette(qApp->translate("MasterPalette", "Symbols"));
       else if (cmd == "toggle-statusbar") {
             preferences.showStatusBar = a->isChecked();
             _statusBar->setVisible(preferences.showStatusBar);