Skip to content

chore: Reset Session, not "Flight" #6897

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

Open
pfeerick wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: Reset Session, not "Flight" #6897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99b095
chore(cpn): update translations
pfeerick Sep 1, 2025
2430d57
chore: Flight (in context of Reset) should be Session
pfeerick Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion companion/src/firmwares/customfunctiondata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ QString CustomFunctionData::resetToString(const int value, const ModelData * mod
}

if (value < ++step)
return tr("Flight");
return tr("Session");

if (value < ++step)
return tr("Telemetry");
Expand Down
298 changes: 149 additions & 149 deletions companion/src/translations/companion_cs.ts
View file
Open in desktop

Large diffs are not rendered by default.

304 changes: 152 additions & 152 deletions companion/src/translations/companion_da.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_de.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_en.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_es.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_fi.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_fr.ts
View file
Open in desktop

Large diffs are not rendered by default.

290 changes: 145 additions & 145 deletions companion/src/translations/companion_he.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_it.ts
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions companion/src/translations/companion_ja.ts
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions companion/src/translations/companion_ko.ts
View file
Open in desktop

Large diffs are not rendered by default.

290 changes: 145 additions & 145 deletions companion/src/translations/companion_nl.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_pl.ts
View file
Open in desktop

Large diffs are not rendered by default.

290 changes: 145 additions & 145 deletions companion/src/translations/companion_pt.ts
View file
Open in desktop

Large diffs are not rendered by default.

316 changes: 158 additions & 158 deletions companion/src/translations/companion_ru.ts
View file
Open in desktop

Large diffs are not rendered by default.

298 changes: 149 additions & 149 deletions companion/src/translations/companion_sv.ts
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions companion/src/translations/companion_zh_CN.ts
View file
Open in desktop

Large diffs are not rendered by default.

