fix #289672, fix #289957, fix #272546 and more: fix some strings

* Fix #289672: Reset '$STRING' value strings reference non-existent $STRING * Fix #289957: wrong string in Advanced palette results in it not getting translated (ommission from #5016) * Fix #272546: Baritone Oboe should be named Bass Oboe in English (see also #4474), "Hautbois Baryton" in French, "Bariton Oboe" in German, "Oboe Bajo" in Spanish. Plus: * Add (back) units for sp and pt * Clarify transposition settings in staff properties dialog * Fix a reset button's accessibilty info to match the label * Quote buttons/keys in tours * Barré to Barre * Fix capitalization (see also #5102) * Don't translate debugger (which is not visible in RELEASE mode) * Sforzato to Accent in shortcuts (see https://musescore.org/en/node/290297) * Some whitespace and punctuation fixes * Fixing some error messages * Removing a redundant word * Disambiguations for various occurences of "None" which may require different translatations. * Simplify some strings with URLs for translators * Don't translate scroipt recorder (which is not visible in RELEASE mode)
musescore · Jul 11, 2019 · bf83bdc · bf83bdc
1 parent fa50dff
commit bf83bdc
Show file tree

Hide file tree

Showing 30 changed files with 101 additions and 99 deletions.
diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -1832,7 +1832,7 @@ QString Segment::accessibleExtraInfo() const
                   }
 
             if (s->tick() == tick())
-                  startSpanners += QObject::tr("Start of ") + s->accessibleInfo();
+                  startSpanners += QObject::tr("Start of %1").arg(s->accessibleInfo());
 
             const Segment* seg = 0;
             switch (s->type()) {
@@ -1846,7 +1846,7 @@ QString Segment::accessibleExtraInfo() const
                   }
 
             if (seg && s->tick2() == seg->tick())
-                  endSpanners += QObject::tr("End of ") + s->accessibleInfo();
+                  endSpanners += QObject::tr("End of %1").arg(s->accessibleInfo());
             }
       return rez + " " + startSpanners + " " + endSpanners;
       }

diff --git a/mscore/editdrumset.cpp b/mscore/editdrumset.cpp
@@ -598,8 +598,8 @@ void EditDrumset::save()
 
       QFile f(fname);
       if (!f.open(QIODevice::WriteOnly)) {
-            QString s = tr("Open File\n%1\nfailed: %1").arg(strerror(errno));
-            QMessageBox::critical(mscore, tr("Open File"), s.arg(f.fileName()));
+            QString s = tr("Open File\n%1\nfailed: %2").arg(f.fileName()).arg(strerror(errno));
+            QMessageBox::critical(mscore, tr("Open File"), s);
             return;
             }
       valueChanged();  //save last changes in name

diff --git a/mscore/editraster.ui b/mscore/editraster.ui
@@ -41,7 +41,7 @@
           <item row="0" column="1" rowspan="2">
            <widget class="QLabel" name="label_2">
             <property name="text">
-             <string>1 / </string>
+             <string>1 /</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -64,7 +64,7 @@
           <item row="2" column="1">
            <widget class="QLabel" name="label_5">
             <property name="text">
-             <string>1 / </string>
+             <string>1 /</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

diff --git a/mscore/editstaff.ui b/mscore/editstaff.ui
@@ -576,7 +576,7 @@
         <item>
          <widget class="QLabel" name="labelTransp">
           <property name="text">
-           <string>Transpose written pitches to sound:</string>
+           <string>Transposition against concert/sounding pitch:</string>
           </property>
           <property name="buddy">
            <cstring>iList</cstring>

diff --git a/mscore/editstafftype.ui b/mscore/editstafftype.ui
@@ -844,7 +844,7 @@
                       </size>
                      </property>
                      <property name="text">
-                      <string>None</string>
+                      <string comment="neither note symbols nor stems and beams">None</string>
                      </property>
                     </widget>
                    </item>
@@ -1178,7 +1178,7 @@
                       </size>
                      </property>
                      <property name="text">
-                      <string>None</string>
+                      <string comment="neither short nor slashed stem">None</string>
                      </property>
                     </widget>
                    </item>

diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -383,12 +383,12 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       tupletNumberType->clear();
       tupletNumberType->addItem(tr("Number"), int(TupletNumberType::SHOW_NUMBER));
       tupletNumberType->addItem(tr("Ratio"), int(TupletNumberType::SHOW_RELATION));
-      tupletNumberType->addItem(tr("None"), int(TupletNumberType::NO_TEXT));
+      tupletNumberType->addItem(tr("None", "no tuplet number type"), int(TupletNumberType::NO_TEXT));
 
       tupletBracketType->clear();
       tupletBracketType->addItem(tr("Automatic"), int(TupletBracketType::AUTO_BRACKET));
       tupletBracketType->addItem(tr("Bracket"), int(TupletBracketType::SHOW_BRACKET));
-      tupletBracketType->addItem(tr("None"), int(TupletBracketType::SHOW_NO_BRACKET));
+      tupletBracketType->addItem(tr("None", "no tuplet bracket type"), int(TupletBracketType::SHOW_NO_BRACKET));
 
       pageList->setCurrentRow(0);
       accidentalsGroup->setVisible(false); // disable, not yet implemented
@@ -564,8 +564,8 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
             }
 
       textStyleFrameType->clear();
-      textStyleFrameType->addItem(tr("None"), int(FrameType::NO_FRAME));
-      textStyleFrameType->addItem(tr("Square"), int(FrameType::SQUARE));
+      textStyleFrameType->addItem(tr("None", "no frame for text"), int(FrameType::NO_FRAME));
+      textStyleFrameType->addItem(tr("Rectangle"), int(FrameType::SQUARE));
       textStyleFrameType->addItem(tr("Circle"), int(FrameType::CIRCLE));
 
       resetTextStyleName->setIcon(*icons[int(Icons::reset_ICON)]);

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -3473,7 +3473,7 @@
                 <string>Reset to default</string>
                </property>
                <property name="accessibleName">
-                <string>Reset 'System header to time signature distance' value</string>
+                <string>Reset 'System header with time signature distance' value</string>
                </property>
                <property name="text">
                 <string notr="true"/>
@@ -4946,7 +4946,7 @@
                 </item>
                 <item>
                  <property name="text">
-                  <string>None</string>
+                  <string comment="no tuplet number">None</string>
                  </property>
                 </item>
                </widget>
@@ -4998,7 +4998,7 @@
                 </item>
                 <item>
                  <property name="text">
-                  <string>None</string>
+                  <string comment="no tuplet bracket">None</string>
                  </property>
                 </item>
                </widget>
@@ -5960,7 +5960,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Default position' value</string>
+              <string>Reset 'Position' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -6032,7 +6032,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Position Below' value</string>
+              <string>Reset 'Position below' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -6301,7 +6301,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Position Above' value</string>
+              <string>Reset 'Position above' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -7776,7 +7776,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Position Below' value</string>
+              <string>Reset Autoplace min. distance' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -8798,7 +8798,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Position Below' value</string>
+              <string>Reset 'Position below' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -8828,7 +8828,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Position Above' value</string>
+              <string>Reset 'Position above' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -9533,10 +9533,10 @@
            <item row="3" column="0">
             <widget class="QLabel" name="label_2">
              <property name="accessibleName">
-              <string>Barré line thickness</string>
+              <string>Barre line thickness</string>
              </property>
              <property name="text">
-              <string>Barré line thickness:</string>
+              <string>Barre line thickness:</string>
              </property>
              <property name="buddy">
               <cstring>barreLineWidth</cstring>
@@ -9812,7 +9812,7 @@
               <string>Reset to default</string>
              </property>
              <property name="accessibleName">
-              <string>Reset 'Size changes with staff space setting' value</string>
+              <string>Reset 'Follow staff size' value</string>
              </property>
              <property name="text">
               <string notr="true"/>
@@ -9956,7 +9956,23 @@
                </widget>
               </item>
               <item row="0" column="1">
