Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 54955)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 54956)
@@ -403,5 +403,5 @@
         {
             if (m_pComboCipher->currentIndex() == 0)
-                message.second << tr("Encryption cipher type is not specified.");
+                message.second << tr("Encryption cipher type not specified.");
         }
         /* Password should be entered and confirmed if once changed: */
@@ -412,12 +412,9 @@
         {
             if (m_pEditorEncryptionPassword->text().isEmpty())
-                message.second << tr("Encryption password is not entered.");
-            else
-            if (m_pEditorEncryptionPasswordConfirm->text().isEmpty())
-                message.second << tr("Encryption password is not confirmed.");
+                message.second << tr("Encryption password empty.");
             else
             if (m_pEditorEncryptionPassword->text() !=
                 m_pEditorEncryptionPasswordConfirm->text())
-                message.second << tr("Entered and confirmed encryption passwords doesn't match.");
+                message.second << tr("Encryption passwords do not match.");
             fPass = false;
         }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 54955)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 54956)
@@ -216,5 +216,5 @@
         <widget class="QCheckBox" name="m_pCheckBoxEncryption">
          <property name="whatsThis">
-          <string>When checked, enables the encryption of this virtual machine.</string>
+          <string>When checked, enables encryption for this virtual machine.</string>
          </property>
          <property name="text">
@@ -276,5 +276,5 @@
            <widget class="QComboBox" name="m_pComboCipher">
             <property name="whatsThis" >
-             <string>Holds the cipher to be used for the virtual machine storage encryption.</string>
+             <string>Holds the cipher to be used for encrypting the virtual machine disks.</string>
             </property>
            </widget>
@@ -296,5 +296,5 @@
            <widget class="QLineEdit" name="m_pEditorEncryptionPassword">
             <property name="whatsThis" >
-             <string>Holds the password to be assigned for the virtual machine.</string>
+             <string>Holds the password to be assigned to the virtual machine.</string>
             </property>
            </widget>
@@ -316,5 +316,5 @@
            <widget class="QLineEdit" name="m_pEditorEncryptionPasswordConfirm">
             <property name="whatsThis" >
-             <string>Confirms the password to be assigned for the virtual machine.</string>
+             <string>Confirms the password to be assigned to the virtual machine.</string>
             </property>
            </widget>