Changeset 40864 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 11, 2012 8:36:28 AM (13 years ago)

Author:

vboxsync

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

77401

Message:

FE/Qt: fixed a string to work better with the Qt numerus mechanism.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIMessageCenter.cpp (modified) (1 diff)
• VBoxGlobal.cpp (modified) (1 diff)

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

@@ -2384 +2384 @@
 {
     return messageOkCancel(pParent ? pParent : mainWindowShown(), Warning,
-        tr("<p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p>"
+        tr("<p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p>"
            "<p>If you continue the runtime state of the exported machine(s) "
-           "will be discarded. Note that the existing machine(s) are not "
-           "changed.</p>", "",
+           "will be discarded. The other machine(s) will not be changed.</p>", "",
            strMachineNames.size()).arg(VBoxGlobal::toHumanReadableList(strMachineNames)),
         0 /* pcszAutoConfirmId */,

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

@@ -3674 +3674 @@
 {
     QString strList;
-    if (list.size() == 1)
-        strList = list.at(0);
-    else if (list.size() > 1)
-    {
-        for (int i = 0; i < list.size() - 1; ++i)
-        {
-            strList += list.at(i);
-            if (i < list.size() - 2)
-                strList += + ", ";
-        }
-        strList += " " + tr("and") + " " + list.at(list.size() - 1);
+    for (int i = 0; i < list.size(); ++i)
+    {
+        strList += list.at(i);
+        if (i < list.size() - 1)
+            strList += + " ";
     }
     return strList;