~aleteoryx/muditaos

dae736cd3ce17c15d8c45290f3e21071c8ae5a7f — Pawel Olejniczak 4 years ago 3bd8276
[EGD-7795] Unify options window title

Options window title in Meditation app was
incorrect. Now all options windows have
unified titles. Additionally few minor fixes
added.
M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +1 -4
@@ 16,6 16,7 @@
  "common_no": "Nein",
  "common_switch": "WECHSELN",
  "common_options": "OPTIONEN",
  "common_options_title": "Einstellungen",
  "common_information": "Informationen",
  "common_check": "AUSWÄHLEN",
  "common_uncheck": "AUSWAHL ENTFERNEN",


@@ 94,7 95,6 @@
  "app_alarm_clock_repeat_week_days": "Wochentags",
  "app_alarm_clock_repeat_custom": "Benutzerdefiniert",
  "app_alarm_clock_no_alarms_information": "<text align='center' color='9'>Noch kein Alarm.<p>Zum Hinzufügen <b>linken Pfeil</b> drücken.</p></text>",
  "app_alarm_clock_options_title": "Einstellungen",
  "app_alarm_clock_options_edit": "Ändern",
  "app_alarm_clock_options_delete": "Löschen",
  "app_alarm_clock_options_turn_off_all_alarms": "Alle Alarme ausschalten",


@@ 355,7 355,6 @@
  "app_settings_display_wallpaper_clock": "Uhr",
  "app_settings_display_wallpaper_quotes": "Sprüche",
  "app_settings_display_wallpaper_edit_quotes": "Sprüche ändern",
  "app_settings_display_wallpaper_quotes_options": "Einstellungen",
  "app_settings_display_wallpaper_quotes_edit": "Spruch ändern",
  "app_settings_display_wallpaper_quotes_delete": "Spruch löschen",
  "app_settings_display_wallpaper_quotes_new": "Neuer Spruch",


@@ 455,7 454,6 @@
  "phone_lock_configure": "Sicherheitscode konfigurieren",
  "app_settings_security_usb_passcode": "USB-Sicherheit",
  "app_settings_apn_settings_no_apns": "<text align='center' color='9'>Noch keine APN.<p>Zum Hinzufügen <b>linken Pfeil</b> drücken.</p></text>",
  "app_settings_apn_options": "Einstellungen",
  "app_settings_apn_options_delete": "Löschen",
  "app_settings_apn_options_edit": "Ändern",
  "app_settings_apn_options_set_as_default": "Als Standard festlegen",


@@ 494,7 492,6 @@
  "app_phonebook_ice_contacts_title": "ICE-Kontakte",
  "app_phonebook_duplicate_numbers": "Die Nummer $CONTACT_SPEED_DIAL$ wurde \n $CONTACT_NAME$ zugewiesen. Ersetzen?",
  "app_phonebook_duplicate_speed_dial_title": "Kurzwahltaste ($CONTACT_SPEED_DIAL$)",
  "app_phonebook_options_title": "Einstellungen",
  "app_phonebook_options_edit": "Kontakte ändern",
  "app_phonebook_options_block": "Blockieren",
  "app_phonebook_options_block_confirm": "Diesen Kontakt blockieren?",

M image/assets/lang/English.json => image/assets/lang/English.json +1 -0
@@ 18,6 18,7 @@
  "common_no": "No",
  "common_switch": "SWITCH",
  "common_options": "OPTIONS",
  "common_options_title": "Options",
  "common_information": "Information",
  "common_check": "CHECK",
  "common_uncheck": "UNCHECK",

M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +2 -5
@@ 16,6 16,7 @@
  "common_no": "No",
  "common_switch": "CAMBIAR",
  "common_options": "OPCIONES",
  "common_options_title": "Opciones",
  "common_information": "Información",
  "common_check": "MARCAR",
  "common_uncheck": "DESMARCAR",


