Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 71838)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 71839)
@@ -394,5 +394,5 @@
         if (extPack.isNull() || !extPack.GetUsable())
         {
-            message.second << tr("You are trying to encrypt this virtual machine. "
+            message.second << tr("You are trying enable disk encryption for this virtual machine. "
                                  "However, this requires the <i>%1</i> to be installed. "
                                  "Please install the Extension Pack from the VirtualBox download site.")
@@ -408,5 +408,5 @@
         {
             if (m_pComboCipher->currentIndex() == 0)
-                message.second << tr("Encryption cipher type not specified.");
+                message.second << tr("Disk Encryption cipher type not specified.");
             fPass = false;
         }
@@ -419,9 +419,9 @@
         {
             if (m_pEditorEncryptionPassword->text().isEmpty())
-                message.second << tr("Encryption password empty.");
+                message.second << tr("Disk Encryption password empty.");
             else
             if (m_pEditorEncryptionPassword->text() !=
                 m_pEditorEncryptionPasswordConfirm->text())
-                message.second << tr("Encryption passwords do not match.");
+                message.second << tr("Disk Encryption passwords do not match.");
             fPass = false;
         }
@@ -946,3 +946,2 @@
     return fSuccess;
 }
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 71838)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui	(revision 71839)
@@ -210,5 +210,5 @@
      <widget class="QWidget" name="m_pTabEncryption">
       <attribute name="title">
-       <string>Enc&amp;ryption</string>
+       <string>Disk Enc&amp;ryption</string>
       </attribute>
       <layout class="QGridLayout" name="m_pLayoutEncryption">
@@ -216,8 +216,8 @@
         <widget class="QCheckBox" name="m_pCheckBoxEncryption">
          <property name="whatsThis">
-          <string>When checked, enables encryption for this virtual machine.</string>
+          <string>When checked, disks that are attached to this virtual machine are encrypted.</string>
          </property>
          <property name="text">
-          <string>En&amp;able Encryption</string>
+          <string>En&amp;able Disk Encryption</string>
          </property>
         </widget>
@@ -263,5 +263,5 @@
            <widget class="QLabel" name="m_pLabelCipher">
             <property name="text">
-             <string>Encryption C&amp;ipher:</string>
+             <string>Disk Encryption C&amp;ipher:</string>
             </property>
             <property name="alignment">
@@ -296,5 +296,5 @@
            <widget class="QLineEdit" name="m_pEditorEncryptionPassword">
             <property name="whatsThis" >
-             <string>Holds the password to be assigned to the virtual machine.</string>
+             <string>Holds the encryption password for disk attached to this 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 to the virtual machine.</string>
+             <string>Confirms the disk encryption password.</string>
             </property>
            </widget>