Просмотр исходного кода

Fix typos in various outputs (#2032)

* Fix typos in various outputs
* Update u2f_view.c

Co-authored-by: あく <alleteam@gmail.com>
MangoTornado 3 лет назад
Родитель
Сommit
669822cdd2

+ 2 - 2
applications/main/u2f/views/u2f_view.c

@@ -37,10 +37,10 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
     } else if(model->display_msg == U2fMsgSuccess) {
     } else if(model->display_msg == U2fMsgSuccess) {
         canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31);
         canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31);
         canvas_draw_str_aligned(
         canvas_draw_str_aligned(
-            canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successfull!");
+            canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!");
     } else if(model->display_msg == U2fMsgError) {
     } else if(model->display_msg == U2fMsgError) {
         canvas_draw_icon(canvas, 22, 15, &I_Error_62x31);
         canvas_draw_icon(canvas, 22, 15, &I_Error_62x31);
-        canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Ceritficate error");
+        canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error");
     }
     }
 }
 }
 
 

+ 1 - 1
applications/services/cli/cli_command_gpio.c

@@ -121,7 +121,7 @@ void cli_command_gpio_mode(Cli* cli, FuriString* args, void* context) {
 
 
     if(cli_command_gpio_pins[num].debug) {
     if(cli_command_gpio_pins[num].debug) {
         printf(
         printf(
-            "Changeing this pin mode may damage hardware. Are you sure you want to continue? (y/n)?\r\n");
+            "Changing this pin mode may damage hardware. Are you sure you want to continue? (y/n)?\r\n");
         char c = cli_getc(cli);
         char c = cli_getc(cli);
         if(c != 'y' && c != 'Y') {
         if(c != 'y' && c != 'Y') {
             printf("Cancelled.\r\n");
             printf("Cancelled.\r\n");

+ 1 - 1
assets/dolphin/ReadMe.md

@@ -52,7 +52,7 @@ Version: 1
 - `Active cooldown` - amount of seconds (after passive mode) to pass before entering next active mode.
 - `Active cooldown` - amount of seconds (after passive mode) to pass before entering next active mode.
 
 
 - `Bubble slots` - amount of bubble sequences.
 - `Bubble slots` - amount of bubble sequences.
-- Any bubble sequence plays whole sequence during active mode. There can be many bubble sequences and bubbles inside it. Bubbles in 1 bubble sequence have to reside in 1 slot. Bubbles order in 1 bubble sequence is determined by occurance in file. As soon as frame index goes out of EndFrame index of bubble - next animation bubble is choosen. There can also be free of bubbles frames between 2 bubbles.
+- Any bubble sequence plays whole sequence during active mode. There can be many bubble sequences and bubbles inside it. Bubbles in 1 bubble sequence have to reside in 1 slot. Bubbles order in 1 bubble sequence is determined by occurrence in file. As soon as frame index goes out of EndFrame index of bubble - next animation bubble is chosen. There can also be free of bubbles frames between 2 bubbles.
 
 
 - `Slot` - number to unite bubbles for same sequence.
 - `Slot` - number to unite bubbles for same sequence.
 - `X`, `Y` - are coordinates of left top corner of bubble.
 - `X`, `Y` - are coordinates of left top corner of bubble.

+ 2 - 2
scripts/toolchain/fbtenv.sh

@@ -13,7 +13,7 @@ fbtenv_show_usage()
     echo "Running this script manually is wrong, please source it";
     echo "Running this script manually is wrong, please source it";
     echo "Example:";
     echo "Example:";
     printf "\tsource scripts/toolchain/fbtenv.sh\n";
     printf "\tsource scripts/toolchain/fbtenv.sh\n";
-    echo "To restore your enviroment source fbtenv.sh with '--restore'."
+    echo "To restore your environment source fbtenv.sh with '--restore'."
     echo "Example:";
     echo "Example:";
     printf "\tsource scripts/toolchain/fbtenv.sh --restore\n";
     printf "\tsource scripts/toolchain/fbtenv.sh --restore\n";
 }
 }
@@ -227,7 +227,7 @@ fbtenv_curl_wget_check()
             echo;
             echo;
             echo "$TOOLCHAIN_URL";
             echo "$TOOLCHAIN_URL";
             echo;
             echo;
-            echo "And place in $FBT_TOOLCHAIN_PATH/toolchain/ dir mannualy";
+            echo "And place in $FBT_TOOLCHAIN_PATH/toolchain/ dir manually";
             return 1;
             return 1;
         fi
         fi
         echo "yes"
         echo "yes"

+ 2 - 2
site_scons/commandline.scons

@@ -15,7 +15,7 @@ AddOption(
     nargs=1,
     nargs=1,
     action="store",
     action="store",
     default="fbt_options.py",
     default="fbt_options.py",
-    help="Enviroment option file",
+    help="Environment option file",
 )
 )
 
 
 AddOption(
 AddOption(
@@ -23,7 +23,7 @@ AddOption(
     action="store",
     action="store",
     dest="extra_int_apps",
     dest="extra_int_apps",
     default="",
     default="",
-    help="List of applications to add to firmare's built-ins. Also see FIRMWARE_APP_SET and FIRMWARE_APPS",
+    help="List of applications to add to firmware's built-ins. Also see FIRMWARE_APP_SET and FIRMWARE_APPS",
 )
 )
 
 
 AddOption(
 AddOption(