@@ 94,8 95,7 @@
  "app_alarm_clock_repeat_week_days": "Días laborables",
  "app_alarm_clock_repeat_custom": "Personalizado",
  "app_alarm_clock_no_alarms_information": "<text align='center' color='9'>No hay alarmas.<p>Pulsa la <b>flecha izquierda</b> para añadir una.</p></text>",
  "app_alarm_clock_options_title": "Opciones",
  "app_alarm_clock_options_edit": "Editar",
   "app_alarm_clock_options_edit": "Editar",
  "app_alarm_clock_options_delete": "Eliminar",
  "app_alarm_clock_options_turn_off_all_alarms": "Apagar todas las alarmas",
  "app_alarm_clock_delete_confirmation": "¿Eliminar esta alarma?",


@@ 355,7 355,6 @@
  "app_settings_display_wallpaper_clock": "Reloj",
  "app_settings_display_wallpaper_quotes": "Citas",
  "app_settings_display_wallpaper_edit_quotes": "Editar citas",
  "app_settings_display_wallpaper_quotes_options": "Opciones",
  "app_settings_display_wallpaper_quotes_edit": "Editar cita",
  "app_settings_display_wallpaper_quotes_delete": "Eliminar cita",
  "app_settings_display_wallpaper_quotes_new": "Nueva cita",


@@ 455,7 454,6 @@
  "phone_lock_configure": "Configura el código de acceso:",
  "app_settings_security_usb_passcode": "Seguridad USB",
  "app_settings_apn_settings_no_apns": "<text align='center' color='9'>No hay ningún APN.<p>Pulsa la <b>flecha izquierda</b> para añadir uno.</p></text>",
  "app_settings_apn_options": "Opciones",
  "app_settings_apn_options_delete": "Eliminar",
  "app_settings_apn_options_edit": "Editar",
  "app_settings_apn_options_set_as_default": "Establecer como predeterminado",


@@ 494,7 492,6 @@
  "app_phonebook_ice_contacts_title": "Contactos de emergencia",
  "app_phonebook_duplicate_numbers": "El número $CONTACT_SPEED_DIAL$ está asignado a \n $CONTACT_NAME$. ¿Reemplazarlo?",
  "app_phonebook_duplicate_speed_dial_title": "Tecla de marcación rápida ($CONTACT_SPEED_DIAL$)",
  "app_phonebook_options_title": "Opciones",
  "app_phonebook_options_edit": "Editar contacto",
  "app_phonebook_options_block": "Bloquear",
  "app_phonebook_options_block_confirm": "¿Bloquear este contacto?",

M image/assets/lang/Francais.json => image/assets/lang/Francais.json +1 -4
@@ 16,6 16,7 @@
  "common_no": "Non",
  "common_switch": "CHANGER",
  "common_options": "OPTIONS",
  "common_options_title": "Options",
  "common_information": "Information",
  "common_check": "COCHER",
  "common_uncheck": "DÉCOCHER",


@@ 98,7 99,6 @@
  "app_alarm_clock_repeat_week_days": "Jours de la semaine",
  "app_alarm_clock_repeat_custom": "Personnalisé",
  "app_alarm_clock_no_alarms_information": "<text align='center' color='9'>Aucune alarme pour le moment.<p> Appuyez sur la <b>flèche gauche</b> pour en ajouter une nouvelle.</p></text>",
  "app_alarm_clock_options_title": "Options",
  "app_alarm_clock_options_edit": "Modifier",
  "app_alarm_clock_options_delete": "Supprimer",
  "app_alarm_clock_options_turn_off_all_alarms": "Éteignez toutes les alarmes",


@@ 325,7 325,6 @@
  "app_settings_display_wallpaper_clock": "Horloge",
  "app_settings_display_wallpaper_quotes": "Citations",
  "app_settings_display_wallpaper_edit_quotes": "Modifier les citations",
  "app_settings_display_wallpaper_quotes_options": "Options",
  "app_settings_display_wallpaper_quotes_edit": "Modifier la citation",
  "app_settings_display_wallpaper_quotes_delete": "Supprimer la citation",
  "app_settings_display_wallpaper_quotes_new": "Nouvelle citation",


@@ 424,7 423,6 @@
  "phone_lock_configure": "Configurer le code d'accès",
  "app_settings_security_usb_passcode": "Sécurité USBS",
  "app_settings_apn_settings_no_apns": "<text align='center' color='9'>No APNs yet.<p>Press <b>left arrow</b> to add new.</p></text>",
  "app_settings_apn_options": "Options",
  "app_settings_apn_options_delete": "Delete",
  "app_settings_apn_options_edit": "Edit",
  "app_settings_apn_options_set_as_default": "Set as default",


@@ 463,7 461,6 @@
  "app_phonebook_ice_contacts_title": "Contacts d'urgence",
  "app_phonebook_duplicate_numbers": "Ces numéros appartiennent à\n$CONTACT_NAME$. Voulez-vous\ncréer un nouveau contact?",
  "app_phonebook_duplicate_speed_dial_title": "Touche de numérotation rapide ($CONTACT_SPEED_DIAL$)",
  "app_phonebook_options_title": "Options",
  "app_phonebook_options_edit": "Modifier le contact",
  "app_phonebook_options_block": "Bloquer",
  "app_phonebook_options_block_confirm": "Voulez-vous vraiment\nbloquer ce contact?",

M image/assets/lang/Polski.json => image/assets/lang/Polski.json +1 -5
@@ 16,6 16,7 @@
  "common_no": "Nie",
  "common_switch": "ZMIEŃ",
  "common_options": "OPCJE",
  "common_options_title": "Opcje",
  "common_information": "Informacje",
  "common_check": "ZAZNACZ",
  "common_uncheck": "ODZNACZ",


@@ 95,7 96,6 @@
  "app_alarm_clock_repeat_week_days": "Dni powszednie",
  "app_alarm_clock_repeat_custom": "Własne",
  "app_alarm_clock_no_alarms_information": "<text align='center' color='9'>Nie ma jeszcze żadnego alarmu.<p>Wciśnij <b>lewą strzałkę</b>, by dodać nowy.</p></text>",
  "app_alarm_clock_options_title": "Opcje",
  "app_alarm_clock_options_edit": "Edytuj",
  "app_alarm_clock_options_delete": "Usuń",
  "app_alarm_clock_options_turn_off_all_alarms": "Wyłącz wszystkie alarmy",


@@ 358,7 358,6 @@
  "app_settings_display_wallpaper_clock": "Zegar",
  "app_settings_display_wallpaper_quotes": "Cytaty",
  "app_settings_display_wallpaper_edit_quotes": "Edytuj cytaty",
  "app_settings_display_wallpaper_quotes_options": "Opcje",
  "app_settings_display_wallpaper_quotes_edit": "Edytuj cytat",
  "app_settings_display_wallpaper_quotes_delete": "Usuń cytat",
  "app_settings_display_wallpaper_quotes_new": "Nowy cytat",


@@ 468,7 467,6 @@
  "phone_lock_configure": "Skonfiguruj kod",
  "app_settings_security_usb_passcode": "Zabezpieczenie USB",
  "app_settings_apn_settings_no_apns": "<text align='center' color='9'>Nie ma jeszcze żadnego APN.<p>Wciśnij <b>lewą strzałkę</b>, by dodać nowy.</p></text>",
  "app_settings_apn_options": "Opcje",
  "app_settings_apn_options_delete": "Usuń",
  "app_settings_apn_options_edit": "Edytuj",
  "app_settings_apn_options_set_as_default": "Ustaw jako domyślne",


