[FL-2438] Correct grammar in menus and application names (#1102)
* [FL-2403] Changed (Name and save) buttons name * [FL-2403] NFC Reading revert LED color to blue * [FL-2438] Capital_letter_menu_names * [FL-2438] Capital_letter_menu_names * [FL-2438] Rename and unify menu items with capitals * [FL-2438] Capital_letter_menu_and_returned_Empty_folder * [FL-2438] Capital_letter_menu_and_returned_Empty_folder_label * [FL-2438] Capital_letter_menu_and_returned_Empty_folder_label_reformating Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
		
							parent
							
								
									7d022c6fda
								
							
						
					
					
						commit
						b22ad77bbe
					
				| @ -207,7 +207,7 @@ const size_t FLIPPER_ON_SYSTEM_START_COUNT = | |||||||
| // Plugin menu
 | // Plugin menu
 | ||||||
| const FlipperApplication FLIPPER_PLUGINS[] = { | const FlipperApplication FLIPPER_PLUGINS[] = { | ||||||
| #ifdef APP_BLE_HID | #ifdef APP_BLE_HID | ||||||
|     {.app = bt_hid_app, .name = "Bluetooth remote", .stack_size = 1024, .icon = NULL}, |     {.app = bt_hid_app, .name = "Bluetooth Remote", .stack_size = 1024, .icon = NULL}, | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef APP_MUSIC_PLAYER | #ifdef APP_MUSIC_PLAYER | ||||||
| @ -244,7 +244,7 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = { | |||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef APP_USB_MOUSE | #ifdef APP_USB_MOUSE | ||||||
|     {.app = usb_mouse_app, .name = "USB Mouse demo", .stack_size = 1024, .icon = NULL}, |     {.app = usb_mouse_app, .name = "USB Mouse Demo", .stack_size = 1024, .icon = NULL}, | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef APP_UART_ECHO | #ifdef APP_UART_ECHO | ||||||
| @ -295,7 +295,7 @@ const FlipperApplication FLIPPER_SETTINGS_APPS[] = { | |||||||
| 
 | 
 | ||||||
| #ifdef SRV_NOTIFICATION | #ifdef SRV_NOTIFICATION | ||||||
|     {.app = notification_settings_app, |     {.app = notification_settings_app, | ||||||
|      .name = "LCD and notifications", |      .name = "LCD and Notifications", | ||||||
|      .stack_size = 1024, |      .stack_size = 1024, | ||||||
|      .icon = NULL}, |      .icon = NULL}, | ||||||
| #endif | #endif | ||||||
|  | |||||||
| @ -54,7 +54,7 @@ void bt_settings_scene_start_on_enter(void* context) { | |||||||
|             variable_item_set_current_value_index(item, BtSettingOff); |             variable_item_set_current_value_index(item, BtSettingOff); | ||||||
|             variable_item_set_current_value_text(item, bt_settings_text[BtSettingOff]); |             variable_item_set_current_value_text(item, bt_settings_text[BtSettingOff]); | ||||||
|         } |         } | ||||||
|         variable_item_list_add(var_item_list, "Forget all paired devices", 1, NULL, NULL); |         variable_item_list_add(var_item_list, "Forget All Paired Devices", 1, NULL, NULL); | ||||||
|         variable_item_list_set_enter_callback( |         variable_item_list_set_enter_callback( | ||||||
|             var_item_list, bt_settings_scene_start_var_list_enter_callback, app); |             var_item_list, bt_settings_scene_start_var_list_enter_callback, app); | ||||||
|     } else { |     } else { | ||||||
|  | |||||||
| @ -21,7 +21,7 @@ static void usb_mouse_render_callback(Canvas* canvas, void* ctx) { | |||||||
|     canvas_clear(canvas); |     canvas_clear(canvas); | ||||||
| 
 | 
 | ||||||
|     canvas_set_font(canvas, FontPrimary); |     canvas_set_font(canvas, FontPrimary); | ||||||
|     canvas_draw_str(canvas, 0, 10, "USB Mouse demo"); |     canvas_draw_str(canvas, 0, 10, "USB Mouse Demo"); | ||||||
| 
 | 
 | ||||||
|     canvas_set_font(canvas, FontSecondary); |     canvas_set_font(canvas, FontSecondary); | ||||||
|     canvas_draw_str(canvas, 0, 63, "Hold [back] to exit"); |     canvas_draw_str(canvas, 0, 63, "Hold [back] to exit"); | ||||||
|  | |||||||
| @ -49,9 +49,9 @@ void gpio_scene_start_on_enter(void* context) { | |||||||
|     variable_item_list_set_enter_callback( |     variable_item_list_set_enter_callback( | ||||||
|         var_item_list, gpio_scene_start_var_list_enter_callback, app); |         var_item_list, gpio_scene_start_var_list_enter_callback, app); | ||||||
| 
 | 
 | ||||||
|     variable_item_list_add(var_item_list, "USB-UART bridge", 0, NULL, NULL); |     variable_item_list_add(var_item_list, "USB-UART Bridge", 0, NULL, NULL); | ||||||
| 
 | 
 | ||||||
|     variable_item_list_add(var_item_list, "GPIO manual control", 0, NULL, NULL); |     variable_item_list_add(var_item_list, "GPIO Manual Control", 0, NULL, NULL); | ||||||
| 
 | 
 | ||||||
|     item = variable_item_list_add( |     item = variable_item_list_add( | ||||||
|         var_item_list, |         var_item_list, | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ void iButtonSceneStart::on_enter(iButtonApp* app) { | |||||||
| 
 | 
 | ||||||
|     submenu_add_item(submenu, "Read", SubmenuIndexRead, submenu_callback, app); |     submenu_add_item(submenu, "Read", SubmenuIndexRead, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Saved", SubmenuIndexSaved, submenu_callback, app); |     submenu_add_item(submenu, "Saved", SubmenuIndexSaved, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Add manually", SubmenuIndexAdd, submenu_callback, app); |     submenu_add_item(submenu, "Add Manually", SubmenuIndexAdd, submenu_callback, app); | ||||||
|     submenu_set_selected_item(submenu, submenu_item_selected); |     submenu_set_selected_item(submenu, submenu_item_selected); | ||||||
| 
 | 
 | ||||||
|     view_manager->switch_to(iButtonAppViewManager::Type::iButtonAppViewSubmenu); |     view_manager->switch_to(iButtonAppViewManager::Type::iButtonAppViewSubmenu); | ||||||
|  | |||||||
| @ -23,11 +23,11 @@ void InfraredAppSceneEdit::on_enter(InfraredApp* app) { | |||||||
|     InfraredAppViewManager* view_manager = app->get_view_manager(); |     InfraredAppViewManager* view_manager = app->get_view_manager(); | ||||||
|     Submenu* submenu = view_manager->get_submenu(); |     Submenu* submenu = view_manager->get_submenu(); | ||||||
| 
 | 
 | ||||||
|     submenu_add_item(submenu, "Add key", SubmenuIndexAddKey, submenu_callback, app); |     submenu_add_item(submenu, "Add Key", SubmenuIndexAddKey, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Rename key", SubmenuIndexRenameKey, submenu_callback, app); |     submenu_add_item(submenu, "Rename Key", SubmenuIndexRenameKey, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Delete key", SubmenuIndexDeleteKey, submenu_callback, app); |     submenu_add_item(submenu, "Delete Key", SubmenuIndexDeleteKey, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Rename remote", SubmenuIndexRenameRemote, submenu_callback, app); |     submenu_add_item(submenu, "Rename Remote", SubmenuIndexRenameRemote, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Delete remote", SubmenuIndexDeleteRemote, submenu_callback, app); |     submenu_add_item(submenu, "Delete Remote", SubmenuIndexDeleteRemote, submenu_callback, app); | ||||||
|     submenu_set_selected_item(submenu, submenu_item_selected); |     submenu_set_selected_item(submenu, submenu_item_selected); | ||||||
|     submenu_item_selected = 0; |     submenu_item_selected = 0; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -21,10 +21,10 @@ void InfraredAppSceneStart::on_enter(InfraredApp* app) { | |||||||
|     Submenu* submenu = view_manager->get_submenu(); |     Submenu* submenu = view_manager->get_submenu(); | ||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Universal library", SubmenuIndexUniversalLibrary, submenu_callback, app); |         submenu, "Universal Library", SubmenuIndexUniversalLibrary, submenu_callback, app); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Learn new remote", SubmenuIndexLearnNewRemote, submenu_callback, app); |         submenu, "Learn New Remote", SubmenuIndexLearnNewRemote, submenu_callback, app); | ||||||
|     submenu_add_item(submenu, "Saved remotes", SubmenuIndexSavedRemotes, submenu_callback, app); |     submenu_add_item(submenu, "Saved Remotes", SubmenuIndexSavedRemotes, submenu_callback, app); | ||||||
|     submenu_set_selected_item(submenu, submenu_item_selected); |     submenu_set_selected_item(submenu, submenu_item_selected); | ||||||
|     submenu_item_selected = 0; |     submenu_item_selected = 0; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -11,7 +11,7 @@ void LfRfidAppSceneStart::on_enter(LfRfidApp* app, bool need_restore) { | |||||||
| 
 | 
 | ||||||
|     submenu->add_item("Read", SubmenuRead, submenu_callback, app); |     submenu->add_item("Read", SubmenuRead, submenu_callback, app); | ||||||
|     submenu->add_item("Saved", SubmenuSaved, submenu_callback, app); |     submenu->add_item("Saved", SubmenuSaved, submenu_callback, app); | ||||||
|     submenu->add_item("Add manually", SubmenuAddManually, submenu_callback, app); |     submenu->add_item("Add Manually", SubmenuAddManually, submenu_callback, app); | ||||||
| 
 | 
 | ||||||
|     if(need_restore) { |     if(need_restore) { | ||||||
|         submenu->set_selected_item(submenu_item_selected); |         submenu->set_selected_item(submenu_item_selected); | ||||||
|  | |||||||
| @ -386,7 +386,7 @@ static void loader_build_menu() { | |||||||
|     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { |     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { | ||||||
|         menu_add_item( |         menu_add_item( | ||||||
|             loader_instance->primary_menu, |             loader_instance->primary_menu, | ||||||
|             "Debug tools", |             "Debug Tools", | ||||||
|             &A_Debug_14, |             &A_Debug_14, | ||||||
|             i++, |             i++, | ||||||
|             loader_submenu_callback, |             loader_submenu_callback, | ||||||
|  | |||||||
| @ -20,7 +20,7 @@ void nfc_scene_card_menu_on_enter(void* context) { | |||||||
|     if(nfc->dev->dev_data.nfc_data.protocol > NfcDeviceProtocolUnknown) { |     if(nfc->dev->dev_data.nfc_data.protocol > NfcDeviceProtocolUnknown) { | ||||||
|         submenu_add_item( |         submenu_add_item( | ||||||
|             submenu, |             submenu, | ||||||
|             "Run compatible app", |             "Run Compatible App", | ||||||
|             SubmenuIndexRunApp, |             SubmenuIndexRunApp, | ||||||
|             nfc_scene_card_menu_submenu_callback, |             nfc_scene_card_menu_submenu_callback, | ||||||
|             nfc); |             nfc); | ||||||
| @ -34,7 +34,7 @@ void nfc_scene_card_menu_on_enter(void* context) { | |||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Emulate UID", SubmenuIndexEmulate, nfc_scene_card_menu_submenu_callback, nfc); |         submenu, "Emulate UID", SubmenuIndexEmulate, nfc_scene_card_menu_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Name and save UID", SubmenuIndexSave, nfc_scene_card_menu_submenu_callback, nfc); |         submenu, "Save UID", SubmenuIndexSave, nfc_scene_card_menu_submenu_callback, nfc); | ||||||
|     submenu_set_selected_item( |     submenu_set_selected_item( | ||||||
|         nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneCardMenu)); |         nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneCardMenu)); | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -15,11 +15,7 @@ void nfc_scene_mifare_desfire_menu_on_enter(void* context) { | |||||||
|     Submenu* submenu = nfc->submenu; |     Submenu* submenu = nfc->submenu; | ||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, |         submenu, "Save", SubmenuIndexSave, nfc_scene_mifare_desfire_menu_submenu_callback, nfc); | ||||||
|         "Name and save", |  | ||||||
|         SubmenuIndexSave, |  | ||||||
|         nfc_scene_mifare_desfire_menu_submenu_callback, |  | ||||||
|         nfc); |  | ||||||
|     submenu_set_selected_item( |     submenu_set_selected_item( | ||||||
|         nfc->submenu, |         nfc->submenu, | ||||||
|         scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMifareDesfireMenu)); |         scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMifareDesfireMenu)); | ||||||
|  | |||||||
| @ -16,7 +16,7 @@ void nfc_scene_mifare_ul_menu_on_enter(void* context) { | |||||||
|     Submenu* submenu = nfc->submenu; |     Submenu* submenu = nfc->submenu; | ||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Name and save", SubmenuIndexSave, nfc_scene_mifare_ul_menu_submenu_callback, nfc); |         submenu, "Save", SubmenuIndexSave, nfc_scene_mifare_ul_menu_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Emulate", SubmenuIndexEmulate, nfc_scene_mifare_ul_menu_submenu_callback, nfc); |         submenu, "Emulate", SubmenuIndexEmulate, nfc_scene_mifare_ul_menu_submenu_callback, nfc); | ||||||
|     submenu_set_selected_item( |     submenu_set_selected_item( | ||||||
|  | |||||||
| @ -36,7 +36,7 @@ void nfc_scene_saved_menu_on_enter(void* context) { | |||||||
|             nfc); |             nfc); | ||||||
|     } |     } | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Edit UID and name", SubmenuIndexEdit, nfc_scene_saved_menu_submenu_callback, nfc); |         submenu, "Edit UID and Name", SubmenuIndexEdit, nfc_scene_saved_menu_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Delete", SubmenuIndexDelete, nfc_scene_saved_menu_submenu_callback, nfc); |         submenu, "Delete", SubmenuIndexDelete, nfc_scene_saved_menu_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|  | |||||||
| @ -18,7 +18,7 @@ void nfc_scene_scripts_menu_on_enter(void* context) { | |||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, |         submenu, | ||||||
|         "Read bank card", |         "Read Bank Card", | ||||||
|         SubmenuIndexBankCard, |         SubmenuIndexBankCard, | ||||||
|         nfc_scene_scripts_menu_submenu_callback, |         nfc_scene_scripts_menu_submenu_callback, | ||||||
|         nfc); |         nfc); | ||||||
|  | |||||||
| @ -19,17 +19,16 @@ void nfc_scene_start_on_enter(void* context) { | |||||||
|     Submenu* submenu = nfc->submenu; |     Submenu* submenu = nfc->submenu; | ||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Read card", SubmenuIndexRead, nfc_scene_start_submenu_callback, nfc); |         submenu, "Read Card", SubmenuIndexRead, nfc_scene_start_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, |         submenu, | ||||||
|         "Run special action", |         "Run Special Action", | ||||||
|         SubmenuIndexRunScript, |         SubmenuIndexRunScript, | ||||||
|         nfc_scene_start_submenu_callback, |         nfc_scene_start_submenu_callback, | ||||||
|         nfc); |         nfc); | ||||||
|  |     submenu_add_item(submenu, "Saved", SubmenuIndexSaved, nfc_scene_start_submenu_callback, nfc); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, "Saved cards", SubmenuIndexSaved, nfc_scene_start_submenu_callback, nfc); |         submenu, "Add Manually", SubmenuIndexAddManualy, nfc_scene_start_submenu_callback, nfc); | ||||||
|     submenu_add_item( |  | ||||||
|         submenu, "Add manually", SubmenuIndexAddManualy, nfc_scene_start_submenu_callback, nfc); |  | ||||||
| 
 | 
 | ||||||
|     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { |     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { | ||||||
|         submenu_add_item( |         submenu_add_item( | ||||||
|  | |||||||
| @ -163,21 +163,21 @@ static NotificationAppSettings* alloc_settings() { | |||||||
|     uint8_t value_index; |     uint8_t value_index; | ||||||
| 
 | 
 | ||||||
|     item = variable_item_list_add( |     item = variable_item_list_add( | ||||||
|         app->variable_item_list, "LCD backlight", BACKLIGHT_COUNT, backlight_changed, app); |         app->variable_item_list, "LCD Backlight", BACKLIGHT_COUNT, backlight_changed, app); | ||||||
|     value_index = float_value_index( |     value_index = float_value_index( | ||||||
|         app->notification->settings.display_brightness, backlight_value, BACKLIGHT_COUNT); |         app->notification->settings.display_brightness, backlight_value, BACKLIGHT_COUNT); | ||||||
|     variable_item_set_current_value_index(item, value_index); |     variable_item_set_current_value_index(item, value_index); | ||||||
|     variable_item_set_current_value_text(item, backlight_text[value_index]); |     variable_item_set_current_value_text(item, backlight_text[value_index]); | ||||||
| 
 | 
 | ||||||
|     item = variable_item_list_add( |     item = variable_item_list_add( | ||||||
|         app->variable_item_list, "Backlight time", DELAY_COUNT, screen_changed, app); |         app->variable_item_list, "Backlight Time", DELAY_COUNT, screen_changed, app); | ||||||
|     value_index = uint32_value_index( |     value_index = uint32_value_index( | ||||||
|         app->notification->settings.display_off_delay_ms, delay_value, DELAY_COUNT); |         app->notification->settings.display_off_delay_ms, delay_value, DELAY_COUNT); | ||||||
|     variable_item_set_current_value_index(item, value_index); |     variable_item_set_current_value_index(item, value_index); | ||||||
|     variable_item_set_current_value_text(item, delay_text[value_index]); |     variable_item_set_current_value_text(item, delay_text[value_index]); | ||||||
| 
 | 
 | ||||||
|     item = variable_item_list_add( |     item = variable_item_list_add( | ||||||
|         app->variable_item_list, "LED brightness", BACKLIGHT_COUNT, led_changed, app); |         app->variable_item_list, "LED Brightness", BACKLIGHT_COUNT, led_changed, app); | ||||||
|     value_index = float_value_index( |     value_index = float_value_index( | ||||||
|         app->notification->settings.led_brightness, backlight_value, BACKLIGHT_COUNT); |         app->notification->settings.led_brightness, backlight_value, BACKLIGHT_COUNT); | ||||||
|     variable_item_set_current_value_index(item, value_index); |     variable_item_set_current_value_index(item, value_index); | ||||||
|  | |||||||
| @ -18,7 +18,7 @@ void power_settings_scene_start_on_enter(void* context) { | |||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, |         submenu, | ||||||
|         "Battery info", |         "Battery Info", | ||||||
|         PowerSettingsSubmenuIndexBatteryInfo, |         PowerSettingsSubmenuIndexBatteryInfo, | ||||||
|         power_settings_scene_start_submenu_callback, |         power_settings_scene_start_submenu_callback, | ||||||
|         app); |         app); | ||||||
|  | |||||||
| @ -21,7 +21,7 @@ void storage_settings_scene_start_on_enter(void* context) { | |||||||
| 
 | 
 | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         submenu, |         submenu, | ||||||
|         "About internal storage", |         "About Internal Storage", | ||||||
|         StorageSettingsStartSubmenuIndexInternalInfo, |         StorageSettingsStartSubmenuIndexInternalInfo, | ||||||
|         storage_settings_scene_start_submenu_callback, |         storage_settings_scene_start_submenu_callback, | ||||||
|         app); |         app); | ||||||
|  | |||||||
| @ -31,7 +31,7 @@ void subghz_scene_start_on_enter(void* context) { | |||||||
|         subghz->submenu, "Saved", SubmenuIndexSaved, subghz_scene_start_submenu_callback, subghz); |         subghz->submenu, "Saved", SubmenuIndexSaved, subghz_scene_start_submenu_callback, subghz); | ||||||
|     submenu_add_item( |     submenu_add_item( | ||||||
|         subghz->submenu, |         subghz->submenu, | ||||||
|         "Add manually", |         "Add Manually", | ||||||
|         SubmenuIndexAddManualy, |         SubmenuIndexAddManualy, | ||||||
|         subghz_scene_start_submenu_callback, |         subghz_scene_start_submenu_callback, | ||||||
|         subghz); |         subghz); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Dmitry Pavlov
						Dmitry Pavlov