From 48d9194074ffdf402a5679c7a7c40f028017e8fa Mon Sep 17 00:00:00 2001
From: Joachim Schmitz <jojo@schmitz-digital.de>
Date: Thu, 23 Jul 2020 14:25:04 +0200
Subject: [PATCH] fix translatable texts

---
 libmscore/note.cpp            |  8 ++++----
 mscore/editstyle.ui           | 12 ++++++------
 mscore/mixer/mixerdetails.cpp |  2 +-
 mscore/scoreaccessibility.cpp |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libmscore/note.cpp b/libmscore/note.cpp
index ee5eafe027425..dd5df8367e57e 100644
--- a/libmscore/note.cpp
+++ b/libmscore/note.cpp
@@ -3157,8 +3157,8 @@ QString Note::accessibleInfo() const
         pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
     } else if (staff()->isTabStaff(tick())) {
         pitchName
-            = QObject::tr("%1; String %2; Fret %3").arg(tpcUserName(false)).arg(QString::number(string() + 1)).arg(QString::number(
-                                                                                                                       fret()));
+            = QObject::tr("%1; String: %2; Fret: %3").arg(tpcUserName(false)).arg(QString::number(string() + 1)).arg(QString::number(
+                                                                                                                         fret()));
     } else {
         pitchName = tpcUserName(false);
     }
@@ -3190,8 +3190,8 @@ QString Note::screenReaderInfo() const
     } else if (staff()->isDrumStaff(tick()) && drumset) {
         pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
     } else if (staff()->isTabStaff(tick())) {
-        pitchName = QObject::tr("%1 String %2 Fret %3").arg(tpcUserName(true)).arg(QString::number(string() + 1)).arg(QString::number(
-                                                                                                                          fret()));
+        pitchName = QObject::tr("%1 String: %2 Fret: %3").arg(tpcUserName(true)).arg(QString::number(string() + 1)).arg(QString::number(
+                                                                                                                            fret()));
     } else {
         pitchName = tpcUserName(true);
     }
diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
index ce0c5c0d2756a..f2dde6e88b04b 100644
--- a/mscore/editstyle.ui
+++ b/mscore/editstyle.ui
@@ -4285,7 +4285,7 @@
            <item row="1" column="5">
             <widget class="QToolButton" name="resetMMRestNumberMaskHBar">
              <property name="text">
-              <string>...</string>
+              <string notr="true">…</string>
              </property>
              <property name="icon">
               <iconset>
@@ -4316,7 +4316,7 @@
            <item row="2" column="2">
             <widget class="QToolButton" name="resetMMRestHBarThickness">
              <property name="text">
-              <string notr="true">...</string>
+              <string notr="true">…</string>
              </property>
              <property name="icon">
               <iconset>
@@ -4387,7 +4387,7 @@
            <item row="3" column="2">
             <widget class="QToolButton" name="resetMMRestHBarVStrokeThickness">
              <property name="text">
-              <string>...</string>
+              <string notr="true">…</string>
              </property>
              <property name="icon">
               <iconset>
@@ -4418,7 +4418,7 @@
            <item row="3" column="5">
             <widget class="QToolButton" name="resetMMRestHBarVStrokeHeight">
              <property name="text">
-              <string>...</string>
+              <string notr="true">…</string>
              </property>
              <property name="icon">
               <iconset>
@@ -4461,7 +4461,7 @@
               <item row="0" column="2">
                <widget class="QToolButton" name="resetMMRestOldStyleMaxMeasures">
                 <property name="text">
-                 <string>...</string>
+                 <string notr="true">…</string>
                 </property>
                 <property name="icon">
                  <iconset>
@@ -4495,7 +4495,7 @@
               <item row="1" column="2">
                <widget class="QToolButton" name="resetMMRestOldStyleSpacing">
                 <property name="text">
-                 <string>...</string>
+                 <string notr="true">…</string>
                 </property>
                 <property name="icon">
                  <iconset>
diff --git a/mscore/mixer/mixerdetails.cpp b/mscore/mixer/mixerdetails.cpp
index 9e8b4145db5fd..d7af809b60993 100644
--- a/mscore/mixer/mixerdetails.cpp
+++ b/mscore/mixer/mixerdetails.cpp
@@ -275,7 +275,7 @@ void MixerDetails::updateFromTrack()
             tb->setText(QString("%1").arg(voice + 1));
             tb->setCheckable(true);
             tb->setChecked(!staff->playbackVoice(voice));
-            tb->setToolTip(QString(tr("Staff #%1")).arg(staffIdx + 1));
+            tb->setToolTip(QString(tr("Staff %1")).arg(staffIdx + 1));
 
             mutePerVoiceGrid->addWidget(tb, staffIdx, voice);
             MixerDetailsVoiceButtonHandler* handler
diff --git a/mscore/scoreaccessibility.cpp b/mscore/scoreaccessibility.cpp
index 9d954f5faa298..d2d0d17e2f4f0 100644
--- a/mscore/scoreaccessibility.cpp
+++ b/mscore/scoreaccessibility.cpp
@@ -287,7 +287,7 @@ void ScoreAccessibility::currentInfoChanged()
         QString optimizedStaff = "";
         if (e->staffIdx() + 1) {
             _oldStaff = e->staffIdx();
-            staff = tr("Staff %1").arg(QString::number(e->staffIdx() + 1));
+            staff = tr("Staff: %1").arg(QString::number(e->staffIdx() + 1));
             QString staffName = e->staff()->part()->longName(e->tick());
             if (staffName.isEmpty()) {
                 staffName = e->staff()->partName();