Fixed grammar in messages.

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

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

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

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
index 5d23469c5a7b66a14e01a3c749ebed0ba8fb5de4..0156cc902f36d9a80fe674083fdd4f682cd2cfd8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
+++ b/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));\r
             jTextPane.setEditable(false);\r
             helpContent = helpContent\r
-            + "The coding for the Property is: TARGET_TAGNAME_ARCH_COMMAND_ATTR" + DataType.UNIX_LINE_SEPARATOR\r
-            + "The Value, is either afull path, full path and filename or a reserved word." + DataType.UNIX_LINE_SEPARATOR\r
+            + "The template for the Property is: TARGET_TAGNAME_ARCH_COMMAND_ATTR" + DataType.UNIX_LINE_SEPARATOR\r
+            + "The Value, is either a full path, full path and filename or a reserved word." + DataType.UNIX_LINE_SEPARATOR\r
             + DataType.UNIX_LINE_SEPARATOR\r
             + DataType.UNIX_LINE_SEPARATOR\r
             + "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\r
@@ -112,7 +112,7 @@ public class ToolChainConfigHelp extends JFrame implements ActionListener {
     private void initialize() {\r
         this.setSize(625, 520);\r
         this.setResizable(false);\r
-        this.setTitle("How to Setup Tool Chain Configuration");\r
+        this.setTitle("How to Modify a Tool Chain Configuration");\r
         this.setContentPane(getJContentPane());\r
     }\r
 \r