Skip to content
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

Merged
merged 8 commits into from Sep 5, 2023
Merged

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Aug 24, 2023

  • Differentiating the meanings of "Minor" and "Major"
    Resolves: German translation: “major” should be “groß” or “Dur” depending on context #19153
  • "notes" to "keys", as this is about the piano keyboard
  • Sentence case vs. Title Case in transpose dialog
  • Sentence case vs. Title Case in breaks dialog
  • Sentence case vs. Title Case in editpitch dialog
  • Sentence case vs. Title Case in editstaff dialog
  • Sentence case vs. Title Case in editstafftype dialog
  • Sentence case vs. Title Case in editstringdata dialog
  • Sentence case vs. Title Case in keyedit dialog
  • Sentence case vs. Title Case in masterpalette dialog
  • Sentence case vs. Title Case in measureproperties dialog
  • Sentence case vs. Title Case in pagesettings dialog
  • Sentence case vs. Title Case in realizeharmony dialog
  • Sentence case vs. Title Case in selectnote dialog
  • Sentence case vs. Title Case in specialcharacters dialog
  • Sentence case vs. Title Case in stafftextproperties dialog
  • Sentence case vs. Title Case in tuplet dialog
  • Sentence case vs. Title Case in voicingselect dialog
  • Sentence case vs. Title Case in voicingselect dialog
  • Sentence case vs. Title Case in editstyle dialog
  • Sentence case vs. Title Case in editdrumset dialog
  • Plural for palettes
  • English plurals rather than Italian ones
  • Use winged double quotes (as per discussion in Fix: incorrect quotes and apostrophes #17748)
    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
  • Better naming, "Leading" to "Leading space"
  • "Notehead scheme" in staff properties different from "Notehead system" in Properties panel
    Resolves "Notehead scheme" in staff properties different from "Notehead system" in Properties panel #19166

Copy link
Contributor

@shoogle shoogle left a 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.

@shoogle shoogle added the strings Affects translatable strings label Aug 24, 2023
@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Aug 24, 2023

@shoogle : For now I've picked the disabiguation method

@Jojo-Schmitz Jojo-Schmitz force-pushed the translation-issues branch 3 times, most recently from 1e010c9 to beb4f45 Compare August 24, 2023 15:30
Copy link
Contributor

@shoogle shoogle left a 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.

@cbjeukendrup
Copy link
Contributor

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.)

@Jojo-Schmitz
Copy link
Contributor Author

It isn't that many strings, some 125

@shoogle
Copy link
Contributor

shoogle commented Aug 25, 2023

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.

Comment on lines 57 to 62
{ 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", "" },
Copy link
Contributor

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?

Copy link
Contributor

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.

Copy link
Contributor Author

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.

Copy link
Contributor

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'?

Copy link
Contributor Author

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 ;-)

src/notation/view/selectionfiltermodel.cpp Show resolved Hide resolved
Copy link
Contributor

@shoogle shoogle left a 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:

  1. Disambiguate intervals and keys.
  2. Replace straight quotes with curly quotes.
  3. Use sentence case.
  4. Replace "double coda" with "codetta" (this occurs in lots of places).
  5. 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.

src/palette/internal/palettecreator.cpp Outdated Show resolved Hide resolved
@shoogle
Copy link
Contributor

shoogle commented Aug 31, 2023

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!

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 1, 2023

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 don't see how reviewing a number of PRs is easier than reviewing the same number of commits. IMHO the latter is less work.

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.

@shoogle
Copy link
Contributor

shoogle commented Sep 1, 2023

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.

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 1, 2023

Done. No further changes planned (except for those requested in code review), so not coverted to draft

@Jojo-Schmitz Jojo-Schmitz force-pushed the translation-issues branch 2 times, most recently from 95d899d to df859c2 Compare September 1, 2023 11:59
@Jojo-Schmitz
Copy link
Contributor Author

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)
@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 5, 2023

AFAICT I did the changes that were requested, or didn't I?

@shoogle
Copy link
Contributor

shoogle commented Sep 5, 2023

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.

@Jojo-Schmitz
Copy link
Contributor Author

Done and separated out into another PR, #19294

@shoogle shoogle merged commit 98a7545 into musescore:master Sep 5, 2023
11 checks passed
@Jojo-Schmitz Jojo-Schmitz deleted the translation-issues branch September 6, 2023 09:28
igorkorsukov pushed a commit to igorkorsukov/MuseScore that referenced this pull request Sep 8, 2023
Fix: Horizontal Distance from Notes -> Horizontal distance from notes - like 'Vertical distance from notes' in the same file (see musescore#19155).

Greetings,
Gootector
@Gootector Gootector mentioned this pull request Oct 10, 2023
8 tasks
Gootector referenced this pull request Nov 1, 2023
Fix: apostrophes/quotes

Greetings,
Gootector
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
strings Affects translatable strings
Projects
None yet
4 participants