Changeset 43484 in vbox

Timestamp:

Oct 1, 2012 10:15:57 AM (13 years ago)

Author:

vboxsync

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

81039

Message:

FE/Qt: More suitable NLS use for r81029.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• nls/VirtualBox_ru.ts (modified) (1 diff)
• 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) (1 diff)

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

@@ -5409 +5409 @@
     </message>
     <message>
-        <source>%1: %2</source>
-        <comment>controller name wrapper</comment>
-        <translation>%1: %2</translation>
-    </message>
-    <message>
-        <source>Controller</source>
-        <translation>Контроллер</translation>
+        <source>Controller: %1</source>
+        <translation>Контроллер: %1</translation>
     </message>
 </context>

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

@@ -544 +544 @@
             {
                 QString header = "<tr><td></td><td colspan=2><nobr>%1</nobr></td></tr>";
-                QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
-                storageStat += header.arg(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()));
+                QString strControllerName = QApplication::translate("UIMachineSettingsStorage", "Controller: %1");
+                storageStat += header.arg(strControllerName.arg(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: */
-            QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
-            item += QString(sSectionItemTpl3).arg(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()));
+            QString strControllerName = QApplication::translate("UIMachineSettingsStorage", "Controller: %1");
+            item += QString(sSectionItemTpl3).arg(strControllerName.arg(controller.GetName()));
             ++ rows;
 

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

@@ -439 +439 @@
             {
                 /* Add controller information: */
-                QString strControllerNameWrapper = QApplication::translate("UIMachineSettingsStorage", "%1: %2", "controller name wrapper");
-                m_text << UITextTableLine(strControllerNameWrapper.arg(QApplication::translate("UIMachineSettingsStorage", "Controller"), controller.GetName()), QString());
+                QString strControllerName = QApplication::translate("UIMachineSettingsStorage", "Controller: %1");
+                m_text << UITextTableLine(strControllerName.arg(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
 {
-    QString strControllerNameWrapper = UIMachineSettingsStorage::tr("%1: %2", "controller name wrapper");
-    return strControllerNameWrapper.arg(UIMachineSettingsStorage::tr("Controller"), ctrName());
+    return UIMachineSettingsStorage::tr("Controller: %1").arg(ctrName());
 }