@@ 509,7 507,6 @@
  "app_phonebook_favourite_contacts_title": "Ulubione Kontakty",
  "app_phonebook_duplicate_numbers": "Numer $CONTACT_SPEED_DIAL$ jest przypisany do: \n $CONTACT_NAME$. Zastąpić?",
  "app_phonebook_duplicate_speed_dial_title": "Klawisz szybkiego wybierania ($CONTACT_SPEED_DIAL$)",
  "app_phonebook_options_title": "Opcje",
  "app_phonebook_options_edit": "Edytuj kontakt",
  "app_phonebook_new_add_to_fav": "Dodaj do ulubionych",
  "app_phonebook_options_block": "Blokuj",


@@ 531,7 528,6 @@
  "app_phonebook_new_contact_address": "Adres",
  "app_phonebook_new_contact_note": "Notatka",
  "app_phonebook_new_speed_dial_key": "Klawisz szybkiego wybierania",
  "app_phonebook_new_add_to_fav": "Dodaj do ulubionych",
  "app_phonebook_new_add_to_ice": "Dodaj do kontaktów ICE",
  "app_phonebook_check": "ZAZNACZ",
  "app_phonebook_uncheck": "ODZNACZ",

M image/assets/lang/Svenska.json => image/assets/lang/Svenska.json +1 -4
@@ 15,6 15,7 @@
  "common_no": "Nej",
  "common_switch": "VÄXLA",
  "common_options": "ALTERNATIV",
  "common_options_title": "Alternativ",
  "common_information": "Information",
  "common_check": "MARKERA",
  "common_uncheck": "AVMARKERA",


@@ 87,7 88,6 @@
  "app_alarm_clock_repeat_week_days": "Vardagar",
  "app_alarm_clock_repeat_custom": "Eget val",
  "app_alarm_clock_no_alarms_information": "<text align='center' color='9'>Inga larmtider än.<p>Tryck <b>vänsterpil</b> för att lägga till en.</p></text>",
  "app_alarm_clock_options_title": "Alternativ",
  "app_alarm_clock_options_edit": "Redigera",
  "app_alarm_clock_options_delete": "Radera",
  "app_alarm_clock_options_turn_off_all_alarms": "Stäng av alla larm",


@@ 283,7 283,6 @@
  "app_settings_display_wallpaper_logo": "Mudita-logotyp",
  "app_settings_display_wallpaper_clock": "Klocka",
  "app_settings_display_wallpaper_quotes": "Citat",
  "app_settings_display_wallpaper_quotes_options": "Alternativ",
  "app_settings_display_wallpaper_quotes_edit": "Redigera citat",
  "app_settings_display_wallpaper_quotes_delete": "Radera citat",
  "app_settings_display_wallpaper_quotes_new": "Nytt citat",


@@ 356,7 355,6 @@
  "phone_lock_changed_successfully": "Lösenordet bytt!",
  "phone_lock_disabled": "Lösenordet avstängt!",
  "app_settings_apn_settings_no_apns": "<text align='center' color='9'>Inga APN-inställningar än.<p>Tryck <b>vänsterpil</b> för att lägga till.</p></text>",
  "app_settings_apn_options": "Alternativ",
  "app_settings_apn_options_delete": "Radera",
  "app_settings_apn_options_edit": "Redigera",
  "app_settings_apn_options_set_as_default": "Välj som förval",


@@ 380,7 378,6 @@
  "app_phonebook_ice_contacts_title": "ICE-kontakter vid olycka",
  "app_phonebook_duplicate_numbers": "Nummer $CONTACT_SPEED_DIAL$ är inställt att ringa \n $CONTACT_NAME$. Vill du ändra det?",
  "app_phonebook_duplicate_speed_dial_title": "Förvalsnummer ($CONTACT_SPEED_DIAL$)",
  "app_phonebook_options_title": "Alternativ",
  "app_phonebook_options_edit": "Redigera kontakt",
  "app_phonebook_options_block": "Blockera",
  "app_phonebook_options_block_confirm": "Blockera den här kontakten?",

