Changeset 56106 in vbox

Timestamp:

May 27, 2015 3:47:23 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100631

Message:

FE/Qt: VM settings: System page: NLS consistency fix.

Location:

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

Files:

• UIMachineSettingsSystem.cpp (modified) (2 diffs)
• UIMachineSettingsSystem.ui (modified) (3 diffs)

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

@@ -444 +444 @@
 
     /* Retranslate the memory slider legend: */
-    m_pLabelMemoryMin->setText(tr("<qt>%1&nbsp;MB</qt>").arg(m_pSliderMemorySize->minRAM()));
-    m_pLabelMemoryMax->setText(tr("<qt>%1&nbsp;MB</qt>").arg(m_pSliderMemorySize->maxRAM()));
+    m_pEditorMemorySize->setSuffix(QString(" %1").arg(tr("MB")));
+    m_pLabelMemoryMin->setText(tr("%1 MB").arg(m_pSliderMemorySize->minRAM()));
+    m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_pSliderMemorySize->maxRAM()));
 
     /* Retranslate the cpu slider legend: */
-    m_pLabelCPUMin->setText(tr("<qt>%1&nbsp;CPU</qt>", "%1 is 1 for now").arg(m_uMinGuestCPU));
-    m_pLabelCPUMax->setText(tr("<qt>%1&nbsp;CPUs</qt>", "%1 is host cpu count * 2 for now").arg(m_uMaxGuestCPU));
+    m_pLabelCPUMin->setText(tr("%1 CPU", "%1 is 1 for now").arg(m_uMinGuestCPU));
+    m_pLabelCPUMax->setText(tr("%1 CPUs", "%1 is host cpu count * 2 for now").arg(m_uMaxGuestCPU));
 
     /* Retranslate the cpu cap slider legend: */
-    m_pLabelCPUExecCapMin->setText(tr("<qt>%1%</qt>", "Min CPU execution cap in %").arg(m_uMinGuestCPUExecCap));
-    m_pLabelCPUExecCapMax->setText(tr("<qt>%1%</qt>", "Max CPU execution cap in %").arg(m_uMaxGuestCPUExecCap));
+    m_pLabelCPUExecCapMin->setText(tr("%1%", "Min CPU execution cap in %").arg(m_uMinGuestCPUExecCap));
+    m_pLabelCPUExecCapMax->setText(tr("%1%", "Max CPU execution cap in %").arg(m_uMaxGuestCPUExecCap));
 
     /* Retranslate combo-boxes: */
@@ -470 +471 @@
     m_pLabelMemoryMin->setEnabled(isMachineOffline());
     m_pLabelMemoryMax->setEnabled(isMachineOffline());
-    m_pLabelMemoryUnits->setEnabled(isMachineOffline());
     m_pSliderMemorySize->setEnabled(isMachineOffline());
     m_pEditorMemorySize->setEnabled(isMachineOffline());

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

@@ -88 +88 @@
        </item>
        <item row="0" column="3">
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QSpinBox" name="m_pEditorMemorySize">
-           <property name="whatsThis">
-            <string>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="m_pLabelMemoryUnits">
-           <property name="text">
-            <string>MB</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QSpinBox" name="m_pEditorMemorySize">
+         <property name="whatsThis">
+          <string>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</string>
+         </property>
+        </widget>
        </item>
        <item row="2" column="0">
@@ -344 +333 @@
         <widget class="QCheckBox" name="m_pCheckBoxUseUTC" >
          <property name="whatsThis" >
-          <string>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</string>
+          <string>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</string>
          </property>
          <property name="text" >
@@ -502 +491 @@
          <property name="whatsThis">
           <string>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</string>
+         </property>
+         <property name="suffix">
+          <string>%</string>
          </property>
         </widget>