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

Timestamp:

May 29, 2012 1:42:29 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Wizards stuff: NLS update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic3.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic4.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (2 diffs)
• wizards/clonevm/UIWizardCloneVMPageBasic1.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVMPageBasic2.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVMPageBasic3.cpp (modified) (2 diffs)
• wizards/clonevm/UIWizardCloneVMPageExpert.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic1.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic2.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic3.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -2320 +2320 @@
 {
     return message(pParent, Warning,
-        tr("<p>You didn't attach a hard disk to the new virtual machine. "
+        tr("<p>You didn't attach a hard drive to the new virtual machine. "
            "The machine will not be able to boot unless you attach "
-           "a hard disk with a guest operating system or some other bootable "
-           "media to it later using the machine settings dialog or the First "
-           "Run Wizard.</p><p>Do you wish to continue?</p>"),
+           "a hard drive with a guest operating system or some other bootable "
+           "media to it later using the machine settings window or the Start-up "
+           "wizard.</p><p>Do you wish to continue?</p>"),
         0, /* pcszAutoConfirmId */
         QIMessageBox::Ok,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -116 +116 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVD::tr("File type"));
+    setTitle(UIWizardCloneVD::tr("Hard drive file type"));
 
     /* Translate widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp

@@ -117 +117 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVD::tr("Storage details"));
+    setTitle(UIWizardCloneVD::tr("Storage on physical hard drive"));
 
     /* Translate widgets: */
-    m_pDescriptionLabel->setText(UIWizardCloneVD::tr("Please choose whether the new virtual hard drive file should be "
-                                                     "allocated as it is used or if it should be created fully allocated."));
+    m_pDescriptionLabel->setText(UIWizardCloneVD::tr("Please choose whether the new virtual hard drive file should grow as it is used "
+                                                     "(dynamically allocated) or if it should be created at its maximum size (fixed size)."));
     m_pDynamicLabel->setText(UIWizardCloneVD::tr("<p>A <b>dynamically allocated</b> hard drive file will only use space "
-                                                 "on your physical hard drive as it fills up (up to a <b>fixed maximum size</b>), "
+                                                 "on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), "
                                                  "although it will not shrink again automatically when space on it is freed.</p>"));
     m_pFixedLabel->setText(UIWizardCloneVD::tr("<p>A <b>fixed size</b> hard drive file may take longer to create on some "

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp

@@ -192 +192 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVD::tr("Copy location"));
+    setTitle(UIWizardCloneVD::tr("New hard drive to create"));
 
     /* Translate widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -210 +210 @@
     m_pSourceDiskCnt->setTitle(UIWizardCloneVD::tr("Hard drive to &copy"));
     m_pSourceDiskOpenButton->setToolTip(UIWizardCloneVD::tr("Choose a virtual hard drive file to copy..."));
-    m_pDestinationCnt->setTitle(UIWizardCloneVD::tr("Copy &location"));
+    m_pDestinationCnt->setTitle(UIWizardCloneVD::tr("&New hard drive to create"));
     m_pDestinationDiskOpenButton->setToolTip(UIWizardCloneVD::tr("Choose a location for new virtual hard drive file..."));
-    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("File &type"));
+    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("Hard drive file &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
@@ -219 +219 @@
         pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
-    m_pVariantCnt->setTitle(UIWizardCloneVD::tr("Storage details"));
+    m_pVariantCnt->setTitle(UIWizardCloneVD::tr("Storage on physical hard drive"));
     m_pDynamicalButton->setText(UIWizardCloneVD::tr("&Dynamically allocated"));
     m_pFixedButton->setText(UIWizardCloneVD::tr("&Fixed size"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp

@@ -78 +78 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVM::tr("Name"));
+    setTitle(UIWizardCloneVM::tr("New machine name"));
 
     /* Translate widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp

@@ -87 +87 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVM::tr("Type"));
+    setTitle(UIWizardCloneVM::tr("Clone type"));
 
     /* Translate widgets: */
-    QString strLabel = UIWizardCloneVM::tr("<p>Please select the type of the clone.</p>"
+    QString strLabel = UIWizardCloneVM::tr("<p>Please choose the type of clone you wish to create.</p>"
                                            "<p>If you choose <b>Full clone</b>, "
-                                           "an exact copy (including all virtual hard drive images) "
-                                           "of the original VM will be created.</p>"
-                                           "<p>If you select <b>Linked clone</b>, "
-                                           "a new VM will be created, but the virtual hard drive images "
-                                           "will point to the virtual hard drive images of original VM.</p>");
+                                           "an exact copy (including all virtual hard drive files) "
+                                           "of the original virtual machine will be created.</p>"
+                                           "<p>If you choose <b>Linked clone</b>, "
+                                           "a new machine will be created, but the virtual hard drive files "
+                                           "will be tied to the virtual hard drive files of original machine "
+                                           "and you will not be able to move the new virtual machine "
+                                           "to a different computer without moving the original as well.</p>");
     if (m_fAdditionalInfo)
-        strLabel += UIWizardCloneVM::tr("<p>Note that a new snapshot within the source VM is created in case you select <b>Linked clone</b>.</p>");
+        strLabel += UIWizardCloneVM::tr("<p>If you create a <b>Linked clone</b> then a new snapshot will be created "
+                                        "in the original virtual machine as part of the cloning process.</p>");
     m_pLabel->setText(strLabel);
 
-    m_pFullCloneRadio->setText(UIWizardCloneVM::tr("Full clone"));
-    m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("Linked clone"));
+    m_pFullCloneRadio->setText(UIWizardCloneVM::tr("&Full clone"));
+    m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("&Linked clone"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp

@@ -88 +88 @@
 {
     /* Translate page: */
-    setTitle(UIWizardCloneVM::tr("Mode"));
+    setTitle(UIWizardCloneVM::tr("Snapshots"));
 
     /* Translate widgets: */
-    const QString strGeneral = UIWizardCloneVM::tr("<p>Please choose which parts of the virtual machine should be cloned.</p>");
-    const QString strOpt1    = UIWizardCloneVM::tr("<p>If you select <b>Current machine state</b>, "
-                                                   "only the current state of the virtual machine is cloned.</p>");
-    const QString strOpt2    = UIWizardCloneVM::tr("<p>If you select <b>Current machine and all child states</b>, "
-                                                   "the current state of the virtual machine and any states of child snapshots are cloned.</p>");
-    const QString strOpt3    = UIWizardCloneVM::tr("<p>If you select <b>All states</b>, "
-                                                   "the current machine state and all snapshots are cloned.</p>");
+    const QString strGeneral = UIWizardCloneVM::tr("<p>Please choose which parts of the snapshot tree "
+                                                   "should be cloned with the machine.</p>");
+    const QString strOpt1    = UIWizardCloneVM::tr("<p>If you choose <b>Current machine state</b>, "
+                                                   "the new machine will reflect the current state "
+                                                   "of the original machine and will have no snapshots.</p>");
+    const QString strOpt2    = UIWizardCloneVM::tr("<p>If you choose <b>Current snapshot tree branch</b>, "
+                                                   "the new machine will reflect the current state "
+                                                   "of the original machine and will have matching snapshots "
+                                                   "for all snapshots in the tree branch "
+                                                   "starting at the current state in the original machine.</p>");
+    const QString strOpt3    = UIWizardCloneVM::tr("<p>If you choose <b>Everything</b>, "
+                                                   "the new machine will reflect the current state "
+                                                   "of the original machine and will have matching snapshots "
+                                                   "for all snapshots in the original machine.</p>");
     if (m_fShowChildsOption)
         m_pLabel->setText(QString("<p>%1</p><p>%2 %3 %4</p>")
@@ -110 +117 @@
                           .arg(strOpt3));
 
-    m_pMachineRadio->setText(UIWizardCloneVM::tr("Current machine state"));
-    m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current machine and all child states"));
-    m_pAllRadio->setText(UIWizardCloneVM::tr("All states"));
+    m_pMachineRadio->setText(UIWizardCloneVM::tr("Current &machine state"));
+    m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current &snapshot tree branch"));
+    m_pAllRadio->setText(UIWizardCloneVM::tr("&Everything"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp

@@ -118 +118 @@
 {
     /* Translate widgets: */
-    m_pNameCnt->setTitle(UIWizardCloneVM::tr("&Name"));
-    m_pCloneTypeCnt->setTitle(UIWizardCloneVM::tr("&Type"));
-    m_pFullCloneRadio->setText(UIWizardCloneVM::tr("Full Clone"));
-    m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("Linked Clone"));
-    m_pCloneModeCnt->setTitle(UIWizardCloneVM::tr("&Mode"));
-    m_pMachineRadio->setText(UIWizardCloneVM::tr("Current machine state"));
-    m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current machine and all child states"));
-    m_pAllRadio->setText(UIWizardCloneVM::tr("All states"));
+    m_pNameCnt->setTitle(UIWizardCloneVM::tr("New machine &name"));
+    m_pCloneTypeCnt->setTitle(UIWizardCloneVM::tr("Clone type"));
+    m_pFullCloneRadio->setText(UIWizardCloneVM::tr("&Full Clone"));
+    m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("&Linked Clone"));
+    m_pCloneModeCnt->setTitle(UIWizardCloneVM::tr("Snapshots"));
+    m_pMachineRadio->setText(UIWizardCloneVM::tr("Current &machine state"));
+    m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current &snapshot tree branch"));
+    m_pAllRadio->setText(UIWizardCloneVM::tr("&Everything"));
     m_pReinitMACsCheckBox->setToolTip(UIWizardCloneVM::tr("When checked a new unique MAC address will be assigned to all configured network cards."));
     m_pReinitMACsCheckBox->setText(UIWizardCloneVM::tr("&Reinitialize the MAC address of all network cards"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -116 +116 @@
 {
     /* Translate page: */
-    setTitle(UIWizardNewVD::tr("File type"));
+    setTitle(UIWizardNewVD::tr("Hard drive file type"));
 
     /* Translate widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp

@@ -117 +117 @@
 {
     /* Translate page: */
-    setTitle(UIWizardNewVD::tr("Storage details"));
+    setTitle(UIWizardNewVD::tr("Storage on physical hard drive"));
 
     /* Translate widgets: */
-    m_pDescriptionLabel->setText(UIWizardNewVD::tr("Please choose whether the new virtual hard drive file should be "
-                                                   "allocated as it is used or if it should be created fully allocated."));
+    m_pDescriptionLabel->setText(UIWizardNewVD::tr("Please choose whether the new virtual hard drive file should grow as it is used "
+                                                   "(dynamically allocated) or if it should be created at its maximum size (fixed size)."));
     m_pDynamicLabel->setText(UIWizardNewVD::tr("<p>A <b>dynamically allocated</b> hard drive file will only use space "
-                                               "on your physical hard drive as it fills up (up to a <b>fixed maximum size</b>), "
+                                               "on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), "
                                                "although it will not shrink again automatically when space on it is freed.</p>"));
     m_pFixedLabel->setText(UIWizardNewVD::tr("<p>A <b>fixed size</b> hard drive file may take longer to create on some "

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

@@ -363 +363 @@
                                                 "click on the folder icon to select a different folder to create the file in."));
     m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard drive file..."));
-    m_pSizeLabel->setText(UIWizardNewVD::tr("Select the size of the virtual hard drive in megabytes. This size will be reported "
-                                            "to the Guest OS as the maximum size of this hard drive."));
+    m_pSizeLabel->setText(UIWizardNewVD::tr("Select the size of the virtual hard drive in megabytes. "
+                                            "This size is the limit on the amount of file data "
+                                            "that a virtual machine will be able to store on the hard drive."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -227 +227 @@
     m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard drive file..."));
     m_pSizeCnt->setTitle(UIWizardNewVD::tr("&Size"));
-    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File &type"));
+    m_pFormatCnt->setTitle(UIWizardNewVD::tr("Hard drive file &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
@@ -234 +234 @@
         pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
-    m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage details"));
+    m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage on physical hard drive"));
     m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
     m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));

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

@@ -208 +208 @@
                                         .arg(strRecommendedHDD));
     m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add virtual hard drive"));
-    m_pDiskCreate->setText(UIWizardNewVM::tr("&Create new virtual hard drive"));
+    m_pDiskCreate->setText(UIWizardNewVM::tr("&Create virtual hard drive now"));
     m_pDiskPresent->setText(UIWizardNewVM::tr("&Use existing virtual hard drive file"));
     m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard drive file..."));

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

@@ -227 +227 @@
     m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard drive"));
     m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add virtual hard drive"));
-    m_pDiskCreate->setText(UIWizardNewVM::tr("&Create new virtual hard drive"));
+    m_pDiskCreate->setText(UIWizardNewVM::tr("&Create virtual hard drive now"));
     m_pDiskPresent->setText(UIWizardNewVM::tr("&Use existing virtual hard drive file"));
     m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard drive file..."));