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.

Sign up for GitHub

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

Jump to bottom

[MU3] Cleanup translatable texts #7161

Merged
merged 3 commits into from Dec 28, 2020
Merged

[MU3] Cleanup translatable texts #7161

merged 3 commits into from Dec 28, 2020

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Dec 25, 2020 •
edited

  • Fix time signature names translation in palettes
  • Fix compiler warnings
  • Fix translatable strings
    • 'Untranslate' some button texts
    • British vs. American English
    • Reset texts mismatch with settings they refer to
    • Make text consistent with neighbours
    • Some fixes that where pending since 3.5 string freeze
    • Add missing strings from order.xml and make sure "Custom" gets translated too
    • Use same string as the corresponding UI file does
    • Remove trailing space
    • Remove superfluous colon

@Jojo-Schmitz Jojo-Schmitz changed the title [MU3] Cleanup translations [MU3] Cleanup translation texts Dec 25, 2020
@Jojo-Schmitz Jojo-Schmitz changed the title [MU3] Cleanup translation texts [MU3] Cleanup translatable texts Dec 25, 2020
@Jojo-Schmitz Jojo-Schmitz force-pushed the cleanup-translations branch 8 times, most recently from 5f1a0f6 to b69ee9e Compare December 25, 2020 17:15
@cbjeukendrup
Copy link
Contributor

Will most probably cause merge conflicts with #7154

What we can do if we want to avoid conflicts, is that I add the fixes you did in editstyle.ui to my PR (of course with credits to you 😉). Otherwise, I guess that it would be favorable if my PR would be merged first.

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 25, 2020 •
edited

Yes, I agree. Credit is not really needed though ;-)
Merge conflicts in UI files are a royal pain.

@Jojo-Schmitz Jojo-Schmitz mentioned this pull request Dec 26, 2020
Closed
@Jojo-Schmitz Jojo-Schmitz force-pushed the cleanup-translations branch 3 times, most recently from 4d34007 to 5097733 Compare December 26, 2020 20:10
@cbjeukendrup
Copy link
Contributor

@Jojo-Schmitz Do you think you are ready with editstyle.ui? Then I will add the changes to my PR.

And maybe you also want to do for 3.x, what I did for master here: c93dbd5
Seems quite translation-related to me.

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 27, 2020 •
edited

I left my comment there, that %n is perfectly correct there and I'd rather not break it for 3.x ;-)
I hope to be done with edidstyle.ui

@cbjeukendrup
Copy link
Contributor

Unfortunately I don't see your comment (yet)... could you maybe post a link to it?

If you find something else in editstyle.ui, please let me know and I will add it!

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 27, 2020 •
edited

c93dbd5#r45467096

@Jojo-Schmitz Jojo-Schmitz force-pushed the cleanup-translations branch 3 times, most recently from 92857b3 to 5a04a84 Compare December 28, 2020 10:41
@Jojo-Schmitz
Fix translatable strings
90e8e55 
* 'Untranslate' some button texts
* British vs. American English
* Reset texts mismatch with settings they refer to
* Make text consistent with neighbours
* Some fixes that where pending since 3.5 string freeze
* Add missing strings from order.xml and make sure "Custom" gets translated too
* Use same string as the corresponding UI file does
* Remove trailing space
* Remove superfluous colon
vpereverzev
vpereverzev reviewed Dec 28, 2020
View reviewed changes
importexport/musicxml/exportxml.cpp
@@ -4977,8 +4977,9 @@ static void annotations(ExportMusicXml* exp, int strack, int etrack, int track,
wtrack = findTrackForAnnotations(e->track(), seg);

if (track == wtrack) {
if (commonAnnotations(exp, e, sstaff))
if (commonAnnotations(exp, e, sstaff)) {
; // already handled
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this 'IF' at all?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I guess mainly for documenting?
@thibault ? What's the intention there, from your 427a539?

@vpereverzev vpereverzev merged commit 9470acf into musescore:3.x Dec 28, 2020
@Jojo-Schmitz Jojo-Schmitz deleted the cleanup-translations branch December 29, 2020 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vpereverzev vpereverzev vpereverzev left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Jojo-Schmitz @cbjeukendrup @vpereverzev