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

Translated theme text #3664

Merged
merged 9 commits into from
Jun 17, 2023
Merged

Conversation

ulfhedlund
Copy link
Contributor

Adds translation for theme edit texts.
Thank you @philmoz for helping out.

I can ping the translators once this is reviewed.

@pfeerick pfeerick self-assigned this Jun 8, 2023
@pfeerick
Copy link
Member

pfeerick commented Jun 8, 2023

No complaints of any consequence, translate away! And thanks :)

@ulfhedlund
Copy link
Contributor Author

Hello translators, here is another PR that needs your input, this time for theme edit texts.
@ParkerEde DE
@Eldenroot CZ
@robustini IT
@zyren CN / TW
@ajjjjjjjj PL
@ToshihiroMakuuchi JP
@HThuren DA
@Pat6874 FR

Please provide your translations for the following:
#define TR_THEME_COLOR_DEFAULT "DEFAULT"
#define TR_THEME_COLOR_PRIMARY1 "PRIMARY1"
#define TR_THEME_COLOR_PRIMARY2 "PRIMARY2"
#define TR_THEME_COLOR_PRIMARY3 "PRIMARY3"
#define TR_THEME_COLOR_SECONDARY1 "SECONDARY1"
#define TR_THEME_COLOR_SECONDARY2 "SECONDARY2"
#define TR_THEME_COLOR_SECONDARY3 "SECONDARY3"
#define TR_THEME_COLOR_FOCUS "FOCUS"
#define TR_THEME_COLOR_EDIT "EDIT"
#define TR_THEME_COLOR_ACTIVE "ACTIVE"
#define TR_THEME_COLOR_WARNING "WARNING"
#define TR_THEME_COLOR_DISABLED "DISABLED"
#define TR_THEME_COLOR_CUSTOM "CUSTOM"
#define TR_THEME_CHECKBOX "Checkbox"
#define TR_THEME_ACTIVE "Active"
#define TR_THEME_REGULAR "Regular"
#define TR_THEME_WARNING "Warning"
#define TR_THEME_DISABLED "Disabled"
#define TR_THEME_EDIT "Edit"
#define TR_THEME_FOCUS "Focus"

@Pat6874
Copy link
Contributor

Pat6874 commented Jun 9, 2023 via email

@HThuren
Copy link
Contributor

HThuren commented Jun 9, 2023

DA:

#define TR_THEME_COLOR_DEFAULT "STANDARD"
#define TR_THEME_COLOR_PRIMARY1 "PRIMÆR 1"
#define TR_THEME_COLOR_PRIMARY2 "PRIMÆR 2"
#define TR_THEME_COLOR_PRIMARY3 "PRIMÆR 3"
#define TR_THEME_COLOR_SECONDARY1 "SEKUNDÆR 1"
#define TR_THEME_COLOR_SECONDARY2 "SEKUNDÆR 2"
#define TR_THEME_COLOR_SECONDARY3 "SEKUNDÆR 3"
#define TR_THEME_COLOR_FOCUS "FOKUS"
#define TR_THEME_COLOR_EDIT "REDIGER"
#define TR_THEME_COLOR_ACTIVE "AKTIV"
#define TR_THEME_COLOR_WARNING "ADVARSEL"
#define TR_THEME_COLOR_DISABLED "DEAKTIV"
#define TR_THEME_COLOR_CUSTOM "BRUGER STYRET"
#define TR_THEME_CHECKBOX "Checkbox"
#define TR_THEME_ACTIVE "Aktiv"
#define TR_THEME_REGULAR "Almindelig"
#define TR_THEME_WARNING "Advarsel"
#define TR_THEME_DISABLED "Deaktiv"
#define TR_THEME_EDIT "Rediger"
#define TR_THEME_FOCUS "Fokus"

@ToshihiroMakuuchi
Copy link
Contributor

JP:

