fix #289672, fix #272546 and more: fix some strings #5063
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jojo-Schmitz
force-pushed
the
texts
branch
5 times, most recently
from
ad060ea
to
026614c
Compare
Jojo-Schmitz
changed the title
Jojo-Schmitz
force-pushed
the
texts
branch
2 times, most recently
from
b8e460b
to
0970e1b
Compare
Jojo-Schmitz
changed the title
Jojo-Schmitz
changed the title
Jojo-Schmitz
force-pushed
the
texts
branch
6 times, most recently
from
7810850
to
a41360b
Compare
Jojo-Schmitz
force-pushed
the
texts
branch
3 times, most recently
from
c5c2446
to
6ff2122
Compare
Jojo-Schmitz
changed the title
Jojo-Schmitz
force-pushed
the
texts
branch
6 times, most recently
from
c4a6302
to
c4ca53a
Compare
* 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 musescore#5016) * Fix #272546: Baritone Oboe should be named Bass Oboe in English (see also musescore#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 musescore#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)
dmitrio95
reviewed
Jul 11, 2019
mscore/data/shortcuts.xml
Outdated
| @@ -221,7 +221,7 @@ | |||
| <seq>Shift+O</seq> | |||
| </SC> | |||
| <SC> | |||
| <key>add-sforzato</key> | |||
| <key>add-accent</key> | |||
There was a problem hiding this comment.
Will this change work correctly with existing users' shortcuts files? Shortcut file will contain Shift+V shortcut which references add-sforzato action which doesn't exist anymore, so the shortcut may happen to be lost at all.
Actually I don't know the answer, perhaps the new default will somehow take a precedence. But that probably needs testing.
There was a problem hiding this comment.
Tested: On start I see "Debug: cannot find shortcut (...\MuseScore\mscore\shortcut.cpp:4167, static void Ms::Shortcut::load())". The shortcut add-sforzato will simply get ignored, the new shortcut add-accent will be empty, unset. The user would either need to set up a new shortcut (e.g. "Shift+V" again) for add-accent or take a factory reset or manually delete shortcuts.xml.
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jul 12, 2019
dmitrio95
added a commit
that referenced
this pull request
Jul 12, 2019
follow up for PR #5063, fixing mistakes and omissions
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jul 12, 2019
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jul 12, 2019
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jul 12, 2019
dmitrio95
added a commit
that referenced
this pull request
Jul 12, 2019
and another follow-up for PR #5063 ...
fcnjd
pushed a commit
to fcnjd/MuseScore
that referenced
this pull request
Jul 21, 2019
fcnjd
pushed a commit
to fcnjd/MuseScore
that referenced
this pull request
Jul 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
"Hautbois Baryton" in French, "Bariton Oboe" in German, "Oboe Bajo" in Spanish.
Plus:
In a separate commit (removed from this PR now, moved into #5218):
Not sure we really want this though, as it invalidates an existing shortcut settings. We may get away with this by documenting in the release notes that this shortcut gets lost during an upgrade and needs to get reinstated manually (or via a factory reset).