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

Changes after using QtLinguist (Danish) #2738

Merged
merged 2 commits into from
Dec 16, 2022
Merged

Changes after using QtLinguist (Danish) #2738

merged 2 commits into from
Dec 16, 2022

Conversation

HThuren
Copy link
Contributor

@HThuren HThuren commented Nov 14, 2022

After instructions in #2685 now changed Danish translation

@HThuren HThuren mentioned this pull request Nov 14, 2022
Merged
@pfeerick pfeerick changed the title Changes after using QtLinguist Changes after using QtLinguist (Danish) Nov 14, 2022
@pfeerick pfeerick changed the base branch from main to etx28-qtlinguist-release November 18, 2022 03:37
@pfeerick pfeerick changed the base branch from etx28-qtlinguist-release to main November 18, 2022 03:37
@HThuren
Copy link
Contributor Author

HThuren commented Nov 25, 2022

@pfeerick, is it possible this PR will be merged into EdgeTx 2.8 ?

@pfeerick
Copy link
Member

I'm afraid not - it will have to go into main, and then I'll need to rebase #2685 as there are conflicts with that, and then finish working on the changes to the translation system there.

@HThuren
Copy link
Contributor Author

HThuren commented Nov 26, 2022

I'm afraid not - it will have to go into main, and then I'll need to rebase #2685 as there are conflicts with that, and then finish working on the changes to the translation system there.

ok, anything I can help with ? otherwise I'll wait :-)

@HThuren
Copy link
Contributor Author

HThuren commented Dec 10, 2022

Hi @pfeerick, maybe reconsider, since the danish changes here not really depends of #2685, but are a result of using QtLinguist. There are no changes acording to #2685
and I am afraid the changes here get too much out of sync with other PRs

@pfeerick
Copy link
Member

No, that is not the case. Otherwise, I would have been able to just merge this into the etx28-qtlinguist-release branch for #2685 - but I can't as it had a merge conflict. Which is why I said

it (this PR) will have to go into main, and then I'll need to rebase #2685 as there are conflicts with that

In other words, it will go into main (which is for 2.9), but I was hoping to not make any major changes to the 2.8 translation base. However, given it seems like 2.9 release date is going to be pushed out, it might end up in 2.8.x as well.

@HThuren
Copy link
Contributor Author

HThuren commented Dec 11, 2022

Ok, sorry I cant help with the rebase, but very good the translation end up in 2.8, since there where many good changes from the QtLinguist run and translation process. I try to be patient :-)

@pfeerick pfeerick added this to the 2.8.1 milestone Dec 14, 2022
@pfeerick pfeerick merged commit 37e07ec into EdgeTX:main Dec 16, 2022
@HThuren
Copy link
Contributor Author

HThuren commented Dec 16, 2022

Thank you for this christimas present :-)

@HThuren HThuren deleted the DAafterQtLinguist branch December 16, 2022 17:14
mha1 pushed a commit to mha1/edgetx that referenced this pull request Dec 22, 2022
@HThuren @mha1
chore(translation): Update Companion and Radio Danish Translations 🇩🇰 (…
6ae7a0b 
…EdgeTX#2738)

* Changes after using QtLinguist

* added _DA
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
translation
Projects
None yet
Milestone
2.8.1
Development

Successfully merging this pull request may close these issues.
2 participants
@HThuren @pfeerick