#define TR_THEME_COLOR_DEFAULT "デフォルト"
#define TR_THEME_COLOR_PRIMARY1 "プライマリ 1"
#define TR_THEME_COLOR_PRIMARY2 "プライマリ 2"
#define TR_THEME_COLOR_PRIMARY3 "プライマリ 3"
#define TR_THEME_COLOR_SECONDARY1 "セカンダリ 1"
#define TR_THEME_COLOR_SECONDARY2 "セカンダリ 2"
#define TR_THEME_COLOR_SECONDARY3 "セカンダリ 3"
#define TR_THEME_COLOR_FOCUS "フォーカス"
#define TR_THEME_COLOR_EDIT "編集"
#define TR_THEME_COLOR_ACTIVE "有効"
#define TR_THEME_COLOR_WARNING "警告"
#define TR_THEME_COLOR_DISABLED "無効"
#define TR_THEME_COLOR_CUSTOM "カスタム"
#define TR_THEME_CHECKBOX "チェック"
#define TR_THEME_ACTIVE "有効"
#define TR_THEME_REGULAR "通常"
#define TR_THEME_WARNING "警告"
#define TR_THEME_DISABLED "無効"
#define TR_THEME_EDIT "編集"
#define TR_THEME_FOCUS "フォーカス"

@robustini
Copy link
Contributor

robustini commented Jun 11, 2023

IT

#define TR_THEME_COLOR_DEFAULT "PREDEFINITO"
#define TR_THEME_COLOR_PRIMARY1 "PRIMARIO1"
#define TR_THEME_COLOR_PRIMARY2 "PRIMARIO2"
#define TR_THEME_COLOR_PRIMARY3 "PRIMARIO3"
#define TR_THEME_COLOR_SECONDARY1 "SECONDARIO1"
#define TR_THEME_COLOR_SECONDARY2 "SECONDARIO2"
#define TR_THEME_COLOR_SECONDARY3 "SECONDARIO3"
#define TR_THEME_COLOR_FOCUS "FUOCO"
#define TR_THEME_COLOR_EDIT "MODIFICA"
#define TR_THEME_COLOR_ACTIVE "ATTIVO"
#define TR_THEME_COLOR_WARNING "ATTENZIONE"
#define TR_THEME_COLOR_DISABLED "DISABILITATO"
#define TR_THEME_COLOR_CUSTOM "PERSONALE"
#define TR_THEME_CHECKBOX "Casella di spunta"
#define TR_THEME_ACTIVE "Attivo"
#define TR_THEME_REGULAR "Regolare"
#define TR_THEME_WARNING "Attenzione"
#define TR_THEME_DISABLED "Disabilitato"
#define TR_THEME_EDIT "Modifica"
#define TR_THEME_FOCUS "Fuoco"

@Eldenroot
Copy link
Contributor

Eldenroot commented Jun 11, 2023

CZ

#define TR_THEME_COLOR_DEFAULT "DEFAULTNÍ"
#define TR_THEME_COLOR_PRIMARY1 "PRIMÁRNÍ1"
#define TR_THEME_COLOR_PRIMARY2 "PRIMÁRNÍ2"
#define TR_THEME_COLOR_PRIMARY3 "PRIMÁRNÍ3"
#define TR_THEME_COLOR_SECONDARY1 "SEKUNDÁRNÍ1"
#define TR_THEME_COLOR_SECONDARY2 "SEKUNDÁRNÍ2"
#define TR_THEME_COLOR_SECONDARY3 "SEKUNDÁRNÍ3"
#define TR_THEME_COLOR_FOCUS "VYBRANÉ"
#define TR_THEME_COLOR_EDIT "UPRAVIT"
#define TR_THEME_COLOR_ACTIVE "AKTIVNÍ"
#define TR_THEME_COLOR_WARNING "VAROVÁNÍ"
#define TR_THEME_COLOR_DISABLED "VYPNUTÉ"
#define TR_THEME_COLOR_CUSTOM "VLASTNÍ"
#define TR_THEME_CHECKBOX "Pole výběru"
#define TR_THEME_ACTIVE "Aktivní"
#define TR_THEME_REGULAR "Normální"
#define TR_THEME_WARNING "Varování"
#define TR_THEME_DISABLED "Vypnuté"
#define TR_THEME_EDIT "Upravit"
#define TR_THEME_FOCUS "Vybrané"

@ajjjjjjjj
Copy link
Contributor

PL

