diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index 84c5bc4c8..854dea966 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -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": "Noch kein Alarm.

Zum Hinzufügen linken Pfeil drücken.

", - "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": "Noch keine APN.

Zum Hinzufügen linken Pfeil drücken.

", - "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?", diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index 16b3d06c4..1b7ee3e39 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -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", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index ca0a0dfc7..3b0e2edaf 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -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": "No hay alarmas.

Pulsa la flecha izquierda para añadir una.

", - "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": "No hay ningún APN.

Pulsa la flecha izquierda para añadir uno.

", - "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?", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index 175bd9a96..442ec53e4 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -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": "Aucune alarme pour le moment.

Appuyez sur la flèche gauche pour en ajouter une nouvelle.

", - "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": "No APNs yet.

Press left arrow to add new.

", - "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?", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index 6b4622baa..8028b9623 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -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": "Nie ma jeszcze żadnego alarmu.

Wciśnij lewą strzałkę, by dodać nowy.

", - "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": "Nie ma jeszcze żadnego APN.

Wciśnij lewą strzałkę, by dodać nowy.

", - "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", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index bd7d7daab..b9216836e 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -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": "Inga larmtider än.

Tryck vänsterpil för att lägga till en.

", - "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": "Inga APN-inställningar än.

Tryck vänsterpil för att lägga till.

", - "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?", diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp index d7c43000f..890e47995 100644 --- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp +++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp @@ -89,7 +89,7 @@ namespace app std::make_unique(alarmsProvider); return std::make_unique(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(app, name); }); diff --git a/module-apps/application-alarm-clock/models/AlarmsModel.cpp b/module-apps/application-alarm-clock/models/AlarmsModel.cpp index 1943aac66..ee0a855a0 100644 --- a/module-apps/application-alarm-clock/models/AlarmsModel.cpp +++ b/module-apps/application-alarm-clock/models/AlarmsModel.cpp @@ -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( alarmsListOptions(application, *record, *alarmsRepository))); } diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp index bc0328906..c4b6bcee5 100644 --- a/module-apps/application-calllog/ApplicationCallLog.cpp +++ b/module-apps/application-calllog/ApplicationCallLog.cpp @@ -17,6 +17,7 @@ #include #include #include +#include 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(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(app, name); }); diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp index 65d2789af..431c72431 100644 --- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp @@ -225,7 +225,7 @@ namespace gui if (inputEvent.isShortRelease(KeyCode::KEY_LF)) { auto app = dynamic_cast(application); assert(app != nullptr); - app->switchWindow(utils::translate("app_phonebook_options_title"), + app->switchWindow(utils::translate("common_options_title"), std::make_unique(calllogWindowOptions(app, record))); return true; diff --git a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp index 582250d45..2a0e2473b 100644 --- a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp +++ b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp @@ -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()); } diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp index bb43f8247..01ec249df 100644 --- a/module-apps/application-messages/ApplicationMessages.cpp +++ b/module-apps/application-messages/ApplicationMessages.cpp @@ -33,6 +33,7 @@ #include #include +#include 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(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(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(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(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; } diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp index 113269a96..0f138f7af 100644 --- a/module-apps/application-messages/models/ThreadsModel.cpp +++ b/module-apps/application-messages/models/ThreadsModel.cpp @@ -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(threadWindowOptions(app, item->getThreadItem().get()))); } return false; diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp index 93703b27c..59bb9ed0f 100644 --- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp +++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp @@ -87,7 +87,7 @@ namespace gui LOG_INFO("Message activated!"); auto app = dynamic_cast(application); assert(app != nullptr); - app->switchWindow(utils::translate("app_phonebook_options_title"), + app->switchWindow(utils::translate("common_options_title"), std::make_unique(smsWindowOptions(app, *record))); return true; } diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp index 18d084c07..c0d845d31 100644 --- a/module-apps/application-notes/ApplicationNotes.cpp +++ b/module-apps/application-notes/ApplicationNotes.cpp @@ -122,7 +122,7 @@ namespace app [](ApplicationCommon *app, const std::string &name) { return std::make_unique(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(app, name); }); diff --git a/module-apps/application-notes/model/NotesListModel.cpp b/module-apps/application-notes/model/NotesListModel.cpp index 3c8f2eea4..e1106b772 100644 --- a/module-apps/application-notes/model/NotesListModel.cpp +++ b/module-apps/application-notes/model/NotesListModel.cpp @@ -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(noteListOptions(application, *note, *notesRepository))); } return false; diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp index 1622ceeb9..185b6c90d 100644 --- a/module-apps/application-notes/windows/NoteEditWindow.cpp +++ b/module-apps/application-notes/windows/NoteEditWindow.cpp @@ -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(noteEditOptions(application, *notesRecord, edit))); } } diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp index 027f31327..45adc9a63 100644 --- a/module-apps/application-notes/windows/NotePreviewWindow.cpp +++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp @@ -131,7 +131,7 @@ namespace app::notes application->switchWindow(gui::name::window::note_edit, std::make_unique(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(notePreviewOptions( application, *notesRecord, presenter->getRepository(), note))); } diff --git a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp index 5790243b2..7e5b5563f 100644 --- a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp +++ b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp @@ -16,7 +16,7 @@ namespace gui QuotesOptionsWindow::QuotesOptionsWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, gui::window::name::quotes), quotesModel(std::make_shared(app)) { - setTitle(utils::translate("app_settings_display_wallpaper_quotes_options")); + setTitle(utils::translate("common_options_title")); } auto QuotesOptionsWindow::buildOptionsList() -> std::list diff --git a/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp b/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp index c3358f8f1..e66b28d78 100644 --- a/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp +++ b/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp @@ -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); }