diff --git a/lib/I18n/translations/english.yaml b/lib/I18n/translations/english.yaml index 9ca0b16f..e4d318be 100644 --- a/lib/I18n/translations/english.yaml +++ b/lib/I18n/translations/english.yaml @@ -567,8 +567,8 @@ STR_BTN_BACK: "Back Button" STR_BTN_CONFIRM: "Confirm Button" STR_BTN_LEFT: "Left Button" STR_BTN_RIGHT: "Right Button" -STR_BTN_PAGE_BACK: "Page Back Button" -STR_BTN_PAGE_FORWARD: "Page Forward Button" +STR_BTN_UP: "Up Button" +STR_BTN_DOWN: "Down Button" STR_BTN_POWER: "Power Button" STR_BTN_ACT_DEFAULT: "Default" STR_BTN_DEF_IGNORE: "Ignore" diff --git a/lib/I18n/translations/french.yaml b/lib/I18n/translations/french.yaml index 35a2851f..529ec7d1 100644 --- a/lib/I18n/translations/french.yaml +++ b/lib/I18n/translations/french.yaml @@ -570,8 +570,8 @@ STR_BTN_BACK: "Bouton Retour" STR_BTN_CONFIRM: "Bouton Confirmer" STR_BTN_LEFT: "Bouton Gauche" STR_BTN_RIGHT: "Bouton Droit" -STR_BTN_PAGE_BACK: "Bouton Page précédente" -STR_BTN_PAGE_FORWARD: "Bouton Page suivante" +STR_BTN_UP: "Bouton Haut" +STR_BTN_DOWN: "Bouton Bas" STR_BTN_POWER: "Bouton d'alimentation" STR_BTN_ACT_DEFAULT: "Par défaut" STR_BTN_DEF_IGNORE: "Ignorer" diff --git a/lib/I18n/translations/german.yaml b/lib/I18n/translations/german.yaml index 75c93bd5..a2bfaae8 100644 --- a/lib/I18n/translations/german.yaml +++ b/lib/I18n/translations/german.yaml @@ -574,8 +574,8 @@ STR_BTN_BACK: "Zurück-Taste" STR_BTN_CONFIRM: "Bestätigen-Taste" STR_BTN_LEFT: "Linke Taste" STR_BTN_RIGHT: "Rechte Taste" -STR_BTN_PAGE_BACK: "Seite-zurück-Taste" -STR_BTN_PAGE_FORWARD: "Seite-vorwärts-Taste" +STR_BTN_UP: "Nach-oben-Taste" +STR_BTN_DOWN: "Nach-unten-Taste" STR_BTN_POWER: "Ein/Aus-Taste" STR_BTN_ACT_DEFAULT: "Standard" STR_BTN_DEF_IGNORE: "Ignorieren" diff --git a/lib/I18n/translations/italian.yaml b/lib/I18n/translations/italian.yaml index 5b8e5910..68acc480 100644 --- a/lib/I18n/translations/italian.yaml +++ b/lib/I18n/translations/italian.yaml @@ -571,8 +571,8 @@ STR_BTN_BACK: "Pulsante Indietro" STR_BTN_CONFIRM: "Pulsante Conferma" STR_BTN_LEFT: "Pulsante Sinistro" STR_BTN_RIGHT: "Pulsante Destro" -STR_BTN_PAGE_BACK: "Pulsante Pagina indietro" -STR_BTN_PAGE_FORWARD: "Pulsante Pagina avanti" +STR_BTN_UP: "Pulsante Pagina indietro" +STR_BTN_DOWN: "Pulsante Pagina avanti" STR_BTN_POWER: "Pulsante di accensione" STR_BTN_ACT_DEFAULT: "Predefinito" STR_BTN_DEF_IGNORE: "Ignora" diff --git a/lib/I18n/translations/polish.yaml b/lib/I18n/translations/polish.yaml index 8870b541..2858c14f 100644 --- a/lib/I18n/translations/polish.yaml +++ b/lib/I18n/translations/polish.yaml @@ -568,8 +568,8 @@ STR_BTN_BACK: "Przycisk Wstecz" STR_BTN_CONFIRM: "Przycisk Potwierdź" STR_BTN_LEFT: "Przycisk Lewo" STR_BTN_RIGHT: "Przycisk Prawo" -STR_BTN_PAGE_BACK: "Przycisk Strona wstecz" -STR_BTN_PAGE_FORWARD: "Przycisk Strona naprzód" +STR_BTN_UP: "Przycisk Strona wstecz" +STR_BTN_DOWN: "Przycisk Strona naprzód" STR_BTN_POWER: "Przycisk zasilania" STR_BTN_ACT_DEFAULT: "Domyślny" STR_BTN_DEF_IGNORE: "Ignoruj" diff --git a/lib/I18n/translations/portuguese_br.yaml b/lib/I18n/translations/portuguese_br.yaml index bdfc8757..b2e50398 100644 --- a/lib/I18n/translations/portuguese_br.yaml +++ b/lib/I18n/translations/portuguese_br.yaml @@ -569,8 +569,8 @@ STR_BTN_BACK: "Botão Voltar" STR_BTN_CONFIRM: "Botão Confirmar" STR_BTN_LEFT: "Botão Esquerdo" STR_BTN_RIGHT: "Botão Direito" -STR_BTN_PAGE_BACK: "Botão Página anterior" -STR_BTN_PAGE_FORWARD: "Botão Página seguinte" +STR_BTN_UP: "Botão Página anterior" +STR_BTN_DOWN: "Botão Página seguinte" STR_BTN_POWER: "Botão de energia" STR_BTN_ACT_DEFAULT: "Padrão" STR_BTN_DEF_IGNORE: "Ignorar" diff --git a/lib/I18n/translations/portuguese_pt.yaml b/lib/I18n/translations/portuguese_pt.yaml index db0b0ba0..da1e123a 100644 --- a/lib/I18n/translations/portuguese_pt.yaml +++ b/lib/I18n/translations/portuguese_pt.yaml @@ -568,8 +568,8 @@ STR_BTN_BACK: "Botão Voltar" STR_BTN_CONFIRM: "Botão Confirmar" STR_BTN_LEFT: "Botão Esquerdo" STR_BTN_RIGHT: "Botão Direito" -STR_BTN_PAGE_BACK: "Botão Página atrás" -STR_BTN_PAGE_FORWARD: "Botão Página à frente" +STR_BTN_UP: "Botão Página atrás" +STR_BTN_DOWN: "Botão Página à frente" STR_BTN_POWER: "Botão de energia" STR_BTN_ACT_DEFAULT: "Predefinido" STR_BTN_DEF_IGNORE: "Ignorar" diff --git a/lib/I18n/translations/russian.yaml b/lib/I18n/translations/russian.yaml index 5a36b142..9dfa6476 100644 --- a/lib/I18n/translations/russian.yaml +++ b/lib/I18n/translations/russian.yaml @@ -570,8 +570,8 @@ STR_BTN_BACK: "Кнопка Назад" STR_BTN_CONFIRM: "Кнопка Подтвердить" STR_BTN_LEFT: "Кнопка Влево" STR_BTN_RIGHT: "Кнопка Вправо" -STR_BTN_PAGE_BACK: "Кнопка Страница назад" -STR_BTN_PAGE_FORWARD: "Кнопка Страница вперед" +STR_BTN_UP: "Кнопка Страница назад" +STR_BTN_DOWN: "Кнопка Страница вперед" STR_BTN_POWER: "Кнопка питания" STR_BTN_ACT_DEFAULT: "По умолчанию" STR_BTN_DEF_IGNORE: "Игнорировать" diff --git a/lib/I18n/translations/slovenian.yaml b/lib/I18n/translations/slovenian.yaml index 6833d4bc..f8f9a3db 100644 --- a/lib/I18n/translations/slovenian.yaml +++ b/lib/I18n/translations/slovenian.yaml @@ -553,8 +553,8 @@ STR_BTN_BACK: "Gumb Nazaj" STR_BTN_CONFIRM: "Gumb Potrdi" STR_BTN_LEFT: "Gumb Levo" STR_BTN_RIGHT: "Gumb Desno" -STR_BTN_PAGE_BACK: "Gumb stran Nazaj" -STR_BTN_PAGE_FORWARD: "Gumb stran Naprej" +STR_BTN_UP: "Gumb stran Nazaj" +STR_BTN_DOWN: "Gumb stran Naprej" STR_BTN_POWER: "Gumb za vklop" STR_BTN_ACT_DEFAULT: "Privzeto" STR_BTN_DEF_IGNORE: "prezri" diff --git a/lib/I18n/translations/spanish.yaml b/lib/I18n/translations/spanish.yaml index b477b532..0c776af0 100644 --- a/lib/I18n/translations/spanish.yaml +++ b/lib/I18n/translations/spanish.yaml @@ -570,8 +570,8 @@ STR_BTN_BACK: "Botón Atrás" STR_BTN_CONFIRM: "Botón Confirmar" STR_BTN_LEFT: "Botón Izquierda" STR_BTN_RIGHT: "Botón Derecha" -STR_BTN_PAGE_BACK: "Botón Página atrás" -STR_BTN_PAGE_FORWARD: "Botón Página adelante" +STR_BTN_UP: "Botón Página atrás" +STR_BTN_DOWN: "Botón Página adelante" STR_BTN_POWER: "Botón de encendido" STR_BTN_ACT_DEFAULT: "Predeterminado" STR_BTN_DEF_IGNORE: "Ignorar" diff --git a/src/SettingsList.h b/src/SettingsList.h index 903fcda0..2157048b 100644 --- a/src/SettingsList.h +++ b/src/SettingsList.h @@ -193,24 +193,24 @@ inline const std::vector list = { // Page Back button: short=previous page, double=ignore, long=chapter back SettingInfo::Enum(StrId::STR_BTN_SHORT_PRESS, &CrossPointSettings::btnShortPageBack, {StrId::STR_BTN_DEF_PREV_PAGE, BTN_ACT_OPTIONS}, "btnShortPageBack", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_BACK), + .withSubmenu(StrId::STR_BTN_UP), SettingInfo::Enum(StrId::STR_BTN_DOUBLE_PRESS, &CrossPointSettings::btnDoublePageBack, {StrId::STR_BTN_DEF_IGNORE, BTN_ACT_OPTIONS}, "btnDoublePageBack", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_BACK), + .withSubmenu(StrId::STR_BTN_UP), SettingInfo::Enum(StrId::STR_BTN_LONG_PRESS, &CrossPointSettings::btnLongPageBack, {StrId::STR_BTN_DEF_CHAPTER_BACK, BTN_ACT_OPTIONS}, "btnLongPageBack", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_BACK), + .withSubmenu(StrId::STR_BTN_UP), // Page Forward button: short=next page, double=ignore, long=chapter forward SettingInfo::Enum(StrId::STR_BTN_SHORT_PRESS, &CrossPointSettings::btnShortPageForward, {StrId::STR_BTN_DEF_NEXT_PAGE, BTN_ACT_OPTIONS}, "btnShortPageForward", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_FORWARD), + .withSubmenu(StrId::STR_BTN_DOWN), SettingInfo::Enum(StrId::STR_BTN_DOUBLE_PRESS, &CrossPointSettings::btnDoublePageForward, {StrId::STR_BTN_DEF_IGNORE, BTN_ACT_OPTIONS}, "btnDoublePageForward", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_FORWARD), + .withSubmenu(StrId::STR_BTN_DOWN), SettingInfo::Enum(StrId::STR_BTN_LONG_PRESS, &CrossPointSettings::btnLongPageForward, {StrId::STR_BTN_DEF_CHAPTER_FORWARD, BTN_ACT_OPTIONS}, "btnLongPageForward", StrId::STR_CAT_CONTROLS) - .withSubmenu(StrId::STR_BTN_PAGE_FORWARD), + .withSubmenu(StrId::STR_BTN_DOWN), // Power button: short=ignore, double=ignore, long=sleep (via hold timer, not event system) SettingInfo::Enum(StrId::STR_BTN_SHORT_PRESS, &CrossPointSettings::btnShortPower, {StrId::STR_BTN_DEF_IGNORE, BTN_ACT_OPTIONS}, "btnShortPower", StrId::STR_CAT_CONTROLS) diff --git a/src/activities/settings/ButtonActionsOverviewActivity.cpp b/src/activities/settings/ButtonActionsOverviewActivity.cpp index ca016e91..9f0967c0 100644 --- a/src/activities/settings/ButtonActionsOverviewActivity.cpp +++ b/src/activities/settings/ButtonActionsOverviewActivity.cpp @@ -24,8 +24,8 @@ constexpr std::array kButtonRows = {{ {StrId::STR_BTN_BACK, StrId::STR_BTN_BACK}, {StrId::STR_BTN_LEFT, StrId::STR_BTN_LEFT}, {StrId::STR_BTN_RIGHT, StrId::STR_BTN_RIGHT}, - {StrId::STR_BTN_PAGE_BACK, StrId::STR_BTN_PAGE_BACK}, - {StrId::STR_BTN_PAGE_FORWARD, StrId::STR_BTN_PAGE_FORWARD}, + {StrId::STR_BTN_UP, StrId::STR_BTN_UP}, + {StrId::STR_BTN_DOWN, StrId::STR_BTN_DOWN}, {StrId::STR_BTN_CONFIRM, StrId::STR_BTN_CONFIRM}, }};