Changeset 43477 in vbox

Timestamp:

Oct 1, 2012 9:04:13 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Adding translatable 'Controller' word to corresponding storage details in different GUI places.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• nls/VirtualBox_ru.ts (modified) (4 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts

@@ -5148 +5148 @@
     <message>
         <source>IDE Controller</source>
-        <translation>IDE контроллер</translation>
+        <translation type="obsolete">IDE контроллер</translation>
     </message>
     <message>
         <source>SATA Controller</source>
-        <translation>SATA контроллер</translation>
+        <translation type="obsolete">SATA контроллер</translation>
     </message>
     <message>
         <source>SCSI Controller</source>
-        <translation>SCSI контроллер</translation>
+        <translation type="obsolete">SCSI контроллер</translation>
     </message>
     <message>
         <source>Floppy Controller</source>
-        <translation>Floppy контроллер</translation>
+        <translation type="obsolete">Floppy контроллер</translation>
     </message>
     <message>
@@ -5280 +5280 @@
     <message>
         <source>SAS Controller</source>
-        <translation>SAS контроллер</translation>
+        <translation type="obsolete">SAS контроллер</translation>
     </message>
     <message>
@@ -5407 +5407 @@
         <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
         <translation>Задаёт количество портов контроллера носителей информации типа SATA, выбранного в данный момент в дереве носителей информации. Это значение не может быть меньше, чем максимальный номер использованного порта + 1.</translation>
+    </message>
+    <message>
+        <source>%1: %2</source>
+        <comment>controller name wrapper</comment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <source>Controller</source>
+        <translation>Контроллер</translation>
     </message>
 </context>
@@ -9249 +9258 @@
     <message>
         <source>IDE Controller</source>
-        <translation>IDE контроллер</translation>
+        <translation type="obsolete">IDE контроллер</translation>
     </message>
     <message>
         <source>SATA Controller</source>
-        <translation>SATA контроллер</translation>
+        <translation type="obsolete">SATA контроллер</translation>
     </message>
     <message>
         <source>SCSI Controller</source>
-        <translation>SCSI контроллер</translation>
+        <translation type="obsolete">SCSI контроллер</translation>
     </message>
     <message>
         <source>Floppy Controller</source>
-        <translation>Floppy контроллер</translation>
+        <translation type="obsolete">Floppy контроллер</translation>
     </message>
     <message>
         <source>SAS Controller</source>
-        <translation>SAS контроллер</translation>
+        <translation type="obsolete">SAS контроллер</translation>
     </message>
     <message>

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -544 +544 @@
             {
                 QString header = "<tr><td></td><td colspan=2><nobr>%1</nobr></td></tr>";
-                storageStat += header.arg (ctrName);
+                QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
+                storageStat += header.arg(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()));
                 int scsiIndex = 0;
                 foreach (const CMediumAttachment &attachment, attachments)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -1453 +1453 @@
             const CStorageController &controller = controllers[i];
             /* Add controller information: */
-            item += QString(sSectionItemTpl3).arg(controller.GetName());
+            QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
+            item += QString(sSectionItemTpl3).arg(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()));
             ++ rows;
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -439 +439 @@
             {
                 /* Add controller information: */
-                m_text << UITextTableLine(controller.GetName(), QString());
+                QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
+                m_text << UITextTableLine(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()), QString());
                 fSomeInfo = true;
                 /* Populate map (its sorted!): */

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

@@ -541 +541 @@
 QString ControllerItem::text() const
 {
-    return ctrName();
+    QString strControllerNameWrapper = UIMachineSettingsStorage::tr("%1: %2", "controller name wrapper");
+    return strControllerNameWrapper.arg(UIMachineSettingsStorage::tr("Controller"), ctrName());
 }
 
@@ -2307 +2308 @@
 void UIMachineSettingsStorage::addIDEController()
 {
-    addControllerWrapper (generateUniqueName (tr ("IDE Controller")), KStorageBus_IDE, KStorageControllerType_PIIX4);
+    addControllerWrapper (generateUniqueName ("IDE"), KStorageBus_IDE, KStorageControllerType_PIIX4);
 }
 
 void UIMachineSettingsStorage::addSATAController()
 {
-    addControllerWrapper (generateUniqueName (tr ("SATA Controller")), KStorageBus_SATA, KStorageControllerType_IntelAhci);
+    addControllerWrapper (generateUniqueName ("SATA"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
 }
 
 void UIMachineSettingsStorage::addSCSIController()
 {
-    addControllerWrapper (generateUniqueName (tr ("SCSI Controller")), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
+    addControllerWrapper (generateUniqueName ("SCSI"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
 }
 
 void UIMachineSettingsStorage::addFloppyController()
 {
-    addControllerWrapper (generateUniqueName (tr ("Floppy Controller")), KStorageBus_Floppy, KStorageControllerType_I82078);
+    addControllerWrapper (generateUniqueName ("Floppy"), KStorageBus_Floppy, KStorageControllerType_I82078);
 }
 
 void UIMachineSettingsStorage::addSASController()
 {
-    addControllerWrapper (generateUniqueName (tr ("SAS Controller")), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
+    addControllerWrapper (generateUniqueName ("SAS"), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -304 +304 @@
         case KStorageBus_IDE:
         {
-            strControllerName = tr("IDE Controller");
+            strControllerName = "IDE";
             ++m_iIDECount;
             if (m_iIDECount > 1)
@@ -312 +312 @@
         case KStorageBus_SATA:
         {
-            strControllerName = tr("SATA Controller");
+            strControllerName = "SATA";
             ++m_iSATACount;
             if (m_iSATACount > 1)
@@ -320 +320 @@
         case KStorageBus_SCSI:
         {
-            strControllerName = tr("SCSI Controller");
+            strControllerName = "SCSI";
             ++m_iSCSICount;
             if (m_iSCSICount > 1)
@@ -328 +328 @@
         case KStorageBus_Floppy:
         {
-            strControllerName = tr("Floppy Controller");
+            strControllerName = "Floppy";
             ++m_iFloppyCount;
             if (m_iFloppyCount > 1)
@@ -336 +336 @@
         case KStorageBus_SAS:
         {
-            strControllerName = tr("SAS Controller");
+            strControllerName = "SAS";
             ++m_iSASCount;
             if (m_iSASCount > 1)