FIX: Fixed inconsistencies between texts

zigad · zigad · commit c09924c67da0 · 2022-08-09T21:08:35.000+02:00
Fixed few more inconsistencies between text on Flipper. Similar fixes as on PR flipperdevices#1496
diff --git a/applications/archive/views/archive_browser_view.c b/applications/archive/views/archive_browser_view.c
@@ -49,7 +49,7 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) {
 
     string_t menu[MENU_ITEMS];
 
-    string_init_set_str(menu[0], "Run in app");
+    string_init_set_str(menu[0], "Run In App");
     string_init_set_str(menu[1], "Pin");
     string_init_set_str(menu[2], "Rename");
     string_init_set_str(menu[3], "Delete");
diff --git a/applications/desktop/views/desktop_view_locked.c b/applications/desktop/views/desktop_view_locked.c
@@ -124,7 +124,7 @@ static void desktop_view_locked_draw(Canvas* canvas, void* model) {
     } else if(view_state == DesktopViewLockedStateLockedHintShown) {
         canvas_set_font(canvas, FontSecondary);
         elements_bold_rounded_frame(canvas, 14, 2 + STATUS_BAR_Y_SHIFT, 99, 48);
-        elements_multiline_text(canvas, 65, 20 + STATUS_BAR_Y_SHIFT, "To unlock\npress:");
+        elements_multiline_text(canvas, 65, 20 + STATUS_BAR_Y_SHIFT, "To Unlock\nPress:");
         canvas_draw_icon(canvas, 65, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8);
         canvas_draw_icon(canvas, 80, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8);
         canvas_draw_icon(canvas, 95, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8);
diff --git a/applications/lfrfid/scene/lfrfid_app_scene_save_name.cpp b/applications/lfrfid/scene/lfrfid_app_scene_save_name.cpp
@@ -15,7 +15,7 @@ void LfRfidAppSceneSaveName::on_enter(LfRfidApp* app, bool /* need_restore */) {
     }
 
     auto text_input = app->view_controller.get<TextInputVM>();
-    text_input->set_header_text("Name the card");
+    text_input->set_header_text("Name The Card");
 
     text_input->set_result_callback(
         save_callback,
diff --git a/applications/nfc/scenes/nfc_scene_mf_classic_dict_attack.c b/applications/nfc/scenes/nfc_scene_mf_classic_dict_attack.c
@@ -57,7 +57,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt
 
         // If failed to load user dictionary - try flipper dictionary
         if(!dict) {
-            FURI_LOG_E(TAG, "User dictionary not found");
+            FURI_LOG_E(TAG, "User Dictionary Not Found");
             state = DictAttackStateFlipperDictInProgress;
         }
     }
@@ -66,7 +66,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt
         dict_attack_set_header(nfc->dict_attack, "Mf Classic Flipper Dict.");
         dict = mf_classic_dict_alloc(MfClassicDictTypeFlipper);
         if(!dict) {
-            FURI_LOG_E(TAG, "Flipper dictionary not found");
+            FURI_LOG_E(TAG, "Flipper Dictionary Not Found");
             // Pass through to let worker handle the failure
         }
     }
diff --git a/applications/nfc/scenes/nfc_scene_mf_classic_keys.c b/applications/nfc/scenes/nfc_scene_mf_classic_keys.c
@@ -28,9 +28,9 @@ void nfc_scene_mf_classic_keys_on_enter(void* context) {
     widget_add_string_element(
         nfc->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "MF Classic Keys");
     char temp_str[32];
-    snprintf(temp_str, sizeof(temp_str), "Flipper dict: %ld", flipper_dict_keys_total);
+    snprintf(temp_str, sizeof(temp_str), "Flipper Dict: %ld", flipper_dict_keys_total);
     widget_add_string_element(nfc->widget, 0, 20, AlignLeft, AlignTop, FontSecondary, temp_str);
-    snprintf(temp_str, sizeof(temp_str), "User dict: %ld", user_dict_keys_total);
+    snprintf(temp_str, sizeof(temp_str), "User Dict: %ld", user_dict_keys_total);
     widget_add_string_element(nfc->widget, 0, 32, AlignLeft, AlignTop, FontSecondary, temp_str);
     widget_add_button_element(
         nfc->widget, GuiButtonTypeCenter, "Add", nfc_scene_mf_classic_keys_widget_callback, nfc);
diff --git a/applications/nfc/scenes/nfc_scene_mf_ultralight_key_input.c b/applications/nfc/scenes/nfc_scene_mf_ultralight_key_input.c
@@ -11,7 +11,7 @@ void nfc_scene_mf_ultralight_key_input_on_enter(void* context) {
 
     // Setup view
     ByteInput* byte_input = nfc->byte_input;
-    byte_input_set_header_text(byte_input, "Enter the password in hex");
+    byte_input_set_header_text(byte_input, "Enter The Password In Hex");
     byte_input_set_result_callback(
         byte_input,
         nfc_scene_mf_ultralight_key_input_byte_input_callback,
diff --git a/applications/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c b/applications/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c
@@ -26,19 +26,19 @@ void nfc_scene_mf_ultralight_read_auth_set_state(Nfc* nfc, NfcSceneMfUlReadState
         if(state == NfcSceneMfUlReadStateDetecting) {
             popup_reset(nfc->popup);
             popup_set_text(
-                nfc->popup, "Apply card to\nFlipper's back", 97, 24, AlignCenter, AlignTop);
+                nfc->popup, "Apply Card To\nFlipper's Back", 97, 24, AlignCenter, AlignTop);
             popup_set_icon(nfc->popup, 0, 8, &I_NFC_manual);
         } else if(state == NfcSceneMfUlReadStateReading) {
             popup_reset(nfc->popup);
             popup_set_header(
-                nfc->popup, "Reading card\nDon't move...", 85, 24, AlignCenter, AlignTop);
+                nfc->popup, "Reading Card\nDon't Move...", 85, 24, AlignCenter, AlignTop);
             popup_set_icon(nfc->popup, 12, 23, &A_Loading_24);
         } else if(state == NfcSceneMfUlReadStateNotSupportedCard) {
             popup_reset(nfc->popup);
-            popup_set_header(nfc->popup, "Wrong type of card!", 64, 3, AlignCenter, AlignTop);
+            popup_set_header(nfc->popup, "Wrong Type Of Card!", 64, 3, AlignCenter, AlignTop);
             popup_set_text(
                 nfc->popup,
-                "Only MIFARE\nUltralight & NTAG\n are supported",
+                "Only MIFARE\nUltralight & NTAG\n Are Supported",
                 4,
                 22,
                 AlignLeft,
diff --git a/applications/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c b/applications/nfc/scenes/nfc_scene_mf_ultralight_unlock_warn.c
@@ -13,9 +13,9 @@ void nfc_scene_mf_ultralight_unlock_warn_on_enter(void* context) {
     dialog_ex_set_context(dialog_ex, nfc);
     dialog_ex_set_result_callback(dialog_ex, nfc_scene_mf_ultralight_unlock_warn_dialog_callback);
 
-    dialog_ex_set_header(dialog_ex, "Risky function!", 64, 4, AlignCenter, AlignTop);
+    dialog_ex_set_header(dialog_ex, "Risky Function!", 64, 4, AlignCenter, AlignTop);
     dialog_ex_set_text(
-        dialog_ex, "Wrong password\ncan block your\ncard.", 4, 18, AlignLeft, AlignTop);
+        dialog_ex, "Wrong password\ncan block your\ncard!", 4, 18, AlignLeft, AlignTop);
     dialog_ex_set_icon(dialog_ex, 73, 17, &I_DolphinFirstStart8_56x51);
     dialog_ex_set_center_button_text(dialog_ex, "OK");
 
diff --git a/applications/nfc/scenes/nfc_scene_read.c b/applications/nfc/scenes/nfc_scene_read.c
@@ -25,12 +25,12 @@ void nfc_scene_read_set_state(Nfc* nfc, NfcSceneReadState state) {
         if(state == NfcSceneReadStateDetecting) {
             popup_reset(nfc->popup);
             popup_set_text(
-                nfc->popup, "Apply card to\nFlipper's back", 97, 24, AlignCenter, AlignTop);
+                nfc->popup, "Apply Card To\nFlipper's Back", 97, 24, AlignCenter, AlignTop);
             popup_set_icon(nfc->popup, 0, 8, &I_NFC_manual);
         } else if(state == NfcSceneReadStateReading) {
             popup_reset(nfc->popup);
             popup_set_header(
-                nfc->popup, "Reading card\nDon't move...", 85, 24, AlignCenter, AlignTop);
+                nfc->popup, "Reading Card\nDon't Move...", 85, 24, AlignCenter, AlignTop);
             popup_set_icon(nfc->popup, 12, 23, &A_Loading_24);
         }
         scene_manager_set_scene_state(nfc->scene_manager, NfcSceneRead, state);
diff --git a/applications/nfc/scenes/nfc_scene_save_name.c b/applications/nfc/scenes/nfc_scene_save_name.c
@@ -22,7 +22,7 @@ void nfc_scene_save_name_on_enter(void* context) {
     } else {
         nfc_text_store_set(nfc, nfc->dev->dev_name);
     }
-    text_input_set_header_text(text_input, "Name the card");
+    text_input_set_header_text(text_input, "Name The Card");
     text_input_set_result_callback(
         text_input,
         nfc_scene_save_name_text_input_callback,
diff --git a/applications/nfc/views/dict_attack.c b/applications/nfc/views/dict_attack.c
@@ -31,7 +31,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
     DictAttackViewModel* m = model;
     if(m->state == DictAttackStateCardRemoved) {
         canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost the tag!");
+        canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost The Tag!");
         canvas_set_font(canvas, FontSecondary);
         elements_multiline_text_aligned(
             canvas, 64, 23, AlignCenter, AlignTop, "Make sure the tag is\npositioned correctly.");
@@ -51,7 +51,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
         }
         elements_progress_bar(canvas, 5, 15, 120, progress);
         canvas_set_font(canvas, FontSecondary);
-        snprintf(draw_str, sizeof(draw_str), "Keys found: %d/%d", m->keys_found, m->keys_total);
+        snprintf(draw_str, sizeof(draw_str), "Keys Found: %d/%d", m->keys_found, m->keys_total);
         canvas_draw_str_aligned(canvas, 1, 28, AlignLeft, AlignTop, draw_str);
         snprintf(
             draw_str, sizeof(draw_str), "Sectors Read: %d/%d", m->sectors_read, m->sectors_total);
diff --git a/applications/picopass/scenes/picopass_scene_save_name.c b/applications/picopass/scenes/picopass_scene_save_name.c
@@ -22,7 +22,7 @@ void picopass_scene_save_name_on_enter(void* context) {
     } else {
         picopass_text_store_set(picopass, picopass->dev->dev_name);
     }
-    text_input_set_header_text(text_input, "Name the card");
+    text_input_set_header_text(text_input, "Name The Card");
     text_input_set_result_callback(
         text_input,
         picopass_scene_save_name_text_input_callback,
diff --git a/applications/power/power_settings_app/scenes/power_settings_scene_reboot.c b/applications/power/power_settings_app/scenes/power_settings_scene_reboot.c
@@ -15,10 +15,10 @@ void power_settings_scene_reboot_on_enter(void* context) {
     PowerSettingsApp* app = context;
     Submenu* submenu = app->submenu;
 
-    submenu_set_header(submenu, "Reboot type");
+    submenu_set_header(submenu, "Reboot Type");
     submenu_add_item(
         submenu,
-        "Firmware upgrade",
+        "Firmware Upgrade",
         PowerSettingsRebootSubmenuIndexDfu,
         power_settings_scene_reboot_submenu_callback,
         app);
diff --git a/applications/updater/util/update_task.c b/applications/updater/util/update_task.c
@@ -11,23 +11,23 @@
 
 static const char* update_task_stage_descr[] = {
     [UpdateTaskStageProgress] = "...",
-    [UpdateTaskStageReadManifest] = "Loading update manifest",
-    [UpdateTaskStageValidateDFUImage] = "Checking DFU file",
-    [UpdateTaskStageFlashWrite] = "Writing flash",
-    [UpdateTaskStageFlashValidate] = "Validating flash",
-    [UpdateTaskStageRadioImageValidate] = "Checking radio FW",
-    [UpdateTaskStageRadioErase] = "Uninstalling radio FW",
-    [UpdateTaskStageRadioWrite] = "Writing radio FW",
-    [UpdateTaskStageRadioInstall] = "Installing radio FW",
-    [UpdateTaskStageRadioBusy] = "Radio is updating",
-    [UpdateTaskStageOBValidation] = "Validating opt. bytes",
-    [UpdateTaskStageLfsBackup] = "Backing up LFS",
+    [UpdateTaskStageReadManifest] = "Loading Update Manifest",
+    [UpdateTaskStageValidateDFUImage] = "Checking DFU File",
+    [UpdateTaskStageFlashWrite] = "Writing Flash",
+    [UpdateTaskStageFlashValidate] = "Validating Flash",
+    [UpdateTaskStageRadioImageValidate] = "Checking Radio FW",
+    [UpdateTaskStageRadioErase] = "Uninstalling Radio FW",
+    [UpdateTaskStageRadioWrite] = "Writing Radio FW",
+    [UpdateTaskStageRadioInstall] = "Installing Radio FW",
+    [UpdateTaskStageRadioBusy] = "Radio Is Updating",
+    [UpdateTaskStageOBValidation] = "Validating Opt. Bytes",
+    [UpdateTaskStageLfsBackup] = "Backing Up LFS",
     [UpdateTaskStageLfsRestore] = "Restoring LFS",
-    [UpdateTaskStageResourcesUpdate] = "Updating resources",
-    [UpdateTaskStageSplashscreenInstall] = "Installing splashscreen",
+    [UpdateTaskStageResourcesUpdate] = "Updating Resources",
+    [UpdateTaskStageSplashscreenInstall] = "Installing Splashscreen",
     [UpdateTaskStageCompleted] = "Restarting...",
     [UpdateTaskStageError] = "Error",
-    [UpdateTaskStageOBError] = "OB, report",
+    [UpdateTaskStageOBError] = "OB, Report",
 };
 
 typedef struct {
diff --git a/assets/slideshow/update_default/frame_00.png b/assets/slideshow/update_default/frame_00.png

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ void LfRfidAppSceneSaveName::on_enter(LfRfidApp* app, bool /* need_restore */) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`auto text_input = app->view_controller.get<TextInputVM>();`
`18`		`- text_input->set_header_text("Name the card");`
	`18`	`+ text_input->set_header_text("Name The Card");`
`19`	`19`
`20`	`20`	`text_input->set_result_callback(`
`21`	`21`	`save_callback,`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt`
`57`	`57`
`58`	`58`	`// If failed to load user dictionary - try flipper dictionary`
`59`	`59`	`if(!dict) {`
`60`		`- FURI_LOG_E(TAG, "User dictionary not found");`
	`60`	`+ FURI_LOG_E(TAG, "User Dictionary Not Found");`
`61`	`61`	`state = DictAttackStateFlipperDictInProgress;`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -66,7 +66,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt`
`66`	`66`	`dict_attack_set_header(nfc->dict_attack, "Mf Classic Flipper Dict.");`
`67`	`67`	`dict = mf_classic_dict_alloc(MfClassicDictTypeFlipper);`
`68`	`68`	`if(!dict) {`
`69`		`- FURI_LOG_E(TAG, "Flipper dictionary not found");`
	`69`	`+ FURI_LOG_E(TAG, "Flipper Dictionary Not Found");`
`70`	`70`	`// Pass through to let worker handle the failure`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void nfc_scene_save_name_on_enter(void* context) {`
`22`	`22`	`} else {`
`23`	`23`	`nfc_text_store_set(nfc, nfc->dev->dev_name);`
`24`	`24`	`}`
`25`		`- text_input_set_header_text(text_input, "Name the card");`
	`25`	`+ text_input_set_header_text(text_input, "Name The Card");`
`26`	`26`	`text_input_set_result_callback(`
`27`	`27`	`text_input,`
`28`	`28`	`nfc_scene_save_name_text_input_callback,`