Changeset 47895 in vbox

Timestamp:

Aug 20, 2013 11:49:00 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings Dialog: Validation NLS tags update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (1 diff)
• global/UIGlobalSettingsInput.cpp (modified) (2 diffs)
• global/UIGlobalSettingsNetwork.cpp (modified) (7 diffs)
• global/UIGlobalSettingsProxy.cpp (modified) (1 diff)
• machine/UIMachineSettingsDisplay.cpp (modified) (7 diffs)
• machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (6 diffs)
• machine/UIMachineSettingsParallel.cpp (modified) (2 diffs)
• machine/UIMachineSettingsSerial.cpp (modified) (2 diffs)
• machine/UIMachineSettingsStorage.cpp (modified) (5 diffs)
• machine/UIMachineSettingsSystem.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -309 +309 @@
     else
     {
-        pValidator->setLastMessage(tr("On the <b>%1</b> page, %2").arg(strPageTitle, strMessageText));
+        pValidator->setLastMessage(tr("<b>%1</b> page:<br><br>%2").arg(strPageTitle, strMessageText));
         LogRel(("Settings Dialog:  Page validation FAILED: {%s}\n",
                 pValidator->lastMessage().toUtf8().constData()));

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -167 +167 @@
     {
         strTitle += ": " + VBoxGlobal::removeAccelMark(m_pTabWidget->tabText(UIHotKeyTableIndex_Selector));
-        strWarning = tr("there are duplicated shortcuts.");
+        strWarning = tr("Some items have the same shortcuts assigned.");
         return false;
     }
@@ -173 +173 @@
     {
         strTitle += ": " + VBoxGlobal::removeAccelMark(m_pTabWidget->tabText(UIHotKeyTableIndex_Machine));
-        strWarning = tr("there are duplicated shortcuts.");
+        strWarning = tr("Some items have the same shortcuts assigned.");
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -67 +67 @@
              QHostAddress(m_data.m_interface.m_strInterfaceAddress).protocol() != QAbstractSocket::IPv4Protocol))
         {
-            strWarning = UIGlobalSettingsNetwork::tr("host IPv4 address of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid IPv4 address.").arg(text(0));
             return false;
         }
@@ -74 +74 @@
              QHostAddress(m_data.m_interface.m_strInterfaceMask).protocol() != QAbstractSocket::IPv4Protocol))
         {
-            strWarning = UIGlobalSettingsNetwork::tr("host IPv4 network mask of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid IPv4 network mask.").arg(text(0));
             return false;
         }
@@ -83 +83 @@
                  QHostAddress(m_data.m_interface.m_strInterfaceAddress6).protocol() != QAbstractSocket::IPv6Protocol))
             {
-                strWarning = UIGlobalSettingsNetwork::tr("host IPv6 address of <b>%1</b> is wrong").arg(text(0));
+                strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid IPv6 address.").arg(text(0));
                 return false;
             }
@@ -95 +95 @@
             QHostAddress(m_data.m_dhcpserver.m_strDhcpServerAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            strWarning = UIGlobalSettingsNetwork::tr("DHCP server address of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid DHCP server address.").arg(text(0));
             return false;
         }
@@ -101 +101 @@
             QHostAddress(m_data.m_dhcpserver.m_strDhcpServerMask).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            strWarning = UIGlobalSettingsNetwork::tr("DHCP server network mask of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid DHCP server mask.").arg(text(0));
             return false;
         }
@@ -107 +107 @@
             QHostAddress(m_data.m_dhcpserver.m_strDhcpLowerAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            strWarning = UIGlobalSettingsNetwork::tr("DHCP lower address bound of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.").arg(text(0));
             return false;
         }
