Changeset 56105 in vbox for trunk/src

Timestamp:

May 27, 2015 3:40:21 PM (10 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIAddDiskEncryptionPasswordDialog.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsGeneral.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp

@@ -286 +286 @@
     switch (iSection)
     {
-        case UIEncryptionDataTableSection_Status:   return tr("Status", "password table field");
-        case UIEncryptionDataTableSection_Id:       return tr("ID", "password table field");
-        case UIEncryptionDataTableSection_Password: return tr("Password", "password table field");
+        case UIEncryptionDataTableSection_Status:   return UIAddDiskEncryptionPasswordDialog::tr("Status", "password table field");
+        case UIEncryptionDataTableSection_Id:       return UIAddDiskEncryptionPasswordDialog::tr("ID", "password table field");
+        case UIEncryptionDataTableSection_Password: return UIAddDiskEncryptionPasswordDialog::tr("Password", "password table field");
         default: break;
     }
@@ -347 +347 @@
              * but be quiet, it's safe enough because the tool-tip being re-acquired every time on mouse-hovering. */
             const QStringList encryptedMediums = m_encryptedMediums.values(m_encryptionPasswords.keys().at(index.row()));
-            return tr("<nobr>Used by the following %n hard drive(s):</nobr><br>%1",
-                      "This text is never used with n == 0. "
-                      "Feel free to drop the %n where possible, "
-                      "we only included it because of problems with Qt Linguist "
-                      "(but the user can see how many hard drives are in the tool-tip "
-                      "and doesn't need to be told).",
-                      encryptedMediums.size())
-                      .arg(encryptedMediums.join("<br>"));
+            return UIAddDiskEncryptionPasswordDialog::tr("<nobr>Used by the following %n hard drive(s):</nobr><br>%1",
+                                                         "This text is never used with n == 0. "
+                                                         "Feel free to drop the %n where possible, "
+                                                         "we only included it because of problems with Qt Linguist "
+                                                         "(but the user can see how many hard drives are in the tool-tip "
+                                                         "and doesn't need to be told).",
+                                                         encryptedMediums.size())
+                                                         .arg(encryptedMediums.join("<br>"));
         }
         default:

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

@@ -276 +276 @@
            <widget class="QComboBox" name="m_pComboCipher">
             <property name="whatsThis" >
-             <string>Holds the cipher to be used for encrypting the virtual machine disks.</string>
+             <string>Selects the cipher to be used for encrypting the virtual machine disks.</string>
             </property>
            </widget>