Merge pull request #525 from Jojo-Schmitz/fix.orig.texts

fix #23366 2nd batch
musescore · Nov 1, 2013 · e03ddb3 · e03ddb3
2 parents db9009c + 0712881
commit e03ddb3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -307,7 +307,7 @@ void Harmony::read(XmlReader& e)
       // TODO: now that we can render arbitrary chords,
       // we could try to construct a full representation from a degree list.
       // These will typically only exist for chords imported from MusicXML prior to MuseScore 2.0
-      // or constructed in the Harmony Properties dialog.
+      // or constructed in the Chord Name Properties dialog.
 
       if (_rootTpc != INVALID_TPC) {
             if (_id > 0)

diff --git a/mscore/actions.cpp b/mscore/actions.cpp
@@ -1436,8 +1436,8 @@ Shortcut Shortcut::sc[] = {
          STATE_NORMAL | STATE_NOTE_ENTRY,
          A_CMD,
          "harmony-properties",
-         QT_TRANSLATE_NOOP("action","Harmony Properties"),
-         QT_TRANSLATE_NOOP("action","Show harmony properties for chord")
+         QT_TRANSLATE_NOOP("action","Chord Name Properties"),
+         QT_TRANSLATE_NOOP("action","Show properties for chord name")
          ),
       Shortcut(
          STATE_NORMAL | STATE_NOTE_ENTRY,
@@ -2458,13 +2458,13 @@ Shortcut Shortcut::sc[] = {
          STATE_HARMONY_FIGBASS_EDIT,
          0,
          "prev-beat-TEXT",
-         QT_TRANSLATE_NOOP("action","Previous beat (Harmony)")
+         QT_TRANSLATE_NOOP("action","Previous beat (Chord name)")
          ),
       Shortcut(
          STATE_HARMONY_FIGBASS_EDIT,
          0,
          "next-beat-TEXT",
-         QT_TRANSLATE_NOOP("action","Next beat (Harmony)")
+         QT_TRANSLATE_NOOP("action","Next beat (Chord name)")
          ),
       Shortcut(
          STATE_NORMAL | STATE_NOTE_ENTRY,

diff --git a/mscore/chordedit.ui b/mscore/chordedit.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Harmony Properties</string>
+   <string>MuseScore: Chord Name Properties</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0" colspan="2">

diff --git a/mscore/editstringdata.ui b/mscore/editstringdata.ui
@@ -108,7 +108,7 @@
        <item>
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>NumOfFrets:</string>
+          <string>Number of Frets:</string>
          </property>
         </widget>
        </item>

diff --git a/mscore/inspector/inspector_timesig.ui b/mscore/inspector/inspector_timesig.ui
@@ -72,7 +72,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>timesig</string>
+        <string>time sig.</string>
        </property>
       </widget>
      </item>
@@ -161,7 +161,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>global timesig</string>
+        <string>global time sig.</string>
        </property>
       </widget>
      </item>

diff --git a/mscore/propertymenu.cpp b/mscore/propertymenu.cpp
@@ -299,7 +299,7 @@ void ScoreView::createElementPropertyMenu(Element* e, QMenu* popup)
       else if (e->type() == Element::HARMONY) {
             genPropertyMenu1(e, popup);
             popup->addSeparator();
-            popup->addAction(tr("Harmony Properties..."))->setData("ha-props");
+            popup->addAction(tr("Chord Name Properties..."))->setData("ha-props");
             }
       else if (e->type() == Element::INSTRUMENT_NAME) {
             popup->addAction(tr("Staff Properties..."))->setData("staff-props");