304 changes: 152 additions & 152 deletions companion/src/translations/companion_zh_TW.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions radio/src/gui/128x64/view_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ void onMainViewMenu(const char * result)
pushModelNotes();
}
else if (result == STR_RESET_SUBMENU) {
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_FLIGHT, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_SESSION, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
}
else if (result == STR_RESET_TELEMETRY) {
telemetryReset();
}
else if (result == STR_RESET_FLIGHT) {
else if (result == STR_RESET_SESSION) {
flightReset();
}
else if (result == STR_STATISTICS) {
Expand Down
4 changes: 2 additions & 2 deletions radio/src/gui/212x64/view_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,12 @@ void onMainViewMenu(const char * result)
pushModelNotes();
}
else if (result == STR_RESET_SUBMENU) {
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_FLIGHT, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_SESSION, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
}
else if (result == STR_RESET_TELEMETRY) {
telemetryReset();
}
else if (result == STR_RESET_FLIGHT) {
else if (result == STR_RESET_SESSION) {
flightReset();
}
else if (result == STR_STATISTICS) {
Expand Down
4 changes: 2 additions & 2 deletions radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ QMTopDef qmTopItems[] = {
[]() {
QuickMenu::selected();
Menu* resetMenu = new Menu();
resetMenu->addLine(STR_RESET_FLIGHT, []() { flightReset(); });
resetMenu->addLine(STR_RESET_SESSION, []() { flightReset(); });
resetMenu->addLine(STR_RESET_TIMER1, []() { timerReset(0); });
resetMenu->addLine(STR_RESET_TIMER2, []() { timerReset(1); });
resetMenu->addLine(STR_RESET_TIMER3, []() { timerReset(2); });
Expand Down Expand Up @@ -239,7 +239,7 @@ PageDef toolsMenuItems[] = {
[]() {
QuickMenu::selected();
Menu* resetMenu = new Menu();
resetMenu->addLine(STR_RESET_FLIGHT, []() { flightReset(); });
resetMenu->addLine(STR_RESET_SESSION, []() { flightReset(); });
resetMenu->addLine(STR_RESET_TIMER1, []() { timerReset(0); });
resetMenu->addLine(STR_RESET_TIMER2, []() { timerReset(1); });
resetMenu->addLine(STR_RESET_TIMER3, []() { timerReset(2); });
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/common/stdlcd/view_telemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void menuViewTelemetry(event_t event)
incrTelemetryScreen();
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
POPUP_MENU_START(onMainViewMenu, 2, STR_RESET_TELEMETRY, STR_RESET_FLIGHT);
POPUP_MENU_START(onMainViewMenu, 2, STR_RESET_TELEMETRY, STR_RESET_SESSION);
}

for (int i=0; i<=TELEMETRY_SCREEN_TYPE_MAX; i++) {
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/cn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@
#define TR_PASTE_BEFORE "粘贴到本条之前"
#define TR_DELETE "删除"
#define TR_INSERT "插入"
#define TR_RESET_FLIGHT "复位飞行数据"
#define TR_RESET_SESSION "复位飞行数据"
#define TR_RESET_TIMER1 "复位计时器1"
#define TR_RESET_TIMER2 "复位计时器2"
#define TR_RESET_TIMER3 "复位计时器3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@
#define TR_PASTE_BEFORE "Vložit před"
#define TR_DELETE "Odstranit"
#define TR_INSERT "Přidat"
#define TR_RESET_FLIGHT "Reset relace"
#define TR_RESET_SESSION "Reset relace"
#define TR_RESET_TIMER1 "Čas1"
#define TR_RESET_TIMER2 "Čas2"
#define TR_RESET_TIMER3 "Čas3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@
#define TR_PASTE_BEFORE "Sæt ind før"
#define TR_DELETE "Slet"
#define TR_INSERT "Indsæt"
#define TR_RESET_FLIGHT "Nulstil flyvning"
#define TR_RESET_SESSION "Nulstil flyvning"
#define TR_RESET_TIMER1 "Nulstil tidtag 1"
#define TR_RESET_TIMER2 "Nulstil tidtag 2"
#define TR_RESET_TIMER3 "Nulstil tidtag 3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
#define TR_PASTE_BEFORE "Einfügen davor"
#define TR_DELETE "Zeile löschen"
#define TR_INSERT "Neue Zeile"
#define TR_RESET_FLIGHT "Reset Flugdaten"
#define TR_RESET_SESSION "Reset Flugdaten"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@
#define TR_PASTE_BEFORE "Paste before"
#define TR_DELETE "Delete"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "Reset session"
#define TR_RESET_SESSION "Reset session"
#define TR_RESET_TIMER1 "Reset timer1"
#define TR_RESET_TIMER2 "Reset timer2"
#define TR_RESET_TIMER3 "Reset timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Borrar"
#define TR_INSERT "Insertar"
#define TR_RESET_FLIGHT "Reset Vuelo"
#define TR_RESET_SESSION "Reset Vuelo"
#define TR_RESET_TIMER1 "Reset Reloj 1"
#define TR_RESET_TIMER2 "Reset Reloj 2"
#define TR_RESET_TIMER3 "Reset Reloj 3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/fi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Delete"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "Reset Flight"
#define TR_RESET_SESSION "Reset Flight"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@
#define TR_PASTE_BEFORE "Coller Avant"
#define TR_DELETE "Supprimer"
#define TR_INSERT "Insérer"
#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinit. vol")
#define TR_RESET_SESSION TR("Réinit. vol", "Réinit. vol")
#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinit. Chrono1")
#define TR_RESET_TIMER2 TR("Réinit. Timer2", "Réinit. Chrono2")
#define TR_RESET_TIMER3 TR("Réinit. Timer3", "Réinit. Chrono3")
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/he.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@
#define TR_PASTE_BEFORE "הדבק לפני"
#define TR_DELETE "מחק"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "איפוס טיסה"
#define TR_RESET_SESSION "איפוס טיסה"
#define TR_RESET_TIMER1 "איפוס שעון 1 "
#define TR_RESET_TIMER2 "איפוס שעון 2"
#define TR_RESET_TIMER3 "איפוס שעון 3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@
#define TR_PASTE_BEFORE "Incolla Prima"
#define TR_DELETE "Elimina"
#define TR_INSERT TR("Inser.","Inserisci")
#define TR_RESET_FLIGHT "Azzera volo"
#define TR_RESET_SESSION "Azzera volo"
#define TR_RESET_TIMER1 "Azzera Timer1"
#define TR_RESET_TIMER2 "Azzera Timer2"
#define TR_RESET_TIMER3 "Azzera Timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/jp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@
#define TR_PASTE_BEFORE "前に貼り付け"
#define TR_DELETE "削除"
#define TR_INSERT "挿入"
#define TR_RESET_FLIGHT "飛行記録リセット"
#define TR_RESET_SESSION "飛行記録リセット"
#define TR_RESET_TIMER1 "タイマー1 リセット"
#define TR_RESET_TIMER2 "タイマー2 リセット"
#define TR_RESET_TIMER3 "タイマー3 リセット"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/ko.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@
#define TR_PASTE_BEFORE "앞에 붙여넣기"
#define TR_DELETE "삭제"
#define TR_INSERT "삽입"
#define TR_RESET_FLIGHT "세션 초기화"
#define TR_RESET_SESSION "세션 초기화"
#define TR_RESET_TIMER1 "타이머1 초기화"
#define TR_RESET_TIMER2 "타이머2 초기화"
#define TR_RESET_TIMER3 "타이머3 초기화"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/nl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Verwijderen"
#define TR_INSERT "Invoegen"
#define TR_RESET_FLIGHT "Reset Vliegdata"
#define TR_RESET_SESSION "Reset Vliegdata"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/pl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@
#define TR_PASTE_BEFORE "Wklej przed"
#define TR_DELETE "Kasuj"
#define TR_INSERT "Wstaw"
#define TR_RESET_FLIGHT "Resetuj sesję"
#define TR_RESET_SESSION "Resetuj sesję"
#define TR_RESET_TIMER1 "Zeruj Timer1"
#define TR_RESET_TIMER2 "Zeruj Timer2"
#define TR_RESET_TIMER3 "Zeruj Timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/pt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@
#define TR_PASTE_BEFORE "Colar depois"
#define TR_DELETE "Apagar"
#define TR_INSERT "Inserir"
#define TR_RESET_FLIGHT "Reinic. sessão"
#define TR_RESET_SESSION "Reinic. sessão"
#define TR_RESET_TIMER1 "Reset timer1"
#define TR_RESET_TIMER2 "Reset timer2"
#define TR_RESET_TIMER3 "Reset timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@
#define TR_PASTE_BEFORE "Вставить перед"
#define TR_DELETE "Удалить"
#define TR_INSERT "Вставить"
#define TR_RESET_FLIGHT "Сброс сесии"
#define TR_RESET_SESSION "Сброс сесии"
#define TR_RESET_TIMER1 "Сбросить таймер1"
#define TR_RESET_TIMER2 "Сбросить таймер2"
#define TR_RESET_TIMER3 "Сбросить таймер3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/se.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@
#define TR_PASTE_BEFORE "Klistra in före"
#define TR_DELETE "Radera"
#define TR_INSERT "Addera"
#define TR_RESET_FLIGHT "Återställ session"
#define TR_RESET_SESSION "Återställ session"
#define TR_RESET_TIMER1 "Återställ timer1"
#define TR_RESET_TIMER2 "Återställ timer2"
#define TR_RESET_TIMER3 "Återställ timer3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/tw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@
#define TR_PASTE_BEFORE "貼上到本條之前"
#define TR_DELETE "刪除"
#define TR_INSERT "插入"
#define TR_RESET_FLIGHT "復位飛行數據"
#define TR_RESET_SESSION "復位飛行數據"
#define TR_RESET_TIMER1 "重啟計時器1"
#define TR_RESET_TIMER2 "重啟計時器2"
#define TR_RESET_TIMER3 "重啟計時器3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/i18n/ua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@
#define TR_PASTE_BEFORE "Вставити до"
#define TR_DELETE "Видалити"
#define TR_INSERT "Вставити"
#define TR_RESET_FLIGHT "Скинути сесію"
#define TR_RESET_SESSION "Скинути сесію"
#define TR_RESET_TIMER1 "Скинути таймер1"
#define TR_RESET_TIMER2 "Скинути таймер2"
#define TR_RESET_TIMER3 "Скинути таймер3"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/sim_string_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@
#define STR_REPEAT_AT_ZERO currentLangStrings->STR_REPEAT_AT_ZERO
#define STR_REPEAT currentLangStrings->STR_REPEAT
#define STR_RESET_BTN currentLangStrings->STR_RESET_BTN
#define STR_RESET_FLIGHT currentLangStrings->STR_RESET_FLIGHT
#define STR_RESET_SESSION currentLangStrings->STR_RESET_SESSION
#define STR_RESET_SUBMENU currentLangStrings->STR_RESET_SUBMENU
#define STR_RESET_TELEMETRY currentLangStrings->STR_RESET_TELEMETRY
#define STR_RESET_TIMER1 currentLangStrings->STR_RESET_TIMER1
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/string_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ STR(RENAME_FILE)
STR(REPEAT_AT_ZERO)
STR(REPEAT)
STR(RESET_BTN)
STR(RESET_FLIGHT)
STR(RESET_SESSION)
STR(RESET_SUBMENU)
STR(RESET_TELEMETRY)
STR(RESET_TIMER1)
Expand Down