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

More translations to DK #2656

Merged
merged 2 commits into from
Nov 1, 2022
Merged

More translations to DK #2656

merged 2 commits into from
Nov 1, 2022

Conversation

HThuren
Copy link
Contributor

@HThuren HThuren commented Oct 30, 2022

Changed translations to Champanion after correction in #2602
Changed translations to Radio, including PR #2655 (including latest changes)

@pfeerick pfeerick added this to the 2.8 milestone Oct 31, 2022
@HThuren
Copy link
Contributor Author

HThuren commented Oct 31, 2022

@pfeerick, I think merge must be after #2655

@pfeerick
Copy link
Member

pfeerick commented Nov 1, 2022

Yes, particularly as this will may need to be rebased since changes were made to the same block of code (making changes to the same lines in two different branches is an automatic cause of a merge conflict unless done carefully).

@pfeerick pfeerick merged commit 3d687c6 into EdgeTX:main Nov 1, 2022
@HThuren HThuren deleted the Danish_translations branch November 1, 2022 18:55
pfeerick pushed a commit that referenced this pull request Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants