New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Several Translation issues #19155
Several Translation issues #19155
Conversation
7a1a07b
to
b84171c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see this in different files:
//: mode of a key signature, not an interval
qsTrc("inspector", "Major")
//: Interval, not the mode of a key signature
qsTrc("inspector", "Major")
However, translation comments are not considered during translation lookup, so both strings will use the same translation for "Major".
To get a different translation, you must either change the context string:
qsTrc("inspector/keysignatures", "Major")
qsTrc("inspector/ornaments", "Major")
Or pass in a disambiguation string as an additional argument to qsTrc()
:
qsTrc("inspector", "Major", "key signature mode")
qsTrc("inspector", "Major", "interval quality")
I'll let @cbjeukendrup say which he would prefer in this case.
The context and disambiguation are displayed on Transifex, but they are buried quite far down the page, so it is helpful to provide the translation comments as well.
955090c
to
21a6326
Compare
@shoogle : For now I've picked the disabiguation method |
1e010c9
to
beb4f45
Compare
src/appshell/view/internal/splashscreen/newinstanceloadingscreenview.cpp
Outdated
Show resolved
Hide resolved
...pector/view/qml/MuseScore/Inspector/general/appearance/internal/HorizontalSpacingSection.qml
Show resolved
Hide resolved
src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml
Outdated
Show resolved
Hide resolved
src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml
Outdated
Show resolved
Hide resolved
src/project/qml/MuseScore/Project/internal/NewScore/KeySignatureSettings.qml
Outdated
Show resolved
Hide resolved
src/project/qml/MuseScore/Project/internal/NewScore/KeySignatureSettings.qml
Outdated
Show resolved
Hide resolved
beb4f45
to
8e93df4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, but I'd like to get sign-off from a designer before we merge.
I still doubt very much about whether we should do that sentence case thing with those old dialogs. It gives translators a lot of useless extra work, and the benefits are very, very small, considering that these dialogs are to be completely overhauled anyway. (And I'm inclined to say that these dialogs are so ugly anyway that some capitalisation inconsistencies that only 0.03% of people will ever notice are not going to make much of a difference.) |
It isn't that many strings, some 125 |
I think the Translation Memory should recognise these strings as being similar to the previous ones and provide the old translation as a suggestion, possibly even fill it in automatically, so all translators have to do is review. |
50158b2
to
158d85d
Compare
src/engraving/libmscore/jump.cpp
Outdated
{ JumpType::DC_AL_DBLCODA, "D.C. al Double Coda", "start", "varcoda", "codab" }, | ||
{ JumpType::DS_AL_DBLCODA, "D.S. al Double Coda", "segno", "varcoda", "codab" }, | ||
{ JumpType::DSS, "Dal Segno Segno", "varsegno", "end", "" }, | ||
{ JumpType::DSS_AL_CODA, "D.S.S. al Coda", "varsegno", "coda", "codab" }, | ||
{ JumpType::DSS_AL_DBLCODA, "D.S.S. al Double Coda", "varsegno", "varcoda", "codab" }, | ||
{ JumpType::DSS_AL_FINE, "D.S.S. al Fine", "varsegno", "fine", "" }, | ||
{ JumpType::DC_AL_DBLCODA, "D.C. al Codetta", "start", "varcoda", "codab" }, | ||
{ JumpType::DS_AL_DBLCODA, "D.S. al Codetta", "segno", "varcoda", "codab" }, | ||
{ JumpType::DSS, "Dal Segno Segno", "varsegno", "end", "" }, | ||
{ JumpType::DSS_AL_CODA, "D.S.S. al Coda", "varsegno", "coda", "codab" }, | ||
{ JumpType::DSS_AL_DBLCODA, "D.S.S. al Codetta", "varsegno", "varcoda", "codab" }, | ||
{ JumpType::DSS_AL_FINE, "D.S.S. al Fine", "varsegno", "fine", "" }, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@oktophonie, what do you think of these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not familiar enough with the arcane mysteries of either double codas nor with Italian to say. The language mixture is certainly a bit odd, but whether these changes are 'correct' I don't know.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure either, only thing I am sure about is that the Double Coda was called Codetta in Mu1.
And that there is neither Codetta nor Double Coda as a separate/single qlyph in SMuFL.
We could also change "Double" to "Doppio", to avoid that language mix.
I don't really care either way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mike-spa, what do you think about 'Double Coda', 'Doppio Coda' and 'Codetta'?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yes, we do have an Italian in the team ;-)
158d85d
to
f7fc84f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please stop adding new things to the PR after it has been reviewed. It's ok to make improvements to approved functionality (e.g. if you spot another straight quote than needs to be replaced with a curly quote) but introducing an entirely new kind of change just delays merging further while we go through another round of approvals from all the different stakeholders (i.e. developers, designers, and the engraving team).
Ideally you should open separate PRs for each kind of change:
- Disambiguate intervals and keys.
- Replace straight quotes with curly quotes.
- Use sentence case.
- Replace "double coda" with "codetta" (this occurs in lots of places).
- Other string changes (which only occur in one or two places each).
That way each PR only has to be approved by relevant stakeholders rather than by everybody, so changes can get merged faster.
Also, it's not cool to bury one or two high-impact changes (like renaming a palette) in with a plethora of low-impact changes (like replacing straight quotes with curly quotes everywhere). That's exactly the kind of thing that might get merged accidently and then we'd just end up reverting it later on, only we couldn't (easily) revert it because it's combined with other changes, so that means more work... you get the idea! |
This is why this PR comes with a bunch of commits, you can easily review each and take the entire PR or just cherry-pick some commits and also can easily revert a commit, should it cause trouble. I could squash all the Title Case vs. Sentence case commit into just one, I was using many because it was quite a big task, Just let me know. |
Yes, please squash the related commits, and mark the PR as 'draft' if you plan to make further changes. Multiple commits are useful, but GitHub's 'Viewed' feature (to hide files that you've seen before) only works when you view the full diff, not the per-commit diffs, so there are advantages to using separate PRs. But the main problem is that you keep adding unrelated changed to the PR after it has been approved. This requires another approval, often by different people, whereas if you only added related changes (like fixing another instance of title case) then we could still merge it based on the original approval. |
f7fc84f
to
a78ecad
Compare
Done. No further changes planned (except for those requested in code review), so not coverted to draft |
95d899d
to
df859c2
Compare
No change, just a rebase |
in: * masterpalette dialog * editdrumset dialog * editstyle dialog * voicingselect dialog * tuplet dialog * stafftextproperties dialog * specialcharacters dialog * selectnote dialog * realizeharmony dialog * pagesettings dialog * measureproperties dialog * keyedit dialog * editstringdate dialog * editstafftype dialog * editstaff dialog * editpitch dialog * breaks dialog * transpose dialog
See also the discussion from PR musescore#17748 Except for one, to avoid an MSVC compiler warning reg. decimal digit terminates octal escape sequence (C4125)
…otehead system" in Properties panel See musescore#19166
df859c2
to
d68c996
Compare
AFAICT I did the changes that were requested, or didn't I? |
You've done what was requested so far, but @mike-spa is away for a couple of weeks so you'll have to drop the "Codetta" changes if you want to see the other changes merged before he returns. |
d68c996
to
bb4d41c
Compare
Done and separated out into another PR, #19294 |
Fix: Horizontal Distance from Notes -> Horizontal distance from notes - like 'Vertical distance from notes' in the same file (see musescore#19155). Greetings, Gootector
Resolves: German translation: “major” should be “groß” or “Dur” depending on context #19153
Not sure whether the single quotes should also get changed to winged ones, there are some 140 strings affected, the vast majority of them in the editstyle dialog, which is slated to get converted to QML
Resolves "Notehead scheme" in staff properties different from "Notehead system" in Properties panel #19166