-               <widget class="QComboBox" name="textStyleFrameType"/>
+               <widget class="QComboBox" name="textStyleFrameType">
+                <item>
+                 <property name="text">
+                  <string notr="true">None</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string notr="true">Rectangle</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Circle</string>
+                 </property>
+                </item>
+               </widget>
               </item>
               <item row="0" column="2">
                <widget class="QToolButton" name="resetTextStyleFrameType">
@@ -10034,7 +10050,7 @@
                     <string>Reset to default</string>
                    </property>
                    <property name="accessibleName">
-                    <string>Reset 'Foreground' value</string>
+                    <string>Reset 'Border' value</string>
                    </property>
                    <property name="text">
                     <string notr="true"/>
@@ -10092,7 +10108,7 @@
                     <string>Reset to default</string>
                    </property>
                    <property name="accessibleName">
-                    <string>Reset 'Text margin' value</string>
+                    <string>Reset 'Margin' value</string>
                    </property>
                    <property name="text">
                     <string notr="true"/>
@@ -10126,7 +10142,7 @@
                     <string>Reset to default</string>
                    </property>
                    <property name="accessibleName">
-                    <string>Reset 'Border radius' value</string>
+                    <string>Reset 'Corner radius' value</string>
                    </property>
                    <property name="text">
                     <string notr="true"/>

diff --git a/mscore/help.cpp b/mscore/help.cpp
@@ -30,7 +30,7 @@ HelpQuery::HelpQuery(QWidget* parent)
       QHBoxLayout* layout = new QHBoxLayout;
 
       QLabel* label = new QLabel;
-      label->setText(tr("Search for: "));
+      label->setText(tr("Search for:"));
       layout->addWidget(label);
 
       entry = new QLineEdit;

diff --git a/mscore/inspector/inspector.cpp b/mscore/inspector/inspector.cpp
@@ -849,7 +849,7 @@ InspectorAccidental::InspectorAccidental(QWidget* parent)
             { Pid::ACCIDENTAL_BRACKET,  0, a.bracket,  a.resetBracket  }
             };
       a.bracket->clear();
-      a.bracket->addItem(tr("None"), int(AccidentalBracket::NONE));
+      a.bracket->addItem(tr("None", "no accidental bracket type"), int(AccidentalBracket::NONE));
       a.bracket->addItem(tr("Parenthesis"), int(AccidentalBracket::PARENTHESIS));
       a.bracket->addItem(tr("Bracket"), int(AccidentalBracket::BRACKET));
 

diff --git a/mscore/inspector/inspectorTextBase.cpp b/mscore/inspector/inspectorTextBase.cpp
@@ -50,8 +50,8 @@ InspectorTextBase::InspectorTextBase(QWidget* parent)
             pList.push_back(i);
       QComboBox* b = t.frameType;
       b->clear();
-      b->addItem(b->QObject::tr("None"), int(FrameType::NO_FRAME));
-      b->addItem(b->QObject::tr("Square"), int(FrameType::SQUARE));
+      b->addItem(b->QObject::tr("None", "no frame for text"), int(FrameType::NO_FRAME));
+      b->addItem(b->QObject::tr("Rectangle"), int(FrameType::SQUARE));
       b->addItem(b->QObject::tr("Circle"), int(FrameType::CIRCLE));
 
       connect(t.resetToStyle, SIGNAL(clicked()), SLOT(resetToStyle()));

