Fixed broken externalized strings

13 files changed, 39 insertions, 87 deletions

diff --git a/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/launch/LaunchMessages.properties b/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/launch/LaunchMessages.properties
index 72cab83a..df9a8d42 100644
--- a/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/launch/LaunchMessages.properties
+++ b/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/launch/LaunchMessages.properties
@@ -20,7 +20,6 @@ CApplicationLaunchShortcut.CLocalApplication=Fortran Local Application
 CApplicationLaunchShortcut.ChooseLocalAppToDebug=Choose a local application to debug
 CApplicationLaunchShortcut.ChooseLocalAppToRun=Choose a local application to run
 CApplicationLaunchShortcut.Launch_failed_no_binaries=Launch failed. Binary not found.
-CApplicationLaunchShortcut.LaunchFailed=Launch failed
 CApplicationLaunchShortcut.LaunchDebugConfigSelection=Launch Debug Configuration Selection
 CApplicationLaunchShortcut.LaunchConfigSelection=Launch Configuration Selection
 CApplicationLaunchShortcut.Invalid_launch_mode_1=Invalid launch mode
diff --git a/org.eclipse.photran.core.intel/errorparsers/org/eclipse/photran/intel/internal/errorparsers/IntelCompilerErrorParser.java b/org.eclipse.photran.core.intel/errorparsers/org/eclipse/photran/intel/internal/errorparsers/IntelCompilerErrorParser.java
index dae3c293..5666d3be 100644
--- a/org.eclipse.photran.core.intel/errorparsers/org/eclipse/photran/intel/internal/errorparsers/IntelCompilerErrorParser.java
+++ b/org.eclipse.photran.core.intel/errorparsers/org/eclipse/photran/intel/internal/errorparsers/IntelCompilerErrorParser.java
@@ -22,7 +22,6 @@ import org.eclipse.core.resources.IFile;
  * Intel Compilers error parser
  * 
  */