#define TR_THEME_COLOR_DEFAULT "DOMYŚLNY"
#define TR_THEME_COLOR_PRIMARY1 "GŁÓWNY1"
#define TR_THEME_COLOR_PRIMARY2 "GŁÓWNY2"
#define TR_THEME_COLOR_PRIMARY3 "GŁÓWNY3"
#define TR_THEME_COLOR_SECONDARY1 "POBOCZNY1"
#define TR_THEME_COLOR_SECONDARY2 "POBOCZNY2"
#define TR_THEME_COLOR_SECONDARY3 "POBOCZNY3"
#define TR_THEME_COLOR_FOCUS "WYBRANY"
#define TR_THEME_COLOR_EDIT "ZMIEŃ"
#define TR_THEME_COLOR_ACTIVE "AKTYWNY"
#define TR_THEME_COLOR_WARNING "OSTRZEŻENIE"
#define TR_THEME_COLOR_DISABLED "WYŁĄCZONY"
#define TR_THEME_COLOR_CUSTOM "WŁASNY"
#define TR_THEME_CHECKBOX "Pole wyboru"
#define TR_THEME_ACTIVE "Aktywny"
#define TR_THEME_REGULAR "Normalny"
#define TR_THEME_WARNING "Ostrzeżenie"
#define TR_THEME_DISABLED "Wyłączony"
#define TR_THEME_EDIT "Zmień"
#define TR_THEME_FOCUS "Wybrany"

@ParkerEde
Copy link
Contributor

ParkerEde commented Jun 12, 2023

DE
#define TR_THEME_COLOR_DEFAULT "Standard"
#define TR_THEME_COLOR_PRIMARY1 "Primär1"
#define TR_THEME_COLOR_PRIMARY2 "Primär2"
#define TR_THEME_COLOR_PRIMARY3 "Primär3"
#define TR_THEME_COLOR_SECONDARY1 "Sekundär1"
#define TR_THEME_COLOR_SECONDARY2 "Sekundär2"
#define TR_THEME_COLOR_SECONDARY3 "Sekundär3"
#define TR_THEME_COLOR_FOCUS "Fokus"
#define TR_THEME_COLOR_EDIT "Edit"
#define TR_THEME_COLOR_ACTIVE "Aktiv"
#define TR_THEME_COLOR_WARNING "Warnung"
#define TR_THEME_COLOR_DISABLED "Deaktiviert"
#define TR_THEME_COLOR_CUSTOM "Eigene"
#define TR_THEME_CHECKBOX "Schalter"
#define TR_THEME_ACTIVE "Aktiv"
#define TR_THEME_REGULAR "Regulär"
#define TR_THEME_WARNING "Warnung"
#define TR_THEME_DISABLED "Inaktiv"
#define TR_THEME_EDIT "Editieren"
#define TR_THEME_FOCUS "Fokus"

@ulfhedlund
Copy link
Contributor Author

@zyren: do you have any translations for CN/TW?

@pfeerick
Copy link
Member

@offer-shmuely Would you mind doing Hebrew also? #3664 (comment)

@offer-shmuely
Copy link
Contributor

#define TR_THEME_COLOR_DEFAULT "DEFAULT"
#define TR_THEME_COLOR_PRIMARY1 "ראשי 1"
#define TR_THEME_COLOR_PRIMARY2 "ראשי 2"
#define TR_THEME_COLOR_PRIMARY3 "ראשי 3"
#define TR_THEME_COLOR_SECONDARY1 "משני 1"
#define TR_THEME_COLOR_SECONDARY2 "משני 2"
#define TR_THEME_COLOR_SECONDARY3 "משני 3"
#define TR_THEME_COLOR_FOCUS "מיקוד"
#define TR_THEME_COLOR_EDIT "עריכה"
#define TR_THEME_COLOR_ACTIVE "פעיל"
#define TR_THEME_COLOR_WARNING "אזהרה"
#define TR_THEME_COLOR_DISABLED "לא פעיל"
#define TR_THEME_COLOR_CUSTOM "מתקדם"
#define TR_THEME_CHECKBOX "Checkbox"
#define TR_THEME_ACTIVE "פעיל"
#define TR_THEME_REGULAR "רגיל"
#define TR_THEME_WARNING "אזהרה"
#define TR_THEME_DISABLED "לא פעיל"
#define TR_THEME_EDIT "עריכה"
#define TR_THEME_FOCUS "מיקוד"

@offer-shmuely
Copy link
Contributor

@offer-shmuely Would you mind doing Hebrew also? #3664 (comment)

Sure, as long as it is not translating scripts...

@ulfhedlund
Copy link
Contributor Author

@pfeerick: there are now proper translations except for CN/TW.
I'll let you decide whether to wait some more or merge without them. And sorry about the conflicts.

@pfeerick
Copy link
Member

np about the conflicts, should be easy enough to figure out when it comes to merge. I'll give another day for CN/TW and then merge tomorrow sometime. What doesn't happen today can happen tomorrow... 🤭

@zyren
Copy link
Contributor

zyren commented Jun 16, 2023

CN

#define TR_THEME_COLOR_DEFAULT      "默认"
#define TR_THEME_COLOR_PRIMARY1     "主色1"
#define TR_THEME_COLOR_PRIMARY2     "主色2"
#define TR_THEME_COLOR_PRIMARY3     "主色3"
#define TR_THEME_COLOR_SECONDARY1   "副色1"
#define TR_THEME_COLOR_SECONDARY2   "副色2"
#define TR_THEME_COLOR_SECONDARY3   "副色3"
#define TR_THEME_COLOR_FOCUS        "焦点"
#define TR_THEME_COLOR_EDIT         "编辑"
#define TR_THEME_COLOR_ACTIVE       "激活"
#define TR_THEME_COLOR_WARNING      "警告"
#define TR_THEME_COLOR_DISABLED     "禁用"
#define TR_THEME_COLOR_CUSTOM       "自定义"
#define TR_THEME_CHECKBOX           "复选框"
#define TR_THEME_ACTIVE             "激活"
#define TR_THEME_REGULAR            "常规"
#define TR_THEME_WARNING            "警告"
#define TR_THEME_DISABLED           "禁用"
#define TR_THEME_EDIT               "编辑"
#define TR_THEME_FOCUS              "焦点"

TW

#define TR_THEME_COLOR_DEFAULT      "默認"
#define TR_THEME_COLOR_PRIMARY1     "主色1"
#define TR_THEME_COLOR_PRIMARY2     "主色2"
#define TR_THEME_COLOR_PRIMARY3     "主色3"
#define TR_THEME_COLOR_SECONDARY1   "副色1"
#define TR_THEME_COLOR_SECONDARY2   "副色2"
#define TR_THEME_COLOR_SECONDARY3   "副色3"
#define TR_THEME_COLOR_FOCUS        "焦點"
#define TR_THEME_COLOR_EDIT         "編輯"
#define TR_THEME_COLOR_ACTIVE       "激活"
#define TR_THEME_COLOR_WARNING      "警告"
#define TR_THEME_COLOR_DISABLED     "禁用"
#define TR_THEME_COLOR_CUSTOM       "自定義"
#define TR_THEME_CHECKBOX           "復選框"
#define TR_THEME_ACTIVE             "激活"
#define TR_THEME_REGULAR            "常規"
#define TR_THEME_WARNING            "警告"
#define TR_THEME_DISABLED           "禁用"
#define TR_THEME_EDIT               "編輯"
#define TR_THEME_FOCUS              "焦點"

@zyren
Copy link
Contributor

zyren commented Jun 16, 2023

@ulfhedlund
@pfeerick
I'm very sorry. I've been so busy the last few days that I just saw the notice.

@ulfhedlund
Copy link
Contributor Author

ulfhedlund commented Jun 16, 2023

No worries @zyren. Thank you.

@ulfhedlund
Copy link
Contributor Author

@pfeerick: All translators have now contributed, so ready to merge when you so decide.

@pfeerick
Copy link
Member

@ulfhedlund @pfeerick I'm very sorry. I've been so busy the last few days that I just saw the notice.

No apologies are necessary, we all do what we can, when we can :) Thank you for getting this in before review for merge, one less translation to catch up on ;)

@pfeerick pfeerick added this to the 2.9 milestone Jun 17, 2023
@pfeerick pfeerick force-pushed the translated_theme_text branch from be2cbcd to 8dc5b4b Compare June 17, 2023 03:30
@pfeerick pfeerick merged commit c805940 into EdgeTX:main Jun 17, 2023
@pfeerick pfeerick added the color Related generally to color LCD radios label Jun 17, 2023
@ulfhedlund ulfhedlund deleted the translated_theme_text branch June 17, 2023 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
color Related generally to color LCD radios translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.