Fixed grammar in text messages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1615 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java

@@ -8,14 +8,14 @@ public class FarStringDefinition {
     public static final String CREATE_STEP_ONE_TITLE = 
         "Create Framework Archive(FAR) - Step 1: Set FAR's basic information";
     public static final String CREATE_STEP_TWO_TITLE = 
-        "Create Framework Archive(FAR) - Step 2: Choose Packages and Platforms";
+        "Create Framework Archive(FAR) - Step 2: Choose Packages and/or Platforms";
     public static final String CREATE_STEP_THREE_TITLE = 
         "Create Framework Archive(FAR) - Step 3: Set file filter";
     public static final String CREATE_STEP_FOUR_TITLE = 
         "Create Framework Archive(FAR) - Step 4: Choose target file and finish";
 
     public static final String DELETE_STEP_ONE_TITLE = 
-        "Delete Framework Archive(FAR) - Step 1: Choose FAR from framework database";
+        "Delete Framework Archive(FAR) - Step 1: Choose FAR from current WORKSPACE";
     public static final String DELETE_STEP_TWO_TITLE = 
         "Delete Framework Archive(FAR) - Step 2: Choose delete mode and finish";
     
@@ -25,9 +25,9 @@ public class FarStringDefinition {
         "Update Framework Archive(FAR) - Step 2: Summary";
     
     public static final String INSTALL_STEP_ONE_TITLE = 
-        "Install Framework Archive(FAR) - Step 1: Browse FAR file";
+        "Install Framework Archive(FAR) - Step 1: Select FAR file";
     public static final String INSTALL_STEP_TWO_TITLE = 
-        "Install Framework Archive(FAR) - Step 2: Set path for packages or/and platforms";
+        "Install Framework Archive(FAR) - Step 2: Set path for packages and/or platforms";
     
     ///
     /// 

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java

@@ -211,7 +211,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
             jLabel2.setText("File to Save:  ");
             jLabel = new JLabel();
             jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));
-            jLabel.setText("This FAR will depend on following packages: ");
+            jLabel.setText("This FAR will depend on the following packages: ");
             jLabel.setVisible(false);
             jContentPane = new JPanel();
             jContentPane.setLayout(null);

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java

@@ -126,7 +126,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldBaseName == null) {
             jTextFieldBaseName = new JTextField();
             jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 520, 20));
-            jTextFieldBaseName.setToolTipText("An brief Identifier, such as USB I/O Library, of the module");
+            jTextFieldBaseName.setToolTipText("A brief Identifier, such as USB I/O Drivers, of the Framework Archive.");
         }
         return jTextFieldBaseName;
     }
@@ -188,7 +188,8 @@ public class CreateStepOne extends IDialog implements MouseListener {
             jTextAreaLicense = new JTextArea();
             jTextAreaLicense.setText("");
             jTextAreaLicense.setLineWrap(true);
-            jTextAreaLicense.setToolTipText("The License for this file");
+            jTextAreaLicense.setWrapStyleWord(true);
+            jTextAreaLicense.setToolTipText("The License for this FAR file.");
         }
         return jTextAreaLicense;
     }
@@ -203,7 +204,8 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextAreaDescription == null) {
             jTextAreaDescription = new JTextArea();
             jTextAreaDescription.setLineWrap(true);
-            jTextAreaDescription.setToolTipText("A verbose description of the module");
+            jTextAreaDescription.setWrapStyleWord(true);
+            jTextAreaDescription.setToolTipText("A verbose description of the FAR contents.");
         }
         return jTextAreaDescription;
     }
@@ -266,7 +268,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldAbstract == null) {
             jTextFieldAbstract = new JTextField();
             jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 520, 20));
-            jTextFieldAbstract.setToolTipText("A one sentence description of this module");
+            jTextFieldAbstract.setToolTipText("A one sentence description of this FAR package.");
         }
         return jTextFieldAbstract;
     }
@@ -497,11 +499,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check BaseName
         //
         if (isEmpty(this.jTextFieldBaseName.getText())) {
-            Log.wrn("Create far", "Base Name couldn't be empty");
+            Log.wrn("Create far", "FAR Name must be entered.");
             return false;
         }
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {
-            Log.wrn("Create far", "Incorrect data type for Base Name");
+            Log.wrn("Create far", "Incorrect data type for FAR Name");
             return false;
         }
         farHeader.setFarName(this.jTextFieldBaseName.getText());
@@ -510,7 +512,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Guid
         //
         if (isEmpty(this.jTextFieldGuid.getText())) {
-            Log.wrn("Create far", "Guid Value couldn't be empty");
+            Log.wrn("Create far", "A GUID must be entered.");
             return false;
         }
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
@@ -523,7 +525,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Version
         //
         if (isEmpty(this.jTextFieldVersion.getText())) {
-            Log.wrn("Create far", "Version couldn't be empty");
+            Log.wrn("Create far", "A Version must be entered.");
             return false;
         }
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {
@@ -536,7 +538,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Abstact
         //
         if (isEmpty(this.jTextFieldAbstract.getText())) {
-            Log.wrn("Create far", "Abstract couldn't be empty");
+            Log.wrn("Create far", "An Abstract must be entered.");
             return false;
         }
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {
@@ -549,7 +551,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Description
         //
         if (isEmpty(this.jTextAreaDescription.getText())) {
-            Log.wrn("Create far", "Description couldn't be empty");
+            Log.wrn("Create far", "A Description must be entered.");
             return false;
         }
         farHeader.setDescription(this.jTextAreaDescription.getText());
@@ -558,7 +560,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Copyright
         //
         if (isEmpty(this.jTextAreaCopyright.getText())) {
-            Log.wrn("Create far", "Copyright couldn't be empty");
+            Log.wrn("Create far", "The Copyright must be entered.");
             return false;
         }
         farHeader.setCopyright(this.jTextAreaCopyright.getText());
@@ -567,7 +569,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check License
         //
         if (isEmpty(this.jTextAreaLicense.getText())) {
-            Log.wrn("Create far", "License couldn't be empty");
+            Log.wrn("Create far", "The License must be entered.");
             return false;
         }
         farHeader.setLicense(this.jTextAreaLicense.getText());

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java

@@ -78,8 +78,8 @@ public class CreateStepThree extends IDialog implements MouseListener {
         if (jTextArea == null) {
             jTextArea = new JTextArea();
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));
-            jTextArea.setText("Add more file filter regular expressions in text field separated with space. \n");
+            jTextArea.setText("Add additional file filter regular expressions in the text field, separated by space characters.\n");
-            jTextArea.append("Note that regular expressions please reference PERL language. ");
+            jTextArea.append("Note, for additional information about regular expressions, please reference PERL language regular expressions.");
             jTextArea.setEditable(false);
         }
         return jTextArea;
@@ -209,7 +209,7 @@ public class CreateStepThree extends IDialog implements MouseListener {
         if (jContentPane == null) {
             jLabel1 = new JLabel();
             jLabel1.setBounds(new java.awt.Rectangle(30, 220, 260, 20));
-            jLabel1.setText("Input File Filter Pattern (Ref to ...)");
+            jLabel1.setText("Input File Filter Pattern (regular expressions)");
             jLabel = new JLabel();
             jLabel.setBounds(new java.awt.Rectangle(30, 64, 160, 20));
             jLabel.setText("File Filter Pattern: ");

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java

@@ -252,7 +252,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
             //
             if (jComboBoxPlatform.getAllCheckedItemsIndex().size() == 0
                 && jComboBoxPackage.getAllCheckedItemsIndex().size() == 0) {
-                Log.wrn("Create far", "At least choose one of packages and platforms. ");
+                Log.wrn("Create far", "Choose at least one package and/or platform.");
                 return;
             }
             if (stepThree == null) {

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java

@@ -128,12 +128,12 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
     private JTextArea getJTextArea1() {
         if (jTextAreaInstruction == null) {
             jTextAreaInstruction = new JTextArea();
-            jTextAreaInstruction.setBounds(new java.awt.Rectangle(30, 7, 642, 50));
+            jTextAreaInstruction.setBounds(new java.awt.Rectangle(30, 7, 662, 50));
-            jTextAreaInstruction.setText("Step 1: Choose FAR from framework database. \n");
+            jTextAreaInstruction.setText("Step 1: Select FAR to remove.\n");
             jTextAreaInstruction.setCaretColor(Color.RED);
             jTextAreaInstruction
-                                .append("After choose FAR, the packages and platforms which belong to the FAR will display. \n");
+                                .append("After choosing the FAR, the packages and/or platforms that belong to the FAR will displayed.\n");
-            jTextAreaInstruction.append("Picture \"Okay\" or \"No\" indicates whether FAR can be removed or not. ");
+            jTextAreaInstruction.append("Icon \"OK\" or \"NO\" indicates whether the FAR can be safely removed.");
             jTextAreaInstruction.setEditable(false);
         }
         return jTextAreaInstruction;
@@ -269,7 +269,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
             jLabelImage = new JLabel();
             jLabelImage.setBounds(new java.awt.Rectangle(30, 319, 36, 36));
             jLabel4 = new JLabel();
-            jLabel4.setBounds(new java.awt.Rectangle(71, 325, 289, 20));
+            jLabel4.setBounds(new java.awt.Rectangle(71, 325, 320, 20));
             jLabel3 = new JLabel();
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));
             jLabel3.setText("FAR's Platforms");
@@ -338,12 +338,12 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
 
             if (flag) {
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/Yes.JPG")));
-                jLabel4.setText("Without any remain packages depend on this FAR. ");
+                jLabel4.setText("None of the remaining packages depend on this FAR. ");
                 jButtonDetail.setVisible(false);
                 jButtonNext.setEnabled(true);
             } else {
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));
-                jLabel4.setText("Some remain packages still depend on this FAR. ");
+                jLabel4.setText("Some of the remaining packages still depend on this FAR. ");
                 //        jButtonDetail.setVisible(true);
                 jButtonNext.setEnabled(false);
             }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java

@@ -123,8 +123,8 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
             jTextArea = new JTextArea();
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));
             jTextArea.setText("Step 2: Choose Delete Mode. \n");
-            jTextArea.append("Mode 1 only remove register information from framework database. \n");
+            jTextArea.append("Mode 1 Only remove registation information from the WORKSPACE. \n");
-            jTextArea.append("Mode 2 also delete all files from file system. ");
+            jTextArea.append("Mode 2 Also delete all files and directories from file system. ");
             jTextArea.setEditable(false);
         }
         return jTextArea;
@@ -138,9 +138,9 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton() {
         if (jRadioButton == null) {
             jRadioButton = new JRadioButton();
-            jRadioButton.setBounds(new java.awt.Rectangle(40,100,340,20));
+            jRadioButton.setBounds(new java.awt.Rectangle(40,100,440,20));
             jRadioButton.setSelected(true);
-            jRadioButton.setText("Mode 1: Only remove from framework database");
+            jRadioButton.setText("Mode 1: Only remove registration information from the WORKSPACE.");
         }
         return jRadioButton;
     }
@@ -153,8 +153,8 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton1() {
         if (jRadioButton1 == null) {
             jRadioButton1 = new JRadioButton();
-            jRadioButton1.setBounds(new java.awt.Rectangle(40,140,358,20));
+            jRadioButton1.setBounds(new java.awt.Rectangle(40,140,440,20));
-            jRadioButton1.setText("Mode 2: Delete all related files from workspace");
+            jRadioButton1.setText("Mode 2: Delete ALL related files and directories from the WORKSPACE.");
         }
         return jRadioButton1;
     }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java

@@ -234,8 +234,8 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {
         if (jContentPane == null) {
             jLabelWarning = new JLabel();
-            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 410, 20));
+            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 510, 20));
-            jLabelWarning.setText("Can't install this FAR, lack following packages in current workspace");
+            jLabelWarning.setText("Cannot install this FAR, the WORKSPACE is missing the following required packages.");
             jLabelWarning.setVisible(false);
             jLabel = new JLabel();
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));
@@ -263,7 +263,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
             //
             File farFile = new File(jTextFieldFarFile.getText());
             if (!farFile.exists() || !farFile.isFile()) {
-                Log.wrn("Install far", "Please choose a FAR file already exists. ");
+                Log.wrn("Install far", "Please choose an existing FAR file.");
                 return;
             }
 

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java

@@ -100,9 +100,9 @@ public class InstallStepTwo extends IDialog implements MouseListener {
         if (jTextArea == null) {
             jTextArea = new JTextArea();
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));
-            jTextArea.setText("Step 2: Set Path for Packages and Platforms. \n");
+            jTextArea.setText("Step 2: Set Install Path for Packages and/or Platforms.\n");
             jTextArea.setCaretColor(Color.RED);
-            jTextArea.append("Note that path is relative to WORKSPACE. ");
+            jTextArea.append("Note that the Install Path is Relative to WORKSPACE. ");
             jTextArea.setEditable(false);
         }
         return jTextArea;
@@ -302,10 +302,10 @@ public class InstallStepTwo extends IDialog implements MouseListener {
         if (jContentPane == null) {
             jLabel1 = new JLabel();
             jLabel1.setBounds(new java.awt.Rectangle(30, 195, 348, 18));
-            jLabel1.setText("Edit pathes for platforms: ");
+            jLabel1.setText("Edit \"Install To\" paths for platforms: ");
             jLabel = new JLabel();
             jLabel.setBounds(new java.awt.Rectangle(29, 60, 366, 20));
-            jLabel.setText("Edit pathes for packages");
+            jLabel.setText("Edit \"Install To\" paths for packages");
             jContentPane = new JPanel();
             jContentPane.setLayout(null);
             jContentPane.add(getJTextArea(), null);
@@ -346,11 +346,11 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar
                                        + packageModel.getValueAt(i, 3));
                 if (!isPackagePathValid(toFile)) {
-                    Log.wrn("Install far", packageVector.get(i) + " path already has package now. ");
+                    Log.wrn("Install far", packageVector.get(i) + " path already contains a package.");
                     return;
                 }
                 if (allNewPath.contains(toFile)) {
-                    Log.wrn("Install far", "Path " + packageModel.getValueAt(i, 3) + " is specified by twice. ");
+                    Log.wrn("Install far", "Path " + packageModel.getValueAt(i, 3) + " is specified twice.");
                     return;
                 }
                 allNewPath.add(toFile);
@@ -365,7 +365,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar
                                        + platformModel.getValueAt(i, 3));
                 if (!isPlatformPathValid(toFile)) {
-                    Log.wrn("Install far", platformVector.get(i) + " path already has platform now. ");
+                    Log.wrn("Install far", platformVector.get(i) + " path already contains a platform.");
                     return;
                 }
                 File fpdFile = new File((String) platformModel.getValueAt(i, 3) + File.separatorChar

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java

@@ -215,7 +215,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
         if (jContentPane == null) {
             jLabel1 = new JLabel();
             jLabel1.setBounds(new java.awt.Rectangle(30, 110, 355, 18));
-            jLabel1.setText("Choose FAR from current framework database");
+            jLabel1.setText("Choose FAR from current WORKSPACE.");
             jLabel = new JLabel();
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));
             jLabel.setText("Choose FAR file: ");
@@ -242,7 +242,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             //
             farFile = new File(jTextFieldFarFile.getText());
             if (!farFile.exists() || !farFile.isFile()) {
-                Log.wrn("Update far", "Please choose a FAR file already exists. ");
+                Log.wrn("Update far", "Please choose a FAR file that already exists.");
                 return;
             }
 
@@ -261,7 +261,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             // Add more logic process here
             //
             if (jListFarFromDb.getSelectedValue() == null) {
-                Log.wrn("Update far", "Please choose a FAR from framework database. ");
+                Log.wrn("Update far", "Please choose a FAR from current WORKSPACE.");
                 return;
             }
 

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java

@@ -275,7 +275,7 @@ public class UpdateStepTwo extends IDialog implements MouseListener {
             Iterator resultIter = resultList.iterator();
             while (resultIter.hasNext()) {
                 Log.wrn("Update far", "Missing dependency package " + ((PackageIdentification) resultIter.next()).toString()
-                        + "in workspace!");
+                        + " in workspace!");
                 return;
             }