@@ -113 +113 @@
             QHostAddress(m_data.m_dhcpserver.m_strDhcpUpperAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            strWarning = UIGlobalSettingsNetwork::tr("DHCP upper address bound of <b>%1</b> is wrong").arg(text(0));
+            strWarning = UIGlobalSettingsNetwork::tr("The host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.").arg(text(0));
             return false;
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

@@ -111 +111 @@
     if (m_pHostEditor->text().trimmed().isEmpty())
     {
-        strWarning = tr("host is not specified.");
+        strWarning = tr("No proxy host is currently specified.");
         return false;
     }
     else if (m_pPortEditor->text().trimmed().isEmpty())
     {
-        strWarning = tr("port is not specified.");
+        strWarning = tr("No proxy port is currently specified.");
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -308 +308 @@
     if (m_pCheckbox3D->isChecked() && !vboxGlobal().is3DAvailable())
     {
-        strWarning = tr("you enabled 3D acceleration. However, 3D acceleration is not "
-                        "working on the current host setup so you will not be able to "
-                        "start the VM.");
+        strWarning = tr("The virtual machine is set to use hardware graphics acceleration. "
+                        "However the host system does not currently provide this, "
+                        "so you will not be able to start the machine.");
         return true;
     }
@@ -322 +322 @@
         if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
         {
-            strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
-                            "the minimum amount required to switch the virtual machine to "
-                            "fullscreen or seamless mode.")
+            strWarning = tr("The virtual machine is currently assigned less than <b>%1</b> of video memory "
+                            "which is the minimum amount required to switch to fullscreen or seamless mode.")
                             .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
             return true;
@@ -335 +334 @@
             if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
             {
-                strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
-                                "the minimum amount required for HD Video to be played efficiently.")
+                strWarning = tr("The virtual machine is currently assigned less than <b>%1</b> of video memory "
+                                "which is the minimum amount required for High Definition Video to be played efficiently.")
                                 .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
                 return true;
@@ -352 +351 @@
             if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
             {
-                strWarning = tr("you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
-                                "For maximal performance set the guest VRAM to at least <b>%1</b>.")
+                strWarning = tr("The virtual machine is set to use hardware graphics acceleration "
+                                "and the operating system hint is set to Windows Vista or later. "
+                                "For best performance you should set the machine's video memory to at least b>%1</b>.")
                                 .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
                 return true;
@@ -367 +367 @@
     if (m_pCheckbox2DVideo->isChecked() && !m_f2DVideoAccelerationSupported)
     {
-        strWarning = tr("you have 2D Video Acceleration enabled. As 2D Video Acceleration "
-                        "is supported for Windows guests only, this feature will be disabled.");
+        strWarning = tr("The virtual machine is set to use Video Stream Acceleration. "
+                        "As this feature only works with Windows guest systems it will be disabled.");
         return true;
     }
@@ -376 +376 @@
     if (m_pEditorRemoteDisplayPort->text().trimmed().isEmpty())
     {
-        strWarning = tr("server port value was not specified.");
+        strWarning = tr("The VRDE server port value is not currently specified.");
         return false;
     }
@@ -383 +383 @@
     if (m_pEditorRemoteDisplayTimeout->text().trimmed().isEmpty())
     {
-        strWarning = tr("authentication timeout value was not specified.");
+        strWarning = tr("The VRDE authentication timeout value is not currently specified.");
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -229 +229 @@
     if (m_pNameAndSystemEditor->name().trimmed().isEmpty())
     {
-        strWarning = tr("you have not specified name for this VM.");
+        strWarning = tr("No name specified for the virtual machine.");
         return false;
     }
@@ -236 +236 @@
     if (is64BitOSTypeSelected() && !m_fHWVirtExEnabled)
     {
-        strWarning = tr("you have selected a 64-bit guest OS type for this VM. As such guests "
-                        "require hardware virtualization (VT-x/AMD-V), this feature will be enabled "
-                        "automatically.");
+        strWarning = tr("The virtual machine operating system hint is set to a 64-bit type. "
+                        "64-bit guest systems require hardware virtualization, "
+                        "so this will be enabled automatically if you confirm the changes.");
         return true;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -177 +177 @@
             if (alternativeName().isNull())
             {
-                strWarning = tr("no bridged network adapter is selected");
+                strWarning = tr("No bridged network adapter is currently selected.");
                 fValid = false;
             }
@@ -186 +186 @@
             if (alternativeName().isNull())
             {
-                strWarning = tr("no internal network name is specified");
+                strWarning = tr("No internal network name is currently specified.");
                 fValid = false;
             }
@@ -195 +195 @@
             if (alternativeName().isNull())
             {
-                strWarning = tr("no host-only network adapter is selected");
+                strWarning = tr("No host-only network adapter is currently selected.");
                 fValid = false;
             }
@@ -204 +204 @@
             if (alternativeName().isNull())
             {
-                strWarning = tr("no generic driver is selected");
+                strWarning = tr("No generic driver is currently selected.");
                 fValid = false;
             }
@@ -216 +216 @@
     if (fValid && m_pMACEditor->text().size() < 12)
     {
-        strWarning = tr("the MAC address must be 12 hexadecimal digits long.");
+        strWarning = tr("The MAC address must be 12 hexadecimal digits long.");
         fValid = false;
     }
@@ -225 +225 @@
         if (validator.indexIn(m_pMACEditor->text()) != 0)
         {
-            strWarning = tr("the second digit in the MAC address may not be odd "
-                            "as only unicast addresses are allowed.");
+            strWarning = tr("The second digit in the MAC address may not be odd as only unicast addresses are allowed.");
             fValid = false;
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp

@@ -350 +350 @@
             {
                 if (strIRQ.isEmpty())
-                    strWarning = tr("IRC not specified.");
+                    strWarning = tr("No IRQ is currently specified.");
                 else if (strIOPort.isEmpty())
-                    strWarning = tr("IO port not specified.");
+                    strWarning = tr("No I/O port is currently specified.");
                 else
-                    strWarning = tr ("duplicate port attributes specified.");
+                    strWarning = tr("Two or more ports have the same settings.");
                 strTitle += ": " +
                     vboxGlobal().removeAccelMark(mTabWidget->tabText(mTabWidget->indexOf(tab)));
@@ -368 +368 @@
             {
                 strWarning = path.isEmpty() ?
-                    tr ("Port path not specified ") :
-                    tr ("Duplicate port path entered ");
+                    tr("No port path is currently specified.") :
+                    tr("There are currently duplicate port paths specified.");
                 strTitle += ": " +
                     vboxGlobal().removeAccelMark (mTabWidget->tabText (mTabWidget->indexOf (tab)));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

@@ -393 +393 @@
             {
                 if (strIRQ.isEmpty())
-                    strWarning = tr("IRC not specified.");
+                    strWarning = tr("No IRQ is currently specified.");
                 else if (strIOPort.isEmpty())
-                    strWarning = tr("IO port not specified.");
+                    strWarning = tr("No I/O port is currently specified.");
                 else
-                    strWarning = tr ("duplicate port attributes specified.");
+                    strWarning = tr("Two or more ports have the same settings.");
                 strTitle += ": " +
                     vboxGlobal().removeAccelMark(mTabWidget->tabText(mTabWidget->indexOf(tab)));
@@ -418 +418 @@
                 {
                     strWarning = path.isEmpty() ?
-                        tr ("port path not specified.") :
-                        tr ("duplicate port path entered.");
+                        tr("No port path is currently specified.") :
+                        tr("There are currently duplicate port paths specified.");
                     strTitle += ": " +
                         vboxGlobal().removeAccelMark (mTabWidget->tabText (mTabWidget->indexOf (tab)));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2119 +2119 @@
         if (ctrName.isEmpty())
         {
-            strWarning = tr("no name specified for controller at position <b>%1</b>.").arg(i + 1);
+            strWarning = tr("No name is currently specified for the controller at position <b>%1</b>.").arg(i + 1);
             return false;
         }
@@ -2125 +2125 @@
         if (names.values().contains(ctrName))
         {
-            strWarning = tr("controller at position <b>%1</b> uses the name that is "
-                          "already used by controller at position <b>%2</b>.")
-                          .arg(i + 1).arg(names.key(ctrName) + 1);
+            strWarning = tr("The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.")
+                            .arg(i + 1).arg(names.key(ctrName) + 1);
             return false;
         }
@@ -2142 +2141 @@
             if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
             {
-                strWarning = tr ("no hard disk is selected for <i>%1</i>.").arg (value);
+                strWarning = tr("No hard disk is selected for <i>%1</i>.").arg (value);
                 return false;
             }
@@ -2148 +2147 @@
             if (!vboxGlobal().findMedium (key).isNull() && config.contains (key))
             {
-                strWarning = tr ("<i>%1</i> uses a medium that is already attached to <i>%2</i>.")
-                              .arg (value).arg (config [key]);
+                strWarning = tr("<i>%1</i> is using a disk that is already attached to <i>%2</i>.")
+                                .arg (value).arg (config [key]);
                 return false;
             }
@@ -2174 +2173 @@
     if (!excessiveList.isEmpty())
     {
-        strWarning = tr("you are currently using more storage controllers than a %1 chipset supports. "
+        strWarning = tr("The machine currently has more storage controllers assigned than a %1 chipset supports. "
                         "Please change the chipset type on the System settings page or reduce the number "
-                        "of the following storage controllers on the Storage settings page: %2.")
+                        "of the following storage controllers on the Storage settings page: %2")
                         .arg(gpConverter->toString(mStorageModel->chipsetType()))
                         .arg(excessiveList.join(", "));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -292 +292 @@
     {
         strWarning = tr(
-            "you have assigned more than <b>%1%</b> of your computer's memory "
-            "(<b>%2</b>) to the virtual machine. Not enough memory is left "
-            "for your host operating system. Please select a smaller amount.")
+            "More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. "
+            "Not enough memory is left for the host operating system. Please select a smaller amount.")
             .arg((unsigned)qRound((double)m_pSliderMemorySize->maxRAMAlw() / uFullSize * 100.0))
             .arg(vboxGlobal().formatSize((uint64_t)uFullSize * _1M));
@@ -302 +301 @@
     {
         strWarning = tr(
-            "you have assigned more than <b>%1%</b> of your computer's memory "
-            "(<b>%2</b>) to the virtual machine. There might not be enough memory "
-            "left for your host operating system. Continue at your own risk.")
+            "More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. "
+            "There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.")
             .arg((unsigned)qRound((double)m_pSliderMemorySize->maxRAMOpt() / uFullSize * 100.0))
             .arg(vboxGlobal().formatSize((uint64_t)uFullSize * _1M));
@@ -315 +313 @@
     {
         strWarning = tr(
-            "for performance reasons, the number of virtual CPUs attached to the "
-            "virtual machine may not be more than twice the number of physical "
-            "CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.")
+            "For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number "
+            "of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.")
             .arg(cTotalCPUs);
         return false;
@@ -324 +321 @@
     {
         strWarning = tr(
-            "you have assigned more virtual CPUs to the virtual machine than "
-            "the number of physical CPUs on your host system (<b>%1</b>). "
-            "This is likely to degrade the performance of your virtual machine. "
-            "Please consider reducing the number of virtual CPUs.")
+            "More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). "
+            "This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.")
             .arg(cTotalCPUs);
         return true;
@@ -336 +331 @@
     {
         strWarning = tr(
-            "you have assigned more than one virtual CPU to this VM. "
-            "This will not work unless the IO-APIC feature is also enabled. "
-            "This will be done automatically when you accept the VM Settings "
-            "by pressing the OK button.");
+            "An IO-APIC is required to support more than one virtual CPU assigned to a virtual machine. "
+            "This will be done automatically if you confirm your changes.");
         return true;
     }
@@ -347 +340 @@
     {
         strWarning = tr(
-            "you have assigned more than one virtual CPU to this VM. "
-            "This will not work unless hardware virtualization (VT-x/AMD-V) is also enabled. "
-            "This will be done automatically when you accept the VM Settings "
-            "by pressing the OK button.");
+            "A hardware virtualization is required to support more than one virtual CPU assigned to a virtual machine. "
+            "This will be done automatically if you confirm your changes.");
         return true;
     }
@@ -358 +349 @@
     {
         strWarning = tr(
-            "you have set the processor execution cap to a low value. "
-            "This can make the machine feel slow to respond.");
+            "The processor execution cap is set to a low value. This may make the machine feel slow to respond.");
         return true;
     }
@@ -367 +357 @@
     {
         strWarning = tr(
-            "you have assigned ICH9 chipset type to this VM. "
-            "It will not work properly unless the IO-APIC feature is also enabled. "
-            "This will be done automatically when you accept the VM Settings "
-            "by pressing the OK button.");
+            "An IO-APIC is required to support chip set of type ICH9 assigned to a virtual machine. "
+            "This will be done automatically if you confirm your changes.");
         return true;
     }
@@ -378 +366 @@
     {
         strWarning = tr(
-            "you have enabled a USB HID (Human Interface Device). "
-            "This will not work unless USB emulation is also enabled. "
-            "This will be done automatically when you accept the VM Settings "
-            "by pressing the OK button.");
+            "A USB emulation is required to support USB mouse/tablet device attached to a virtual machine. "
+            "This will be done automatically if you confirm your changes.");
         return true;
     }