diff --git a/mscore/inspector/inspectorTextLineBase.cpp b/mscore/inspector/inspectorTextLineBase.cpp
@@ -24,7 +24,7 @@ namespace Ms {
 void populateHookType(QComboBox* b)
       {
       b->clear();
-      b->addItem(b->QObject::tr("None"), int(HookType::NONE));
+      b->addItem(b->QObject::tr("None", "no hook type"), int(HookType::NONE));
       b->addItem(b->QObject::tr("90\u00b0"), int(HookType::HOOK_90)); // &deg;
       b->addItem(b->QObject::tr("45\u00b0"), int(HookType::HOOK_45)); // &deg;
       b->addItem(b->QObject::tr("90\u00b0 centered"), int(HookType::HOOK_90T)); // &deg;

diff --git a/mscore/inspector/inspector_element.ui b/mscore/inspector/inspector_element.ui
@@ -301,6 +301,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="suffix">
+         <string>sp</string>
+        </property>
         <property name="minimum">
          <double>-999.990000000000009</double>
         </property>

diff --git a/mscore/inspector/inspector_hbox.ui b/mscore/inspector/inspector_hbox.ui
@@ -232,7 +232,7 @@
          </sizepolicy>
         </property>
         <property name="accessibleName">
-         <string>Reset 'Create system headers' value</string>
+         <string>Reset 'Create system header' value</string>
         </property>
        </widget>
       </item>

diff --git a/mscore/inspector/inspector_image.ui b/mscore/inspector/inspector_image.ui
@@ -161,7 +161,7 @@
          </sizepolicy>
         </property>
         <property name="accessibleName">
-         <string>Reset 'Size in spatium units' value</string>
+         <string>Reset 'Size in staff space units' value</string>
         </property>
        </widget>
       </item>

diff --git a/mscore/inspector/inspector_text.ui b/mscore/inspector/inspector_text.ui
@@ -165,6 +165,9 @@
           <property name="accessibleName">
            <string>Font size</string>
           </property>
+          <property name="suffix">
+           <string>pt</string>
+          </property>
           <property name="minimum">
            <double>1.000000000000000</double>
           </property>

diff --git a/mscore/inspector/inspector_tuplet.ui b/mscore/inspector/inspector_tuplet.ui
@@ -208,7 +208,7 @@
         </item>
         <item>
          <property name="text">
-          <string>None</string>
+          <string comment="no tuplet number style">None</string>
          </property>
         </item>
        </widget>
@@ -262,7 +262,7 @@
         </item>
         <item>
          <property name="text">
-          <string>None</string>
+          <string comment="no tuplet bracket style">None</string>
          </property>
         </item>
        </widget>

diff --git a/mscore/inspector/resetButton.cpp b/mscore/inspector/resetButton.cpp
@@ -31,7 +31,7 @@ ResetButton::ResetButton(QWidget* parent)
       reset->setFlat(true);
 
       setStyle = new QPushButton(this);
-      setStyle->setText(tr("S"));
+      setStyle->setText(tr("S", "set as style"));
       setStyle->setToolTip(tr("Set as style"));
       setStyle->setMinimumSize(QSize(24,24));
       setStyle->setMaximumSize(QSize(24,24));

diff --git a/mscore/logindialog.cpp b/mscore/logindialog.cpp
@@ -46,12 +46,8 @@ LoginDialog::LoginDialog(LoginManager* loginManager)
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       connect(buttonBox,   SIGNAL(clicked(QAbstractButton*)), SLOT(buttonBoxClicked(QAbstractButton*)));
       _loginManager = loginManager;
-      createAccountLabel->setText(tr("%1Create an account%2")
-                                  .arg("<a href=\"https://musescore.com/user/register\">")
-                                  .arg("</a>"));
-      forgotPasswordLabel->setText(tr("%1Forgot password?%2")
-                                   .arg("<a href=\"https://musescore.com/user/password\">")
-                                   .arg("</a>"));
+      createAccountLabel->setText("<a href=\"https://musescore.com/user/register\">" + tr("Create an account") + "</a>");
+      forgotPasswordLabel->setText("<a href=\"https://musescore.com/user/password\">" + tr("Forgot password?") + "</a>");
       connect(_loginManager, SIGNAL(loginSuccess()), this, SLOT(onLoginSuccess()));
       connect(_loginManager, SIGNAL(loginError(const QString&)), this, SLOT(onLoginError(const QString&)));
 

diff --git a/mscore/playpanel.ui b/mscore/playpanel.ui
@@ -86,7 +86,7 @@
            </size>
           </property>
           <property name="text">
-           <string notr="true" extracomment="placeholder">1212</string>
+           <string notr="true" extracomment="placeholder"> 1212</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -187,7 +187,7 @@
            </size>
           </property>
           <property name="text">
-           <string>Time: </string>
+           <string>Time:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -215,7 +215,7 @@
            </size>
           </property>
           <property name="text">
-           <string notr="true" extracomment="placeholder">55</string>
+           <string notr="true" extracomment="placeholder"> 55</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>