-
 public class IntelCompilerErrorParser  implements IErrorParser {
     /**
      *  Extracts information from Intel compiler diagnostics.
@@ -77,15 +76,15 @@ public class IntelCompilerErrorParser  implements IErrorParser {
     {
         String severitystr, filestr, linestr, message;
 
-        StringTokenizer tokenizer = new StringTokenizer(line, ":");
+        StringTokenizer tokenizer = new StringTokenizer(line, ":"); //$NON-NLS-1$
 	/* First of all, see if this is a fortcom-specific error */
-        if (line.startsWith("fortcom: ")) {
+        if (line.startsWith("fortcom: ")) { //$NON-NLS-1$
             try {
 		tokenizer.nextToken(); /* fortcom */
                 severitystr = tokenizer.nextToken().trim();
-               	if (severitystr.equals("Severe")) {
-		    message = tokenizer.nextToken("\r\n").substring(2).trim();
-		    if (message.startsWith("No such file or directory")) {
+               	if (severitystr.equals("Severe")) { //$NON-NLS-1$
+		    message = tokenizer.nextToken("\r\n").substring(2).trim(); //$NON-NLS-1$
+		    if (message.startsWith("No such file or directory")) { //$NON-NLS-1$
 			/* need to process this together with the line. Save
 			   it in a buffer and return */
 			eoParser.appendToScratchBuffer(message);
@@ -98,19 +97,19 @@ public class IntelCompilerErrorParser  implements IErrorParser {
                	}	
                	else {
                 
-		    filestr = tokenizer.nextToken(",").substring(2).trim();
-		    linestr = tokenizer.nextToken(":").substring(2).trim();
-		    message = tokenizer.nextToken("\r\n").substring(2).trim();
+		    filestr = tokenizer.nextToken(",").substring(2).trim(); //$NON-NLS-1$
+		    linestr = tokenizer.nextToken(":").substring(2).trim(); //$NON-NLS-1$
+		    message = tokenizer.nextToken("\r\n").substring(2).trim(); //$NON-NLS-1$
 		    IFile file = eoParser.findFileName(filestr);
 
 		    int severity = -1;          
-		    if (severitystr.equals("Info")) {
+		    if (severitystr.equals("Info")) { //$NON-NLS-1$
                 	severity = IMarkerGenerator.SEVERITY_INFO;
 		    }
-		    else if (severitystr.equals("Warning")) {
+		    else if (severitystr.equals("Warning")) { //$NON-NLS-1$
                 	severity = IMarkerGenerator.SEVERITY_WARNING;
 		    }
-		    else if (severitystr.equals("Error")) {
+		    else if (severitystr.equals("Error")) { //$NON-NLS-1$
                 	severity = IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
 		    }
                                                 
@@ -123,7 +122,7 @@ public class IntelCompilerErrorParser  implements IErrorParser {
                 ;
             }
 	} /* fortcom */
-    else if (eoParser.getScratchBuffer().startsWith("No such file or directory")) {
+    else if (eoParser.getScratchBuffer().startsWith("No such file or directory")) { //$NON-NLS-1$
     		/* process the multi-line fortcom diagnostics */
     		String buffer = eoParser.getScratchBuffer();
     		eoParser.clearScratchBuffer();
@@ -158,14 +157,14 @@ public class IntelCompilerErrorParser  implements IErrorParser {
 
 	    if ((firstColon != -1) && (secondColon != -1)) {
 		String firstPart= line.substring(0, firstColon);
-		int leftParen = firstPart.indexOf("(");
+		int leftParen = firstPart.indexOf("("); //$NON-NLS-1$
 		/* the string must have two colons to get this far. */
 		/* do a paren check to distinguish the front end format from
 		   the driver format. */
 		if (leftParen != -1) {
 		    /* have a left paren, proceed to parse as a mcpcom front end
 		       message */
-		    StringTokenizer tok= new StringTokenizer(firstPart, "()");
+		    StringTokenizer tok= new StringTokenizer(firstPart, "()"); //$NON-NLS-1$
 		    if (tok.hasMoreTokens()) {
 		        String fileName= tok.nextToken();
 		        if (tok.hasMoreTokens()) {
@@ -184,17 +183,17 @@ public class IntelCompilerErrorParser  implements IErrorParser {
 				if (file != null || eoParser.isConflictingName(fileName)) {
 				    String middle= desc.substring(0, secondColon);
 				    int severity = -1;
-				    if (middle.indexOf("warning")!= -1) {
+				    if (middle.indexOf("warning")!= -1) { //$NON-NLS-1$
 					severity= IMarkerGenerator.SEVERITY_WARNING;
 				    }
-				    if (middle.indexOf("error")!= -1) {
+				    if (middle.indexOf("error")!= -1) { //$NON-NLS-1$
 					severity= IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
 				    }
-				    if (middle.indexOf("remark")!= -1) {
+				    if (middle.indexOf("remark")!= -1) { //$NON-NLS-1$
 					severity= IMarkerGenerator.SEVERITY_INFO;
 				    }
 				    if (file == null) {
-					desc= "*" + desc;
+					desc= "*" + desc; //$NON-NLS-1$
 				    }
 				    if (severity == IMarkerGenerator.SEVERITY_WARNING ||
 					severity == IMarkerGenerator.SEVERITY_ERROR_RESOURCE ||
@@ -213,19 +212,19 @@ public class IntelCompilerErrorParser  implements IErrorParser {
 		}
 		else { /* no filename or line# - try to parse as a driver diagnostics */
 		    /* qualify the message by checking the program name */
-		    if((firstPart.indexOf("icl")!= -1)   ||(firstPart.indexOf("icc")!= -1) ||
-		       (firstPart.indexOf("icpc")!= -1)  ||(firstPart.indexOf("ifort")!= -1) ||  
-		       (firstPart.indexOf("xilink")!= -1)||(firstPart.indexOf("xild")!= -1) ||  
-		       (firstPart.indexOf("xiar")!= -1)  ||(firstPart.indexOf("xilib")!= -1)) {  
+		    if((firstPart.indexOf("icl")!= -1)   ||(firstPart.indexOf("icc")!= -1) || //$NON-NLS-1$ //$NON-NLS-2$
+		       (firstPart.indexOf("icpc")!= -1)  ||(firstPart.indexOf("ifort")!= -1) ||   //$NON-NLS-1$ //$NON-NLS-2$
+		       (firstPart.indexOf("xilink")!= -1)||(firstPart.indexOf("xild")!= -1) ||   //$NON-NLS-1$ //$NON-NLS-2$
+		       (firstPart.indexOf("xiar")!= -1)  ||(firstPart.indexOf("xilib")!= -1)) {   //$NON-NLS-1$ //$NON-NLS-2$
 			String  middle= desc.substring(0, secondColon);
 			int severity = -1;
-			if (middle.indexOf("warning")!= -1) {
+			if (middle.indexOf("warning")!= -1) { //$NON-NLS-1$
 			    severity= IMarkerGenerator.SEVERITY_WARNING;
 			}
-			if (middle.indexOf("error")!= -1) {
+			if (middle.indexOf("error")!= -1) { //$NON-NLS-1$
 			    severity= IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
 			}
-			if (middle.indexOf("remark")!= -1) {
+			if (middle.indexOf("remark")!= -1) { //$NON-NLS-1$
 			    severity= IMarkerGenerator.SEVERITY_INFO;
 			}
 			if (severity == IMarkerGenerator.SEVERITY_WARNING ||
@@ -236,7 +235,7 @@ public class IntelCompilerErrorParser  implements IErrorParser {
 			}			      
 			return false; /* message not qualified, give not handled return */
 			} else {
-				if (line.indexOf("Command-line error: invalid macro definition: -D") != -1) { 
+				if (line.indexOf("Command-line error: invalid macro definition: -D") != -1) {  //$NON-NLS-1$
 					int severity= IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
 					eoParser.generateMarker(null, 0, line, severity, null);
 					return false; // give handled return 
@@ -246,7 +245,7 @@ public class IntelCompilerErrorParser  implements IErrorParser {
 		}
 	    }
 	    /* non-standard driver/preprocessor message */
-	      if (line.indexOf("Catastrophic error: could not open source file") != -1 ) { 
+	      if (line.indexOf("Catastrophic error: could not open source file") != -1 ) {  //$NON-NLS-1$
 		      int severity= IMarkerGenerator.SEVERITY_ERROR_RESOURCE;
 		      eoParser.generateMarker(/*file=*/null, /*line#=*/-1, line, severity, null);
 		      return false; /* give handled return */
diff --git a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/Messages.java b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/Messages.java
index ec4aecc0..55169aad 100644
--- a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/Messages.java
+++ b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/Messages.java
@@ -230,8 +230,6 @@ public class Messages extends NLS
 
     public static String PermuteSubroutineArgsRefactoring_selectSubroutineError;
 
-    public static String PermuteSubroutineArgsRefactoring_subroutineParameterDefinitionError;
-
     public static String CommonVarNamesRefactoring_Name;
 
     public static String CommonVarNamesRefactoring_NameConflictsWith;
@@ -318,16 +316,10 @@ public class Messages extends NLS
 
     public static String KeywordCaseRefactoring_SelectedFileCannotBeParsed;
 
-    public static String LoopAlignmentRefactoring_LoopAlignmentName;
-
-    public static String LoopAlignmentRefactoring_LoopsNotCompatible;
-
     public static String FuseLoopsRefactoring_CycleExitFails;
 
     public static String FuseLoopsRefactoring_IncompatibleLoopErorrMessage;
 
-    public static String FuseLoopsRefactoring_InvalidLoopBounds;
-
     public static String FuseLoopsRefactoring_InvalidStepError;
 
     public static String FuseLoopsRefactoring_LoopFusionName;
@@ -384,12 +376,6 @@ public class Messages extends NLS
 
     public static String MoveCommonToModuleRefactoring_SelectVarOrBlockInCommonStmt;
 
-    public static String MoveFromModuleRefactoring_Name;
-
-    public static String MoveFromModuleRefactoring_selectionNotInsideModuleError;
-
-    public static String MoveFromModuleRefactoring_textSelectionError;
-
     public static String RemoveArithmeticIfRefactoring_Error;
 
     public static String RemoveArithmeticIfRefactoring_Name;
diff --git a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/messages.properties b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/messages.properties
index ad92cd42..9b9405ca 100644
--- a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/messages.properties
+++ b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/refactoring/messages.properties
@@ -33,7 +33,6 @@ PermuteSubroutineArgsRefactoring_matchingDeclarationsDoNotUniquelyBind=Matching
 PermuteSubroutineArgsRefactoring_name=Permute Subroutine Arguments
 PermuteSubroutineArgsRefactoring_selectedTextNotSubroutine=The selected text is not a subroutine.  Please select a subroutine.
 PermuteSubroutineArgsRefactoring_selectSubroutineError=Please select a subroutine definition.
-PermuteSubroutineArgsRefactoring_subroutineParameterDefinitionError=Error in subroutine parameter definition.
 CommonVarNamesRefactoring_Name=Make Common Block Variable Names Consistent
 CommonVarNamesRefactoring_NameConflictsWith=The name "{0}" conflicts with {1}
 CommonVarNamesRefactoring_NameMightConflictWithSubprogram=The name "{0}" might conflict with the name of an invoked subprogram.
@@ -98,11 +97,8 @@ IntroImplicitNoneRefactoring_Name=Introduce Implicit None
 IntroImplicitNoneRefactoring_SelectedFileCannotBeParsed=One of the selected files ({0}) cannot be parsed.
 KeywordCaseRefactoring_Name=Change Keyword Case
 KeywordCaseRefactoring_SelectedFileCannotBeParsed=One of the selected files ({0}) cannot be parsed.
-LoopAlignmentRefactoring_LoopAlignmentName=Loop Alignment
-LoopAlignmentRefactoring_LoopsNotCompatible=Loops aren't compatible for alignment
 FuseLoopsRefactoring_CycleExitFails=Can not fuse loops with a cycle or exit statement
 FuseLoopsRefactoring_IncompatibleLoopErorrMessage=Loop bounds are not compatible.
-FuseLoopsRefactoring_InvalidLoopBounds=Invalid Loop Bounds
 FuseLoopsRefactoring_InvalidStepError=Invalid step
 FuseLoopsRefactoring_LoopFusionName=Fuse Loops (Unchecked)
 FuseLoopsRefactoring_NoSecondLoopErrorMsg=Select a do loop with a second following do loop
@@ -144,9 +140,6 @@ MinOnlyListRefactoring_USEStatementNotFound=Use statement node could not be foun
 MoveCommonToModuleRefactoring_InvalidIdentifier={0}\ is not a valid identifier
 MoveCommonToModuleRefactoring_Name=Move Common Block to Module
 MoveCommonToModuleRefactoring_SelectVarOrBlockInCommonStmt=Please select a variable or block in a COMMON statement.
-MoveFromModuleRefactoring_Name=Move From Module Refactoring
-MoveFromModuleRefactoring_selectionNotInsideModuleError=The selected text was not inside of a module.
-MoveFromModuleRefactoring_textSelectionError=Token returned from text selection was invalid.
 MoveSavedToCommonBlockRefactoring_AbsentOrAmbiguousDefinition=Absent or ambiguous definition for variable "{0}".
 MoveSavedToCommonBlockRefactoring_CouldNotFindArrayDeclaration=Could not find array declaration for DIMENSION specification of variable "{0}".
 MoveSavedToCommonBlockRefactoring_CouldNotFindDeclarationNode=Could not find declaration node for variable "{0}".
@@ -164,8 +157,6 @@ RemoveAssignedGotoRefactoring_NothingToBeRefactored=Nothing to be refactored for
 RemoveAssignedGotoRefactoring_TheFollowingLabelsCannotBeRefactored=The following labels cannot be refactored since they're used in an action statement : 
 RemoveAssignedGoToRefactoring_Name=Remove Assigned Goto
 RemoveAssignedGoToRefactoring_SelectedFileCannotBeParsed=One of the selected files ({0}) cannot be parsed.
-RemoveComputedGoToRefactoring_Name=Remove Computed Goto
-RemoveComputedGoToRefactoring_PleaseSelectComputedGotoStmt=Please select a computed GOTO statement.
 RemoveBranchToEndIfRefactoring_BranchToImmediateEndIf=All GOTO statements referencing this END IF statement's label are located inside the enclosing IF construct.
 RemoveBranchToEndIfRefactoring_Name=Remove Branch to End If Statement
 RemoveBranchToEndIfRefactoring_NoEnclosingIfConstruct=The selected END IF statement does not have an enclosing IF construct.
@@ -236,13 +227,15 @@ StandardizeStatementsRefactoring_SelectedFileCannotBeParsed=One of the selected
 ChangeToVectorNotation_PleaseSelectDoLoopNode=Please select a DO LOOP statement.
 ChangeToVectorNotation_PleaseSelectNewStyleDoLoopNode=Please select a new style DO LOOP statement ended with END DO statement.
 ChangeToVectorNotation_CanNotBeChangedToVectorNotation= Can not be changed to vector notation, subindex dependencies may be found or Do Loop can not be vectorized.IfConstructStatementConversionRefactoring_Name= Convert Between If Statement and If Construct
+IfConstructStatementConversionRefactoring_Name=Convert Between If Statement and If Construct
 IfConstructStatementConversionRefactoring_SelectAValidIfStatement= Please select a valid IF statement or construct.
 IfConstructStatementConversionRefactoring_InvalidNamedConstruct= Cannot refactor a named IF construct. Please select an unnamed IF construct.
 IfConstructStatementConversionRefactoring_TooManyStatements= Selected IF construct contains too many statements and cannot be refactored to an IF statement.
 FortranEditorRefactoring_CantPerformRefactoringOnReadOnlyFile= Can't perform refactoring on a read-only file.
 FortranEditorRefactoring_CantPerformRefactoringOnFileThatDoesNotExist= Can't perform refactoring on a file that does not exist.
 VariableCaseRefactoring_Name= Change Variable Case
-VariableCaseRefactoring_SelectedFileCannotBeParsed=One of the selected files ({0}) cannot be parsed.RemoveUnusedCommonBlocksRefactoring_Name= Remove Unused Common Blocks
+VariableCaseRefactoring_SelectedFileCannotBeParsed=One of the selected files ({0}) cannot be parsed.
+RemoveUnusedCommonBlocksRefactoring_Name= Remove Unused Common Blocks
 RemoveUnusedCommonBlocksRefactoring_SelectedFilesMustBeImplicitNone=All of the selected files must be IMPLICIT NONE. Please use the Introduce Implict None refactoring first to introduce IMPLICIT NONE statements in the file {0}.
 RemoveUnusedCommonBlocksRefactoring_NoDeclarationFoundFor=No declaration was found for {0}.
 RemoveUnusedCommonBlocksRefactoring_MultipleDeclarationsFoundFor=Multiple declarations were found for {0}.
\ No newline at end of file
diff --git a/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/Activator.java b/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/Activator.java
index 7a099cb1..62a8d678 100755
--- a/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/Activator.java
+++ b/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/Activator.java
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.photran.core.xlf";

+	public static final String PLUGIN_ID = "org.eclipse.photran.core.xlf"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/XLFCompilerErrorParser.java b/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/XLFCompilerErrorParser.java
index a481c2ed..3160b9fd 100755
--- a/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/XLFCompilerErrorParser.java
+++ b/org.eclipse.photran.core.xlf/src/org/eclipse/photran/internal/core/xlf/XLFCompilerErrorParser.java
@@ -8,7 +8,6 @@
  * Contributors:

  *     IBM Corporation - initial API and implementation

  *******************************************************************************/

-

 package org.eclipse.photran.internal.core.xlf;

 

 import java.util.regex.Matcher;

@@ -28,8 +27,8 @@ import org.eclipse.core.runtime.Path;
  */

 public class XLFCompilerErrorParser implements IErrorParser

 {

-	Pattern p1 = Pattern.compile("^\"([^\"]*)\", line (\\d+)\\.(\\d+): (\\d+)-(\\d+) \\(([USEWLI])\\) (.*)$");

-	Pattern p2 = Pattern.compile("^\"([^\"]*)\", (\\d+)-(\\d+) \\(([USEWLI])\\) (.*)$");

+	Pattern p1 = Pattern.compile("^\"([^\"]*)\", line (\\d+)\\.(\\d+): (\\d+)-(\\d+) \\(([USEWLI])\\) (.*)$"); //$NON-NLS-1$

+	Pattern p2 = Pattern.compile("^\"([^\"]*)\", (\\d+)-(\\d+) \\(([USEWLI])\\) (.*)$"); //$NON-NLS-1$

 	private String fileName;

 	private String lineNum;

 	private String level;

@@ -40,7 +39,7 @@ public class XLFCompilerErrorParser implements IErrorParser
 	{

 		fileName = null;

 		lineNum = null;

-		level = "S";

+		level = "S"; //$NON-NLS-1$

 		message = null;

 		num = -1;

 	}

@@ -226,19 +225,19 @@ public class XLFCompilerErrorParser implements IErrorParser
     {

         int severity = defaultSeverity;

 

-        if (desc.equals("U") || desc.equals("S") )

+        if (desc.equals("U") || desc.equals("S") ) //$NON-NLS-1$ //$NON-NLS-2$

         {

             severity = IMarkerGenerator.SEVERITY_ERROR_BUILD;

         }

-        else if (desc.equals("E"))

+        else if (desc.equals("E")) //$NON-NLS-1$

         {

             severity = IMarkerGenerator.SEVERITY_ERROR_RESOURCE;

         }

-        else if (desc.equals("W") || desc.equals("L") )

+        else if (desc.equals("W") || desc.equals("L") ) //$NON-NLS-1$ //$NON-NLS-2$

         {

             severity = IMarkerGenerator.SEVERITY_WARNING;

         }

-        else if (desc.equals("I"))

+        else if (desc.equals("I")) //$NON-NLS-1$

         {

             severity = IMarkerGenerator.SEVERITY_INFO;

         }

diff --git a/org.eclipse.photran.managedbuilder.intel.ui/src/org/eclipse/photran/internal/managedbuilder/intel/ui/IntelUiPlugin.java b/org.eclipse.photran.managedbuilder.intel.ui/src/org/eclipse/photran/internal/managedbuilder/intel/ui/IntelUiPlugin.java
index 09d36a56..b650db6c 100644
--- a/org.eclipse.photran.managedbuilder.intel.ui/src/org/eclipse/photran/internal/managedbuilder/intel/ui/IntelUiPlugin.java
+++ b/org.eclipse.photran.managedbuilder.intel.ui/src/org/eclipse/photran/internal/managedbuilder/intel/ui/IntelUiPlugin.java
@@ -59,6 +59,6 @@ public class IntelUiPlugin extends AbstractUIPlugin {
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.photran.managedbuilder.intel.ui", path);
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.photran.managedbuilder.intel.ui", path); //$NON-NLS-1$
 	}
 }
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/Messages.java b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/Messages.java
index b8563c2a..c0707be3 100644
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/Messages.java
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/Messages.java
@@ -88,14 +88,6 @@ public class Messages extends NLS
 
     public static String KeywordCaseInputPage_UpperCaseLabel;
 
-    public static String MoveFromModuleInputPage_leftPanelMessage;
-
-    public static String MoveFromModuleInputPage_Name;
-
-    public static String MoveFromModuleInputPage_rightPanelMessage;
-
-    public static String MoveFromModuleInputPage_selectDataMessage;
-
     public static String MoveSubprogramToModuleAction_labelText;
 
     public static String RenameAction_MatchExternalSubprograms;
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/messages.properties b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/messages.properties
index 11ff995f..c3a24067 100644
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/messages.properties
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/refactoring/messages.properties
@@ -26,10 +26,6 @@ KeywordCaseInputPage_ChangeKeywordsToLabel=Change keywords to:
 KeywordCaseInputPage_ClickOKMessage=Click OK to change the case of all keywords in the selected files. To see what changes will be made, click Preview.
 KeywordCaseInputPage_LowerCaseLabel=Lower Case
 KeywordCaseInputPage_UpperCaseLabel=Upper Case
-MoveFromModuleInputPage_leftPanelMessage=Members to Move
-MoveFromModuleInputPage_Name=Move From Module Refactoring
-MoveFromModuleInputPage_rightPanelMessage=Destination Module
-MoveFromModuleInputPage_selectDataMessage=Please select member data to move from module 
 MoveSubprogramToModuleAction_labelText=Move Subroutine or Function to Module: 
 RenameAction_MatchExternalSubprograms=Match external subprograms with interfaces and external declarations
 RenameAction_RenameAtoB=Rename {0} to
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/Messages.java b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/Messages.java
index 1331bca2..4be4254c 100644
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/Messages.java
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/Messages.java
@@ -51,8 +51,6 @@ public class Messages extends NLS
 
     public static String VPGProblemContextMenu_Problems;
 
-    public static String VPGProblemLabelProvider_LineN;
-
     public static String VPGProblemView_DescriptionColumnHeader;
 
     public static String VPGProblemView_Errors;
diff --git a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/messages.properties b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/messages.properties
index 6ce6c792..6d85ab23 100644
--- a/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/messages.properties
+++ b/org.eclipse.photran.ui.vpg/src/org/eclipse/photran/internal/ui/views/vpgproblems/messages.properties
@@ -14,7 +14,6 @@ SelectedResourceFilterAction_FilterBySelectionTooltip=Displays only problems tha
 ShowFullMessageAction_EventDetails=Event Details
 ShowFullMessageAction_ShowDetailsTooltip=Show the entire message for selected event(s)
 VPGProblemContextMenu_Problems=Problems
-VPGProblemLabelProvider_LineN=line {0}
 VPGProblemView_DescriptionColumnHeader=Description
 VPGProblemView_Errors=Errors
 VPGProblemView_nErrors={0} Errors
diff --git a/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/Messages.java b/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/Messages.java
index b0a39858..fdc5e366 100644
--- a/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/Messages.java
+++ b/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/Messages.java
@@ -27,12 +27,6 @@ public class Messages extends NLS
 
     public static String VPG_PostTransformAnalysis;
 
-    public static String VPG_ProcessingDependentFile;
-
-    public static String VPG_SortingFilesEnqueuingDependents;
-
-    public static String VPG_SortingFilesSortingDependents;
-
     public static String VPGDB_AnnotationOfType;
 
     public static String VPGDB_EdgeOfType;
diff --git a/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/messages.properties b/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/messages.properties
index 99dbd555..fb7da154 100644
--- a/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/messages.properties
+++ b/org.eclipse.rephraserengine.core/src/org/eclipse/rephraserengine/core/vpg/messages.properties
@@ -1,9 +1,6 @@
 VPG_AnnotationOfType=Annotation of type {0}
 VPG_EdgeOfType=Edge of type {0}
 VPG_PostTransformAnalysis=Post-transform analysis:
-VPG_ProcessingDependentFile=- Processing dependent file 
-VPG_SortingFilesEnqueuingDependents=Sorting files according to dependencies - enqueuing dependents ({0} of {1})
-VPG_SortingFilesSortingDependents=Sorting files according to dependencies - sorting dependents of {0} ({1} of {2})
 VPGDB_AnnotationOfType=Annotation of type {0}
 VPGDB_EdgeOfType=Edge of type {0}
 VPGDB_FilenameOffsetLength={0}, offset {1}, length {2}