Fixed grammar in messages.

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

5 files changed, 21 insertions, 21 deletions

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
index 69cb62e..f33670e 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
@@ -46,7 +46,7 @@ public class Database {
 		Func lf;

 		

 		if (rd.ready()) {

-			System.out.println("Found " + filename + " , Importing Library Database");

+			System.out.println("Found " + filename + ", Importing Library Database.");

 			while ((line = rd.readLine()) != null) {

 				if (line.length() != 0) {

 					linecontext = line.split(",");

@@ -64,7 +64,7 @@ public class Database {
 		Guid gu;

 		

 		if (rd.ready()) {

-			System.out.println("Found " + filename + " , Importing " + type + " Database");

+			System.out.println("Found " + filename + ", Importing " + type + " Database.");

 			while ((line = rd.readLine()) != null) {

 				if (line.length() != 0) {

 					linecontext = line.split(",");

@@ -82,7 +82,7 @@ public class Database {
 		Macro mc;

 		

 		if (rd.ready()) {

-			System.out.println("Found " + filename + " , Importing Macro Database");

+			System.out.println("Found " + filename + ", Importing Macro Database.");

 			while ((line = rd.readLine()) != null) {

 				if (line.length() != 0) {

 					linecontext = line.split(",");

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 72d39bb..b238551 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -74,14 +74,14 @@ public class ModuleInfo {
 				} else if (list[i].contains(".uni")) {

 					localmodulesources.add(list[i]);

 				} else if (list[i].contains(".inf")) {

-					if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) {

+					if (ui.yesOrNo("Found .inf file : " + list[i] + "\nDo you want to use this file as this module's .inf?")) {

 						hasInf = true;

 						infname = list[i];

 					} else {

 						continue;

 					}

 				} else if (list[i].contains(".msa")) {

-					if (ui.yesOrNo("Found .msa file : " + list[i] + "\nUse this file as this module's .msa ?")) {

+					if (ui.yesOrNo("Found .msa file : " + list[i] + "\nDo you want to use this file as this module's .msa?")) {

 						hasMsa = true;

 						msaname = list[i];

 					} else {

@@ -97,7 +97,7 @@ public class ModuleInfo {
 		} else if (hasMsa) {

 			mr.readMsa(msaname);

 		} else {

-			ui.println("No Inf Nor Msa Found");

+			ui.println("No INF nor MSA file found!");

 		}

 		

 		CommentOutNonLocalHFile();

@@ -106,7 +106,7 @@ public class ModuleInfo {
 		new SourceFileReplacer(modulepath, this, db, ui).flush();	// some adding library actions are taken here,so it must be put before "MsaWriter"

 		

 		// show result

-		if (ui.yesOrNo("Parse Module Information Complete . See details ?")) {

+		if (ui.yesOrNo("Parse of the Module Information has completed. View details?")) {

 			ui.println("\nModule Information : ");

 			ui.println("Entrypoint : " + entrypoint);

 			show(protocol, "Protocol : ");

@@ -129,8 +129,8 @@ public class ModuleInfo {
 		

 		ui.println("Errors Left : " + db.error);

 		ui.println("Complete!");

-		ui.println("Your R9 module is placed at " + modulepath + File.separator + "result");

-		ui.println("Your logfile is placed at " + modulepath);

+		ui.println("Your R9 module was placed here: " + modulepath + File.separator + "result");

+		ui.println("Your logfile was placed here: " + modulepath);

 	}

 	

 	private void show(Set<String> hash, String show) {

@@ -291,4 +291,4 @@ public class ModuleInfo {
 	public static void main(String[] args) throws Exception {

 		FirstPanel.init();

 	}

-}
\ No newline at end of file
+}

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index f4cebde..3f379b7 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -44,13 +44,13 @@ public class ModuleReader {
 		Iterator<FilenameDocument.Filename> li = sourcefiles.getFilenameList().iterator();

 		while (li.hasNext()) {

 			if (!mi.localmodulesources.contains(temp = li.next().toString())) {

-				System.out.println("Source File Missing ! : " + temp);

+				System.out.println("Source File Missing! : " + temp);

 			}

 		}

 	}

 	

 	public void readInf(String name) throws Exception {

-		System.out.println("Reading From Inf : " + name);

+		System.out.println("Parsing INF file: " + name);

 		BufferedReader rd = new BufferedReader(new FileReader(modulepath + File.separator + name));

 		String line;

 		String[] linecontext;

@@ -66,7 +66,7 @@ public class ModuleReader {
 						linecontext = line.split(" ");

 						if (linecontext[2].length() != 0) {

 							if (!mi.localmodulesources.contains(linecontext[2])) {

-								System.out.println("Source File Missing ! : " + linecontext[2]);

+								System.out.println("Source File Missing! : " + linecontext[2]);

 							}

 						}

 					}

@@ -92,4 +92,4 @@ public class ModuleReader {
 			}

 		}

 	}

-}
\ No newline at end of file
+}

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 82e34ee..7d90769 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -58,12 +58,12 @@ public class MsaWriter {
 		if (mi.modulename != null) {

 			msaheader.setModuleName(mi.modulename);

 		} else {

-			msaheader.setModuleName(mi.modulename = Query("ModuleName Not Found . Please Input ModuleName"));

+			msaheader.setModuleName(mi.modulename = Query("Module Name Not Found!  Please Input ModuleName"));

 		}

 		if (mi.guidvalue != null) {

 			msaheader.setGuidValue(mi.guidvalue);

 		} else {

-			msaheader.setGuidValue(mi.guidvalue = Query("GuidValue Not Found . Please Input GuidValue"));

+			msaheader.setGuidValue(mi.guidvalue = Query("Guid Value Not Found!  Please Input Guid Value"));

 		}

 		if (mi.moduletype != null) {

 			if (mi.moduletype.contains("PEI")) {

@@ -72,7 +72,7 @@ public class MsaWriter {
 				msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));

 			}

 		} else {

-			msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("GuidValue Not Found . Please Input GuidValue")));

+			msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found!  Please Input Guid Value")));

 		}

 

 		msaheader.setCopyright("Copyright (c) 2006, Intel Corporation");

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 6f56e51..2df0ffd 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -70,7 +70,7 @@ public class SourceFileReplacer {
 	public void flush() throws Exception {

 		PrintWriter outfile;

 		String temp = null;

-		if (ui.yesOrNo("Change Source Code is to be doing . See details ?")) {

+		if (ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {

 			showdetails = true;

 		}

 		File tempdir = new File(modulepath + File.separator + "result" + File.separator);

@@ -78,7 +78,7 @@ public class SourceFileReplacer {
 		String[] list = new File(modulepath + File.separator + "temp").list();	//what I change is the non-local .h commented-out files

 		for (int i = 0 ; i < list.length ; i++) {

 			if (list[i].contains(".c")) {

-				ui.println("\nModifying file : " + list[i]);

+				ui.println("\nModifying file: " + list[i]);

 				outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + list[i])));

 				outfile.append(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + list[i]));

 				outfile.flush();

@@ -93,7 +93,7 @@ public class SourceFileReplacer {
 				} else {

 					continue;

 				}

-				ui.println("\nCopying file : " + temp);

+				ui.println("\nCopying file: " + temp);

 				outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + temp)));

 				outfile.append(sourcefiletostring(modulepath + File.separator + "temp" + File.separator + list[i]));

 				outfile.flush();

@@ -167,7 +167,7 @@ public class SourceFileReplacer {
 		// replace BS -> gBS , RT -> gRT

 		Matcher mat = pat.matcher(line);

 		if (mat.find()) {												// add a library here

-			ui.println("Converting all BS->gBS,RT->gRT");

+			ui.println("Converting all BS->gBS, RT->gRT");

 			line = mat.replaceAll("g$1$2$3");							//unknown correctiveness

 		}

 		mat.reset();