M module-apps/application-alarm-clock/ApplicationAlarmClock.cpp => module-apps/application-alarm-clock/ApplicationAlarmClock.cpp +1 -1
@@ 89,7 89,7 @@ namespace app
                                      std::make_unique<alarmClock::CustomRepeatWindowPresenter>(alarmsProvider);
                                  return std::make_unique<alarmClock::CustomRepeatWindow>(app, std::move(presenter));
                              });
        windowsFactory.attach(utils::translate("app_alarm_clock_options_title"),
        windowsFactory.attach(utils::translate("common_options_title"),
                              [](ApplicationCommon *app, const std::string &name) {
                                  return std::make_unique<gui::OptionWindow>(app, name);
                              });

M module-apps/application-alarm-clock/models/AlarmsModel.cpp => module-apps/application-alarm-clock/models/AlarmsModel.cpp +1 -1
@@ 53,7 53,7 @@ namespace app::alarmClock
        };
        item->inputCallback = [this, record = record.get()](gui::Item &, const gui::InputEvent &event) {
            if (event.isShortRelease(gui::KeyCode::KEY_LF)) {
                application->switchWindow(utils::translate("app_alarm_clock_options_title"),
                application->switchWindow(utils::translate("common_options_title"),
                                          std::make_unique<gui::OptionsWindowOptions>(
                                              alarmsListOptions(application, *record, *alarmsRepository)));
            }

M module-apps/application-calllog/ApplicationCallLog.cpp => module-apps/application-calllog/ApplicationCallLog.cpp +5 -3
@@ 17,6 17,7 @@
#include <MessageType.hpp>
#include <module-db/queries/calllog/QueryCalllogSetAllRead.hpp>
#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
#include <utility>

using namespace calllog;



@@ 26,7 27,7 @@ namespace app
                                           std::string parent,
                                           StatusIndicators statusIndicators,
                                           StartInBackground startInBackground)
        : Application(name, parent, statusIndicators, startInBackground, 4096)
        : Application(std::move(name), std::move(parent), statusIndicators, startInBackground, 4096)
    {
        bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
        addActionReceiver(manager::actions::ShowCallLog, [this](auto &&data) {


@@ 64,8 65,9 @@ namespace app
    sys::ReturnCodes ApplicationCallLog::InitHandler()
    {
        auto ret = Application::InitHandler();
        if (ret != sys::ReturnCodes::Success)
        if (ret != sys::ReturnCodes::Success) {
            return ret;
        }

        createUserInterface();



@@ 87,7 89,7 @@ namespace app
        windowsFactory.attach(calllog::settings::DetailsWindowStr, [](ApplicationCommon *app, const std::string &name) {
            return std::make_unique<gui::CallLogDetailsWindow>(app);
        });
        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
        windowsFactory.attach(utils::translate("common_options_title"),
                              [](ApplicationCommon *app, const std::string &name) {
                                  return std::make_unique<gui::OptionWindow>(app, name);
                              });

M module-apps/application-calllog/windows/CallLogDetailsWindow.cpp => module-apps/application-calllog/windows/CallLogDetailsWindow.cpp +1 -1
@@ 225,7 225,7 @@ namespace gui
        if (inputEvent.isShortRelease(KeyCode::KEY_LF)) {
            auto app = dynamic_cast<app::ApplicationCallLog *>(application);
            assert(app != nullptr);
            app->switchWindow(utils::translate("app_phonebook_options_title"),
            app->switchWindow(utils::translate("common_options_title"),
                              std::make_unique<gui::OptionsWindowOptions>(calllogWindowOptions(app, record)));

            return true;

M module-apps/application-meditation/windows/MeditationOptionsWindows.cpp => module-apps/application-meditation/windows/MeditationOptionsWindows.cpp +1 -1
@@ 27,7 27,7 @@ namespace
MeditationOptionsWindow::MeditationOptionsWindow(app::ApplicationCommon *app)
    : OptionWindow(app, app::window::name::meditation_options)
{
    setTitle(utils::translate("common_options"));
    setTitle(utils::translate("common_options_title"));
    bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch));
    addOptions(buildOptionsList());
}

M module-apps/application-messages/ApplicationMessages.cpp => module-apps/application-messages/ApplicationMessages.cpp +8 -11
@@ 33,6 33,7 @@

#include <cassert>
#include <ctime>
#include <utility>

namespace app
{


@@ 42,8 43,8 @@ namespace app
                                             std::string parent,
                                             StatusIndicators statusIndicators,
                                             StartInBackground startInBackground)
        : Application(name, parent, statusIndicators, startInBackground, messagesStackDepth), AsyncCallbackReceiver{
                                                                                                  this}
        : Application(std::move(name), std::move(parent), statusIndicators, startInBackground, messagesStackDepth),
          AsyncCallbackReceiver{this}
    {
        bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
        addActionReceiver(manager::actions::CreateSms, [this](auto &&data) {


@@ 125,7 126,7 @@ namespace app
        windowsFactory.attach(gui::name::window::new_sms, [](ApplicationCommon *app, const std::string &name) {
            return std::make_unique<gui::NewMessageWindow>(app);
        });
        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
        windowsFactory.attach(utils::translate("common_options_title"),
                              [](ApplicationCommon *app, const std::string &name) {
                                  return std::make_unique<gui::OptionWindow>(app, name);
                              });


@@ 305,7 306,7 @@ namespace app
        gui::DialogMetadata meta;
        meta.icon                              = "info_big_circle_W_G";
        meta.text                              = notification;
        meta.action                            = action;
        meta.action                            = std::move(action);
        auto switchData                        = std::make_unique<gui::DialogMetadataMessage>(meta);
        switchData->ignoreCurrentWindowOnStack = ignoreCurrentWindowOnStack;
        switchWindow(gui::name::window::dialog_confirm, std::move(switchData));


@@ 352,7 353,7 @@ namespace app

    bool ApplicationMessages::sendSms(const utils::PhoneNumber::View &number, const UTF8 &body)
    {
        if (number.getEntered().size() == 0 || body.length() == 0) {
        if (number.getEntered().empty() || body.length() == 0) {
            LOG_WARN("Number or sms body is empty");
            return false;
        }


@@ 383,18 384,14 @@ namespace app

    bool ApplicationMessages::handleSendSmsFromThread(const utils::PhoneNumber::View &number, const UTF8 &body)
    {
        if (!sendSms(number, body)) {
            return false;
        }

        return true;
        return sendSms(number, body);
    }

    bool ApplicationMessages::newMessageOptions(const std::string &requestingWindow, gui::Text *text)
    {
        LOG_INFO("New message options for %s", requestingWindow.c_str());
        auto opts = std::make_unique<gui::OptionsWindowOptions>(newMessageWindowOptions(this, requestingWindow, text));
        switchWindow(utils::translate("app_phonebook_options_title"), std::move(opts));
        switchWindow(utils::translate("common_options_title"), std::move(opts));
        return true;
    }


M module-apps/application-messages/models/ThreadsModel.cpp => module-apps/application-messages/models/ThreadsModel.cpp +1 -1
@@ 56,7 56,7 @@ auto ThreadsModel::getItem(gui::Order order) -> gui::ListItem *
        }
        if (event.is(gui::KeyCode::KEY_LF)) {
            application->switchWindow(
                utils::translate("app_phonebook_options_title"),
                utils::translate("common_options_title"),
                std::make_unique<gui::OptionsWindowOptions>(threadWindowOptions(app, item->getThreadItem().get())));
        }
        return false;

M module-apps/application-messages/widgets/SMSOutputWidget.cpp => module-apps/application-messages/widgets/SMSOutputWidget.cpp +1 -1
@@ 87,7 87,7 @@ namespace gui
                LOG_INFO("Message activated!");
                auto app = dynamic_cast<app::ApplicationMessages *>(application);
                assert(app != nullptr);
                app->switchWindow(utils::translate("app_phonebook_options_title"),
                app->switchWindow(utils::translate("common_options_title"),
                                  std::make_unique<gui::OptionsWindowOptions>(smsWindowOptions(app, *record)));
                return true;
            }

M module-apps/application-notes/ApplicationNotes.cpp => module-apps/application-notes/ApplicationNotes.cpp +1 -1
@@ 122,7 122,7 @@ namespace app
                              [](ApplicationCommon *app, const std::string &name) {
                                  return std::make_unique<gui::DialogYesNo>(app, name);
                              });
        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
        windowsFactory.attach(utils::translate("common_options_title"),
                              [](ApplicationCommon *app, const std::string &name) {
                                  return std::make_unique<gui::OptionWindow>(app, name);
                              });

M module-apps/application-notes/model/NotesListModel.cpp => module-apps/application-notes/model/NotesListModel.cpp +1 -1
@@ 54,7 54,7 @@ namespace app::notes
        item->inputCallback = [this, note = note.get()](gui::Item &, const gui::InputEvent &event) {
            if (event.isShortRelease(gui::KeyCode::KEY_LF)) {
                application->switchWindow(
                    utils::translate("app_phonebook_options_title"),
                    utils::translate("common_options_title"),
                    std::make_unique<gui::OptionsWindowOptions>(noteListOptions(application, *note, *notesRepository)));
            }
            return false;

M module-apps/application-notes/windows/NoteEditWindow.cpp => module-apps/application-notes/windows/NoteEditWindow.cpp +1 -1
@@ 149,7 149,7 @@ namespace app::notes
            }
            if (inputEvent.is(gui::KeyCode::KEY_LF)) {
                application->switchWindow(
                    utils::translate("app_phonebook_options_title"),
                    utils::translate("common_options_title"),
                    std::make_unique<gui::OptionsWindowOptions>(noteEditOptions(application, *notesRecord, edit)));
            }
        }

M module-apps/application-notes/windows/NotePreviewWindow.cpp => module-apps/application-notes/windows/NotePreviewWindow.cpp +1 -1
@@ 131,7 131,7 @@ namespace app::notes
                application->switchWindow(gui::name::window::note_edit, std::make_unique<NoteSwitchData>(notesRecord));
            }
            else if (inputEvent.is(gui::KeyCode::KEY_LF)) {
                application->switchWindow(utils::translate("app_phonebook_options_title"),
                application->switchWindow(utils::translate("common_options_title"),
                                          std::make_unique<gui::OptionsWindowOptions>(notePreviewOptions(
                                              application, *notesRecord, presenter->getRepository(), note)));
            }

M module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp => module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp +1 -1
@@ 16,7 16,7 @@ namespace gui
    QuotesOptionsWindow::QuotesOptionsWindow(app::ApplicationCommon *app)
        : BaseSettingsWindow(app, gui::window::name::quotes), quotesModel(std::make_shared<Quotes::QuotesModel>(app))
    {
        setTitle(utils::translate("app_settings_display_wallpaper_quotes_options"));
        setTitle(utils::translate("common_options_title"));
    }

    auto QuotesOptionsWindow::buildOptionsList() -> std::list<gui::Option>

M module-apps/application-settings/windows/network/ApnOptionsWindow.cpp => module-apps/application-settings/windows/network/ApnOptionsWindow.cpp +1 -1
@@ 12,7 12,7 @@ namespace gui
{
    ApnOptionsWindow::ApnOptionsWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::apn_options)
    {
        setTitle(utils::translate("app_settings_apn_options"));
        setTitle(utils::translate("common_options_title"));
        apnSettingsModel = new ApnSettingsModel(application);
    }