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

Added translation for left stick for color radios #2655

Merged
merged 8 commits into from
Nov 1, 2022
Merged

Added translation for left stick for color radios #2655

merged 8 commits into from
Nov 1, 2022

Conversation

ulfhedlund
Copy link
Contributor

@ulfhedlund ulfhedlund commented Oct 30, 2022 •
edited

Summary of changes:
Added translation for left stick (TR_LEFT_STICK), used in selection of stick mode for color radios.

NB! If the translation is more than five/six letters it might be too long to fit in the drop down menu for the NV14 radio.
In the SE translation file I've therefore added this, which makes it look OK but perhaps is a bit crude:
#if defined(PCBNV14)
#define TR_LEFT_STICK "Vä"
#else
#define TR_LEFT_STICK "Vänster"
#endif

@ulfhedlund
Copy link
Contributor Author

ulfhedlund commented Oct 30, 2022 •
edited

Hello translators!
I have added google translations for several languages but they obviously need to be reviewed. If provided with the proper translations for left (as in left stick, used for mode selection) I'll add them to the translation files.

TR_LEFT_STICK = ???

@ParkerEde / @TheIsotopes DE
@Eldenroot CZ
@zyren CN / TW
@HThuren DA
@robustini IT

@Eldenroot
Copy link
Contributor

Hi, you are right and you have already added the translation for the Czech pack :)

#define TR_LEFT_STICK "Vlevo"

@Eldenroot
Copy link
Contributor

Btw we do not need "RIGHT"? :)

@ulfhedlund
Copy link
Contributor Author

ulfhedlund commented Oct 30, 2022 via email •
edited by pfeerick

@HThuren
Copy link
Contributor

HThuren commented Oct 30, 2022

#if defined(PCBNV14)
#define TR_LEFT_STICK "Ven"
#else
#define TR_LEFT_STICK "Venstre"
#endif

@HThuren HThuren mentioned this pull request Oct 30, 2022
Merged
@zyren
Copy link
Contributor

zyren commented Oct 31, 2022

CN

#if defined(PCBNV14)
#define TR_LEFT_STICK "左摇杆"
#else
#define TR_LEFT_STICK "左摇杆"
#endif

TW

#if defined(PCBNV14)
#define TR_LEFT_STICK "左搖桿"
#else
#define TR_LEFT_STICK "左搖桿"
#endif

@TheIsotopes
Copy link
Contributor

Here DE translation

#if defined(PCBNV14)
#define TR_LEFT_STICK "Li"
#else
#define TR_LEFT_STICK "Links"
#endif

@robustini
Copy link
Contributor

#if defined(PCBNV14)
#define TR_LEFT_STICK "Sx"
#else
#define TR_LEFT_STICK "Sinistro"
#endif

@pfeerick pfeerick added this to the 2.8 milestone Oct 31, 2022
pfeerick
pfeerick requested changes Oct 31, 2022
View reviewed changes
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

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

Looking good, just some minor changes please ;)

radio/src/gui/colorlcd/radio_setup.cpp Outdated Show resolved Hide resolved
radio/src/translations/se.h Outdated Show resolved Hide resolved
@ulfhedlund
Copy link
Contributor Author

Hello again translators!
Please verify that I have added your translations correctly.

@ParkerEde / @TheIsotopes DE
@Eldenroot CZ
@zyren CN / TW
@HThuren DA
@robustini IT

@ulfhedlund
Copy link
Contributor Author

@pfeerick - I've now made the changes you suggested and added the translations provided. Lets see what the translators say but unless I've made some mistake this PR is ready for merge, at your discretion.

@ParkerEde
Copy link
Contributor

Hello again translators! Please verify that I have added your translations correctly.

@ParkerEde / @TheIsotopes DE @Eldenroot CZ @zyren CN / TW @HThuren DA @robustini IT

DE
okay

@Eldenroot
Copy link
Contributor

CZ :OK

@HThuren
Copy link
Contributor

HThuren commented Oct 31, 2022

DA: ok

HThuren added a commit to HThuren/edgetx that referenced this pull request Oct 31, 2022
@HThuren
Update da.h
5c2e718 
Added latest change in EdgeTX#2655
pfeerick
pfeerick approved these changes Oct 31, 2022
View reviewed changes
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

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

LGTM... I'll give it a little more time to allow for replies and merge nearer to nightly.

@pfeerick pfeerick merged commit bea7dad into EdgeTX:main Nov 1, 2022
@ulfhedlund ulfhedlund deleted the stickmode_translateable branch November 1, 2022 08:31
pfeerick pushed a commit that referenced this pull request Nov 2, 2022
@ulfhedlund @pfeerick
chore(color): Add translation for left stick (#2655)
89c225b 
* TR_LEFT_STICK added

* STR_LEFT_STICK added

* Added translation for stick mode

* TR_LEFT_STICK added

* Minor cleanup - removed one commented line of code

* Replaced radio specific define

* Added proper translations from translators

* chore: Whitespace cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pfeerick pfeerick pfeerick approved these changes

Assignees
No one assigned
Labels
translation
Projects
None yet
Milestone
2.8
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@ulfhedlund @Eldenroot @HThuren @zyren @TheIsotopes @robustini @ParkerEde @pfeerick