Index: sources/ApplicationController.h
===================================================================
diff -u -rc73feffa73c7fe073a7a7581144f5806dfc91beb -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f
--- sources/ApplicationController.h	(.../ApplicationController.h)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
+++ sources/ApplicationController.h	(.../ApplicationController.h)	(revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f)
@@ -151,13 +151,13 @@
     /*!
      * \brief   didPOSTPass
      * \details This signal will be emitted when UI is done with the POST and will let other layers to know the result.
-     *          As an example the Manufacturing will not start if the POST filed since it needs POST info for hte Encrypted partition.
+     *          As an example the Manufacturing will not start if the POST failed since it needs POST info for the Encrypted partition.
      * \param   vPass - true if passed.
      */
     void didPOSTPass      (bool vPass);
     /*!
      * \brief   didPOSTInformationReady
-     * \details this signall will be emitted in case the UI POST is successfull, BEFORE the didPOSTDone.
+     * \details this signal will be emitted in case the UI POST is successful, BEFORE the didPOSTDone.
      * \note    note that this will be called before the didPOSTDone, to give the opportunity to the observer to update the required information before being notified for the POST result,
      *          so in case there are things to be done on POST success, the data is ready.
      */
Index: sources/gui/qml/components/TextEntry.qml
===================================================================
diff -u -rb5ae1508b6ca751c29ed1844cd844eeec67cff82 -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f
--- sources/gui/qml/components/TextEntry.qml	(.../TextEntry.qml)	(revision b5ae1508b6ca751c29ed1844cd844eeec67cff82)
+++ sources/gui/qml/components/TextEntry.qml	(.../TextEntry.qml)	(revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f)
@@ -54,7 +54,7 @@
 
     function doFocus( vFocus ) {
         if ( vFocus ) {
-            // if has cursor (is enditable), by clicking on the entry the keyboard shall pop up
+            // if has cursor (is editable), by clicking on the entry the keyboard shall pop up
             // since the MouseArea is covering the entry, user can't move the cursur to delete one specific character,
             // all will be selected to overwrite the entire text for easy modification.
             // it was better if the keyboard has the cursor arrows
@@ -114,7 +114,7 @@
 
     MouseArea {
         // if it has cursor since it is possible to have only one entry.
-        // then just click on the entry will not do anything and we nned a mouse area to display the keyboard
+        // then just click on the entry will not do anything and we need a mouse area to display the keyboard
         // if in any case the keyboard becomes hidden to make the rest of the screen visible.
         visible     : hasCursor
         anchors.fill: parent
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r9c7a790376d07de7ddaa67e39d47102d68693c87 -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 9c7a790376d07de7ddaa67e39d47102d68693c87)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f)
@@ -258,7 +258,7 @@
         function isSettings   () { _mainMenu.itemPressed(2) }
 
         disable                 : _GuiView.manufactSetup
-        hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu untill the POST passes.
+        hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
         titles                  : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
         visibleItems            : [       true        ,       false     ,       true       ]
         Component.onCompleted   : {
Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -rc73feffa73c7fe073a7a7581144f5806dfc91beb -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f)
@@ -41,13 +41,13 @@
     }
 
     onConfirmClicked: {
-        // check for password(s), and check the accpeted flag
+        // check for password(s), and check the accepeted flag
         isPassword_Accepted = checkPassword()
 
         // if not accepted return
         if ( ! isPassword_Accepted ) return
 
-        // of accepted save the password
+        // if accepted save the password
         if (   passwordChangeMode ) vSettings.updateServicePassword(passwordUpdated)
 
         // ask HD to go to service mode