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

Pocket Sax improvements #5622

Merged
merged 1 commit into from
Feb 11, 2020
Merged

Pocket Sax improvements #5622

merged 1 commit into from
Feb 11, 2020

Conversation

riaanvn
Copy link
Contributor

@riaanvn riaanvn commented Jan 19, 2020

Resolves: Pocket Sax spelling and abbreviations improvements

(forum discussion, no issue)

These are the commands I used to edit and the two edited files
I also swapped around Pocket Sax/Xaphoon to Xaphoonin/Pocket Sax in the description field to prevent ambiguous expansion of the "/" to Pocket Sax / Pocket Xaphoon

perl -p -i -e 's:Pocket-Sax/Xaphoon:Xaphoon/Pocket Sax:' share/instruments/instruments{.xml,xml.h}

perl -p -i -e 's/pocket-sax/Pocket Sax in/i' share/instruments/instruments{.xml,xml.h}

perl -p -i -e 's/P.-Sx. /Pkt. Sax /' share/instruments/instruments{.xml,xml.h}

egrep -i 'P.-Sx.|Pocket-Sax|Pkt. Sax|Pocket Sax' share/instruments/instruments{.xml,xml.h}

  • I signed CLA
  • I made sure the code in the PR follows the coding rules
  • I made sure the code compiles on my machine
  • I made sure there are no unnecessary changes in the code
  • I made sure the title of the PR reflects the core meaning of the issue you are solving
  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
  • I made sure the commit message title starts with "fix #424242:" if there is a related issue
  • [n/a] I created the test (mtest, vtest, script test) to verify the changes I made

@Jojo-Schmitz
Copy link
Contributor

Why 2 commits, and with the same title?

@riaanvn
Copy link
Contributor Author

riaanvn commented Jan 20, 2020

Thanks, not sure how that happened. I updated a branch in the past without having to squash. Should be fixed now. I assume this will only be merged post-3.4?

@dmitrio95 dmitrio95 added the strings Affects translatable strings label Jan 21, 2020
@riaanvn
Copy link
Contributor Author

riaanvn commented Jan 24, 2020

@Jojo-Schmitz are you happy with the changes (since the original/previous Pocket Sax was your PR) and ready to be merged?

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented Jan 24, 2020

Fine by me, except maybe the "squashed" in the commit title
Any yes, post 3.4, as it changes strings and those have been frozen for 3.4 meanwhile

@riaanvn
Copy link
Contributor Author

riaanvn commented Jan 26, 2020

Agreed, " squashed" squashed. Ready for merge.

@Jojo-Schmitz
Copy link
Contributor

?? It's still in the commit title, forgot to git push --force?

@riaanvn
Copy link
Contributor Author

riaanvn commented Jan 26, 2020

Jup that was it. What would I do without you?
@anatoly-os : ready to merge.

@Jojo-Schmitz
Copy link
Contributor

Once we're in 3.5 mode...

@riaanvn
Copy link
Contributor Author

riaanvn commented Jan 26, 2020

I was thinking the exact thing paraphrased; "once the 3.4.x dust settles"

@dmitrio95 dmitrio95 merged commit ea8a643 into musescore:master Feb 11, 2020
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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants