Fixed grammar in messages.

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

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java

@@ -1905,7 +1905,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //
         // Make Module Description
         //
-        dmtnModuleDescription = new IDefaultMutableTreeNode("ModuleDescription", IDefaultMutableTreeNode.MODULE, -1);
+        dmtnModuleDescription = new IDefaultMutableTreeNode("Modules", IDefaultMutableTreeNode.MODULE, -1);
 
         //
         // First add package
@@ -1954,7 +1954,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //
         // Make Package Description
         //
-        dmtnPackageDescription = new IDefaultMutableTreeNode("PackageDescription", IDefaultMutableTreeNode.PACKAGE, -1);
+        dmtnPackageDescription = new IDefaultMutableTreeNode("Packages", IDefaultMutableTreeNode.PACKAGE, -1);
         if (GlobalData.vPackageList.size() > 0) {
             for (int index = 0; index < GlobalData.vPackageList.size(); index++) {
                 dmtnPackageDescription.add(new IDefaultMutableTreeNode(GlobalData.vPackageList.elementAt(index)
@@ -1967,7 +1967,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //
         // Make Platform Description
         //
-        dmtnPlatformDescription = new IDefaultMutableTreeNode("PlatformDescription", IDefaultMutableTreeNode.PLATFORM,
+        dmtnPlatformDescription = new IDefaultMutableTreeNode("Platforms", IDefaultMutableTreeNode.PLATFORM,
                                                               -1);
         if (GlobalData.vPlatformList.size() > 0) {
             for (int index = 0; index < GlobalData.vPlatformList.size(); index++) {
@@ -2179,7 +2179,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //
             // The module is not in existing packages
             //
-            Log.wrn("Open Module", "The module hasn't been added to any package of current workspace!");
+            Log.wrn("Open Module", "The module does not belong to any package in the current workspace!");
             return;
         }
 
@@ -2225,7 +2225,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //
             // The package is not in current workspace
             //
-            Log.wrn("Open Package", "The package hasn't been added to current workspace!");
+            Log.wrn("Open Package", "The package has not been installed in the current workspace!");
             return;
         }
 
@@ -2271,7 +2271,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //
             // The platform is not in current workspace
             //
-            Log.wrn("Open Platform", "The platform hasn't been added to current workspace!");
+            Log.wrn("Open Platform", "The platform has not been installed in the current workspace!");
             return;
         }
 
@@ -2416,8 +2416,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         iTree.addNode(new IDefaultMutableTreeNode("Data Hubs", IDefaultMutableTreeNode.MSA_DATAHUBS, true, id));
         iTree.addNode(new IDefaultMutableTreeNode("Hii Packages", IDefaultMutableTreeNode.MSA_HIIPACKAGES, true, id));
         iTree.addNode(new IDefaultMutableTreeNode("Guids", IDefaultMutableTreeNode.MSA_GUIDS, true, id));
-        iTree.addNode(new IDefaultMutableTreeNode("Externs", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));
+        iTree.addNode(new IDefaultMutableTreeNode("External Defintions", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));
-        iTree.addNode(new IDefaultMutableTreeNode("PcdCoded", IDefaultMutableTreeNode.MSA_PCDS, true, id));
+        iTree.addNode(new IDefaultMutableTreeNode("Pcd Coded", IDefaultMutableTreeNode.MSA_PCDS, true, id));
     }
 
     private void insertPackageTreeNode(Identification id) {
@@ -2442,10 +2442,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                                                   id));
         iTree.addNode(new IDefaultMutableTreeNode("Platform Definitions",
                                                   IDefaultMutableTreeNode.FPD_PLATFORMDEFINITIONS, true, id));
-        iTree.addNode(new IDefaultMutableTreeNode("Flash", IDefaultMutableTreeNode.FPD_FLASH, true, id));
+        iTree.addNode(new IDefaultMutableTreeNode("Flash Information", IDefaultMutableTreeNode.FPD_FLASH, true, id));
         iTree.addNode(new IDefaultMutableTreeNode("Framework Modules", IDefaultMutableTreeNode.FPD_FRAMEWORKMODULES,
                                                   true, id));
-        iTree.addNode(new IDefaultMutableTreeNode("Pcd Dynamic Build Declarations",
+        iTree.addNode(new IDefaultMutableTreeNode("Dynamic PCD Build Declarations",
                                                   IDefaultMutableTreeNode.FPD_PCDDYNAMICBUILDDECLARATIONS, true, id));
         iTree.addNode(new IDefaultMutableTreeNode("Build Options", IDefaultMutableTreeNode.FPD_BUILDOPTIONS, true, id));
     }
@@ -2735,16 +2735,16 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                     try {
                         wt.addModuleToPackage(mid, psa);
                     } catch (IOException e) {
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());
+                        Log.err("Update MsaFiles in Package", e.getMessage());
                         return;
                     } catch (XmlException e) {
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());
+                        Log.err("Update MsaFiles in Package", e.getMessage());
                         return;
                     } catch (Exception e) {
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());
+                        Log.err("Update MsaFiles in Package", e.getMessage());
                         return;
                     }
 
@@ -3110,7 +3110,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         CreateStepOne cso = new CreateStepOne(this, true);
         int result = cso.showDialog();
         if (result == DataType.RETURN_TYPE_OK) {
-            String strReturn = "Create Far Done!";
+            String strReturn = "Far Creation Completed!";
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,
                                           JOptionPane.INFORMATION_MESSAGE);
         }
@@ -3125,7 +3125,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         InstallStepOne iso = new InstallStepOne(this, true);
         int result = iso.showDialog();
         if (result == DataType.RETURN_TYPE_OK) {
-            String strReturn = "<html>Install Far Done! <br>The WORKSPACE will be refreshed!</html>";
+            String strReturn = "<html>Far Installalation completed!<br>Refreshing the WORKSPACE!</html>";
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,
                                           JOptionPane.INFORMATION_MESSAGE);
             this.closeAll();
@@ -3141,7 +3141,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         DeleteStepOne dso = new DeleteStepOne(this, true);
         int result = dso.showDialog();
         if (result == DataType.RETURN_TYPE_OK) {
-            String strReturn = "<html>Delete Far Done! <br>The WORKSPACE will be refreshed!</html>";
+            String strReturn = "<html>Far Deletion completed!<br>Refreshing the WORKSPACE!</html>";
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,
                                           JOptionPane.INFORMATION_MESSAGE);
             this.closeAll();
@@ -3157,7 +3157,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         UpdateStepOne uso = new UpdateStepOne(this, true);
         int result = uso.showDialog();
         if (result == DataType.RETURN_TYPE_OK) {
-            String strReturn = "<html>Update Far Done! <br>The WORKSPACE will be refreshed!</html>";
+            String strReturn = "<html>Far Update completed!<br>Refreshing the WORKSPACE!</html>";
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,
                                           JOptionPane.INFORMATION_MESSAGE);
             this.closeAll();
@@ -3221,15 +3221,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             c.dispose();
         }
         if (result == DataType.RETURN_TYPE_WORKSPACE) {
-            Tools.showInformationMessage("Workspace Clone Finished");
+            Tools.showInformationMessage("Workspace Clone Completed!");
         }
         if (result == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {
-            Tools.showInformationMessage("Module Surface Area Clone Finished");
+            Tools.showInformationMessage("Module Clone Completed!");
             GlobalData.vModuleList.addElement(c.getMid());
             addModuleToTree(c.getMid());
         }
         if (result == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {
-            Tools.showInformationMessage("Package Surface Area Clone Finished");
+            Tools.showInformationMessage("Package Clone Completed!");
             GlobalData.vPackageList.addElement(c.getPid());
             //
             // Add new SpdHeader node to the tree

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java

@@ -348,7 +348,7 @@ public class SelectModuleBelong extends IDialog {
         if (jContentPane == null) {
             jLabelIsLibrary = new JLabel();
             jLabelIsLibrary.setBounds(new java.awt.Rectangle(15, 35, 120, 20));
-            jLabelIsLibrary.setText("Is a Library");
+            jLabelIsLibrary.setText("Is this a Library");
             jLabelVersion = new JLabel();
             jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));
             jLabelVersion.setText("Version");
@@ -357,13 +357,13 @@ public class SelectModuleBelong extends IDialog {
             jLabelGuid.setText("Guid");
             jLabelName = new JLabel();
             jLabelName.setBounds(new java.awt.Rectangle(15, 85, 120, 20));
-            jLabelName.setText("Name");
+            jLabelName.setText("Module Name");
             jLabelFilePath = new JLabel();
             jLabelFilePath.setBounds(new java.awt.Rectangle(15, 60, 120, 20));
             jLabelFilePath.setText("File Path");
             jLabelPackage = new JLabel();
             jLabelPackage.setBounds(new java.awt.Rectangle(15, 10, 120, 20));
-            jLabelPackage.setText("Choose Package");
+            jLabelPackage.setText("Choose a Package");
             jContentPane = new JPanel();
             jContentPane.setLayout(null);
             jContentPane.setSize(new java.awt.Dimension(490, 198));
@@ -478,19 +478,19 @@ public class SelectModuleBelong extends IDialog {
         // Check if all required fields are not empty
         //
         if (isEmpty(this.jTextFieldFilePath.getText())) {
-            Log.wrn("New File", "File Path couldn't be empty");
+            Log.wrn("New File", "A File Path must be entered!");
             return false;
         }
         if (isEmpty(this.jTextFieldName.getText())) {
-            Log.wrn("New File", "Name couldn't be empty");
+            Log.wrn("New File", "A Name must be entered");
             return false;
         }
         if (isEmpty(this.jTextFieldGuid.getText())) {
-            Log.wrn("New File", "Guid Value couldn't be empty");
+            Log.wrn("New File", "The Guid must be entered!");
             return false;
         }
         if (isEmpty(this.jTextFieldVersion.getText())) {
-            Log.wrn("New File", "Version couldn't be empty");
+            Log.wrn("New File", "A Version number must be entered!");
             return false;
         }
 
@@ -498,11 +498,11 @@ public class SelectModuleBelong extends IDialog {
         // Check if all fields have correct data types 
         //
         if (!DataValidation.isBaseName(this.jTextFieldName.getText())) {
-            Log.wrn("New File", "Incorrect data type for Base Name");
+            Log.wrn("New File", "Incorrect data type for the Name!");
             return false;
         }
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
-            Log.wrn("New File", "Incorrect data type for Guid");
+            Log.wrn("New File", "Incorrect data type for Guid, which must be in registry format! (8-4-4-4-12)");
             return false;
         }
 
@@ -516,7 +516,7 @@ public class SelectModuleBelong extends IDialog {
 
             for (int index = 0; index < msaFile.size(); index++) {
                 if (msaFile.elementAt(index).equals(modulePath)) {
-                    Log.wrn("New File", "This module is already existing in selected package");
+                    Log.wrn("New File", "This module is already exists in the selected package!");
                     return false;
                 }
             }
@@ -531,7 +531,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPackageList != null && vPackageList.size() > 0) {
                 for (int index = 0; index < vPackageList.size(); index++) {
                     if (vPackageList.get(index).getPath().equals(path)) {
-                        Log.wrn("New File", "This package is already existing in database");
+                        Log.wrn("New File", "This package is already exists in this workspace!");
                         return false;
                     }
                 }
@@ -547,7 +547,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPlatfromList != null && vPlatfromList.size() > 0) {
                 for (int index = 0; index < vPlatfromList.size(); index++) {
                     if (vPlatfromList.get(index).getPath().equals(path)) {
-                        Log.wrn("New File", "This platform is already existing in database");
+                        Log.wrn("New File", "This platform is already exists in this workspace!");
                         return false;
                     }
                 }
@@ -642,7 +642,7 @@ public class SelectModuleBelong extends IDialog {
 
             spd.setSpdHeader(spdHeader);
         } catch (Exception e) {
-            Log.wrn("Save PackageSurfaceArea Document", e.getMessage());
+            Log.wrn("Save Package Surface Area Description Document", e.getMessage());
             return;
         }
 
@@ -688,7 +688,7 @@ public class SelectModuleBelong extends IDialog {
 
             fpd.setPlatformHeader(fpdHeader);
         } catch (Exception e) {
-            Log.wrn("Save FrameworkPlatformDescription Document", e.getMessage());
+            Log.wrn("Save Framework Platform Description Document", e.getMessage());
             return;
         }
 

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java

@@ -138,7 +138,7 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
         if (jButtonOpen == null) {
             jButtonOpen = new JButton();
             jButtonOpen.setBounds(new java.awt.Rectangle(40, 405, 120, 20));
-            jButtonOpen.setText("Open a file");
+            jButtonOpen.setText("Open File");
             jButtonOpen.addActionListener(this);
         }
         return jButtonOpen;
@@ -154,7 +154,7 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
         if (jButtonSave == null) {
             jButtonSave = new JButton();
             jButtonSave.setBounds(new java.awt.Rectangle(170, 405, 120, 20));
-            jButtonSave.setText("Save to a file");
+            jButtonSave.setText("Save File");
             jButtonSave.addActionListener(this);
         }
         return jButtonSave;
@@ -300,7 +300,7 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
                 e.printStackTrace();
             }
         } else {
-            Log.log("Open file", this.currentFile + " Not Found");
+            Log.log("File Open Error: ", this.currentFile + " File Not Found");
         }
 
         showTable();
@@ -452,12 +452,12 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
      **/
     private boolean check() {
         if (isEmpty(this.jTextFieldName.getText())) {
-            Log.wrn("Add Tool Chain", "Name couldn't be empty!");
+            Log.wrn("Add Tool Chain", "The Property Name must be entered!");
             return false;
         }
 
         if (isEmpty(this.jTextFieldValue.getText())) {
-            Log.wrn("Add Tool Chain", "Value couldn't be empty");
+            Log.wrn("Add Tool Chain", "The Property Value must be entered!");
             return false;
         }
         return true;

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java

@@ -40,8 +40,8 @@ public class ToolChainConfigHelp extends JFrame implements ActionListener {
             jTextPane.setBackground(new java.awt.Color(238,238,238));
             jTextPane.setEditable(false);
             helpContent = helpContent
-            + "The coding for the Property is: TARGET_TAGNAME_ARCH_COMMAND_ATTR" + DataType.UNIX_LINE_SEPARATOR
+            + "The template for the Property is: TARGET_TAGNAME_ARCH_COMMAND_ATTR" + DataType.UNIX_LINE_SEPARATOR
-            + "The Value, is either afull path, full path and filename or a reserved word." + DataType.UNIX_LINE_SEPARATOR
+            + "The Value, is either a full path, full path and filename or a reserved word." + DataType.UNIX_LINE_SEPARATOR
             + DataType.UNIX_LINE_SEPARATOR
             + DataType.UNIX_LINE_SEPARATOR
             + "TARGET  - DEBUG and RELEASE are predefined, however the user may define one or more of their own TARGET types in this file." + DataType.UNIX_LINE_SEPARATOR
@@ -112,7 +112,7 @@ public class ToolChainConfigHelp extends JFrame implements ActionListener {
     private void initialize() {
         this.setSize(625, 520);
         this.setResizable(false);
-        this.setTitle("How to Setup Tool Chain Configuration");
+        this.setTitle("How to Modify a Tool Chain Configuration");
         this.setContentPane(getJContentPane());
     }