NLS fixes

7 files changed, 34 insertions, 38 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java
index acf34b461..fec60f6d2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSAbstractResolutionGenerator.java
@@ -91,7 +91,7 @@ public abstract class CVSAbstractResolutionGenerator implements IMarkerResolutio
 		} else if (exception instanceof InterruptedException) {
 			return;
 		} else {
-			status = new Status(IStatus.ERROR, TeamUIPlugin.ID, 1, Policy.bind("TeamAction.internal"), exception);
+			status = new Status(IStatus.ERROR, TeamUIPlugin.ID, 1, Policy.bind("TeamAction.internal"), exception); //$NON-NLS-1$
 			log = true;
 			dialog = true;
 		}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
index 70588b69f..2643f0b24 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
@@ -120,10 +120,6 @@ public class CVSMoveDeleteHook implements IMoveDeleteHook {
 				if (resource.isTeamPrivateMember()) {
 					return false;
 				}
-				// XXX Compensate for above not working
-				if (resource.getName().equals("CVS")) {
-					return false;
-				}
 				if (resource.getType() == IResource.FOLDER) {
 					if (destination != null) {
 						IFolder destFolder = destination.getFolder(resource.getFullPath().removeFirstSegments(source.getFullPath().segmentCount()));
@@ -146,11 +142,11 @@ public class CVSMoveDeleteHook implements IMoveDeleteHook {
 		return fileFound[0];
 	}
 	
-	private boolean checkForTeamPrivate(IResource resource) {
+	private boolean checkForTeamPrivate(final IResource resource) {
 		if (resource.isTeamPrivateMember()) {
 			showDialog(new IRunnableWithShell() {
 				public void run(Shell shell) {
-					ErrorDialog.openError(shell, "Team Private Resource", "Deletion of team private resources is not permitted", null);
+					ErrorDialog.openError(shell, Policy.bind("CVSMoveDeleteHook.Team_Private_Resource_1"), Policy.bind("CVSMoveDeleteHook.Deletion_of_team_private_resources_is_not_permitted_2", resource.getFullPath().toString()), null); //$NON-NLS-1$ //$NON-NLS-2$
 				}
 			});
 			return true;
@@ -212,10 +208,7 @@ public class CVSMoveDeleteHook implements IMoveDeleteHook {
 				}
 			}
 			return true;
-		} else // XXX Until team-private resources are hiddent
-			if (source.getParent().getName().equals("CVS")) {
-				return true;
-			}
+		}
 		return false;
 	}
 	
@@ -290,10 +283,7 @@ public class CVSMoveDeleteHook implements IMoveDeleteHook {
 				}
 			}
 			return true;
-		} else // XXX Until team-private resources are hidden
-			if (source.getName().equals("CVS")) {
-				return true;
-			}
+		}
 		return false;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
index 620f996f2..fada1f8c5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
@@ -121,9 +121,9 @@ public class CVSPreferencesPage
 		// set F1 help
 //		WorkbenchHelp.setHelp(composite, new DialogPageContextComputer(this, ICVSHelpContextIds.CVS_PREFERENCE_PAGE));
 
-		pruneEmptyDirectoriesField = createCheckBox(composite, Policy.bind("CVSPreferencePage.pruneEmptyDirectories"));
+		pruneEmptyDirectoriesField = createCheckBox(composite, Policy.bind("CVSPreferencePage.pruneEmptyDirectories")); //$NON-NLS-1$
 
-		createLabel(composite, Policy.bind("CVSPreferencePage.timeoutValue"));
+		createLabel(composite, Policy.bind("CVSPreferencePage.timeoutValue")); //$NON-NLS-1$
 		timeoutValue = createTextField(composite);
 		timeoutValue.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -137,29 +137,29 @@ public class CVSPreferencesPage
 			}
 		});
 		
-		createLabel(composite, Policy.bind("CVSPreferencePage.quietness"));
+		createLabel(composite, Policy.bind("CVSPreferencePage.quietness")); //$NON-NLS-1$
 		quietnessCombo = createCombo(composite);
 		
-		historyTracksSelectionButton = createCheckBox(composite, Policy.bind("CVSPreferencePage.historyTracksSelection"));
+		historyTracksSelectionButton = createCheckBox(composite, Policy.bind("CVSPreferencePage.historyTracksSelection")); //$NON-NLS-1$
 		
-		considerContentsInCompare = createCheckBox(composite, Policy.bind("CVSPreferencePage.considerContentsInCompare"));
-		considerContentsInCompare.setToolTipText(Policy.bind("CVSPreferencePage.considerContentsInCompareTooltip"));
+		considerContentsInCompare = createCheckBox(composite, Policy.bind("CVSPreferencePage.considerContentsInCompare")); //$NON-NLS-1$
+		considerContentsInCompare.setToolTipText(Policy.bind("CVSPreferencePage.considerContentsInCompareTooltip")); //$NON-NLS-1$
 		
-		promptOnFileDelete = createCheckBox(composite, Policy.bind("CVSPreferencePage.promptOnFileDelete"));
-		promptOnFileDelete.setToolTipText(Policy.bind("CVSPreferencePage.promptOnFileDeleteTooltip"));
+		promptOnFileDelete = createCheckBox(composite, Policy.bind("CVSPreferencePage.promptOnFileDelete")); //$NON-NLS-1$
+		promptOnFileDelete.setToolTipText(Policy.bind("CVSPreferencePage.promptOnFileDeleteTooltip")); //$NON-NLS-1$
 
-		promptOnFolderDelete = createCheckBox(composite, Policy.bind("CVSPreferencePage.promptOnFolderDelete"));
-		promptOnFolderDelete.setToolTipText(Policy.bind("CVSPreferencePage.promptOnFolderDeleteTooltip"));
+		promptOnFolderDelete = createCheckBox(composite, Policy.bind("CVSPreferencePage.promptOnFolderDelete")); //$NON-NLS-1$
+		promptOnFolderDelete.setToolTipText(Policy.bind("CVSPreferencePage.promptOnFolderDeleteTooltip")); //$NON-NLS-1$
 
-		showMarkers = createCheckBox(composite, Policy.bind("CVSPreferencePage.showAddRemoveMarkers"));
-		showMarkers.setToolTipText(Policy.bind("CVSPreferencePage.showAddRemoveMarkersTooltip"));
+		showMarkers = createCheckBox(composite, Policy.bind("CVSPreferencePage.showAddRemoveMarkers")); //$NON-NLS-1$
+		showMarkers.setToolTipText(Policy.bind("CVSPreferencePage.showAddRemoveMarkersTooltip")); //$NON-NLS-1$
 		
 		initializeValues();
 		
 		quietnessCombo.addSelectionListener(new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
 				if (getQuietnessOptionFor(quietnessCombo.getSelectionIndex()).equals(Command.SILENT)) {
-					MessageDialog.openWarning(getShell(), Policy.bind("CVSPreferencePage.silentWarningTitle"), Policy.bind("CVSPreferencePage.silentWarningMessage"));
+					MessageDialog.openWarning(getShell(), Policy.bind("CVSPreferencePage.silentWarningTitle"), Policy.bind("CVSPreferencePage.silentWarningMessage")); //$NON-NLS-1$ //$NON-NLS-2$
 				}
 			}
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -205,9 +205,9 @@ public class CVSPreferencesPage
 		IPreferenceStore store = getPreferenceStore();
 		pruneEmptyDirectoriesField.setSelection(store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES));
 		timeoutValue.setText(new Integer(store.getInt(ICVSUIConstants.PREF_TIMEOUT)).toString());
-		quietnessCombo.add(Policy.bind("CVSPreferencePage.notquiet"));
-		quietnessCombo.add(Policy.bind("CVSPreferencePage.somewhatquiet"));
-		quietnessCombo.add(Policy.bind("CVSPreferencePage.reallyquiet"));
+		quietnessCombo.add(Policy.bind("CVSPreferencePage.notquiet")); //$NON-NLS-1$
+		quietnessCombo.add(Policy.bind("CVSPreferencePage.somewhatquiet")); //$NON-NLS-1$
+		quietnessCombo.add(Policy.bind("CVSPreferencePage.reallyquiet")); //$NON-NLS-1$
 		quietnessCombo.select(store.getInt(ICVSUIConstants.PREF_QUIETNESS));
 		historyTracksSelectionButton.setSelection(store.getBoolean(ICVSUIConstants.PREF_HISTORY_TRACKS_SELECTION));
 		considerContentsInCompare.setSelection(store.getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRemoveResolutionGenerator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRemoveResolutionGenerator.java
index e772ed889..9801d3686 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRemoveResolutionGenerator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSRemoveResolutionGenerator.java
@@ -41,7 +41,7 @@ import org.eclipse.ui.IMarkerResolution;
 public class CVSRemoveResolutionGenerator extends CVSAbstractResolutionGenerator {
 	IMarkerResolution commitDeletion =new IMarkerResolution() {
 		public String getLabel() {
-			return "Commit Deletion to CVS";
+			return Policy.bind("CVSRemoveResloutionGenerator.Commit_Deletion_to_CVS_1"); //$NON-NLS-1$
 		}
 		public void run(IMarker marker) {
 			try {
@@ -88,7 +88,7 @@ public class CVSRemoveResolutionGenerator extends CVSAbstractResolutionGenerator
 
 	IMarkerResolution undoDeletionLocal = new IMarkerResolution() {
 		public String getLabel() {
-			return "Undo Deletion from Local History";
+			return Policy.bind("CVSRemoveResloutionGenerator.Undo_Deletion_from_Local_History_2"); //$NON-NLS-1$
 		}
 		public void run(IMarker marker) {
 			try {
@@ -120,7 +120,7 @@ public class CVSRemoveResolutionGenerator extends CVSAbstractResolutionGenerator
 					}
 					marker.delete();
 				} else {
-					throw new CVSException("No local history available. Try undoing from the server.");
+					throw new CVSException(Policy.bind("CVSRemoveResloutionGenerator.No_local_history_available._Try_undoing_from_the_server_3")); //$NON-NLS-1$
 				}
 			} catch (TeamException e) {
 				handle(e, null, null);
@@ -132,7 +132,7 @@ public class CVSRemoveResolutionGenerator extends CVSAbstractResolutionGenerator
 		
 	IMarkerResolution undoDeletion = new IMarkerResolution() {
 		public String getLabel() {
-			return "Undo Deletion from CVS Server";
+			return Policy.bind("CVSRemoveResloutionGenerator.Undo_Deletion_from_CVS_Server_4"); //$NON-NLS-1$
 		}
 		public void run(IMarker marker) {
 			try {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
index 4c92382da..5f0286af2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
@@ -64,7 +64,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants;
  */
 public class Console extends ViewPart {
 	public static final String CONSOLE_ID = "org.eclipse.team.ccvs.ui.console"; //$NON-NLS-1$
-	private static final DateFormat TIME_FORMAT = new SimpleDateFormat(Policy.bind("Console.resultTimeFormat"));
+	private static final DateFormat TIME_FORMAT = new SimpleDateFormat(Policy.bind("Console.resultTimeFormat")); //$NON-NLS-1$
 	private static ConsoleDocument document;
 	private static List /* of Console */ instances;
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
index 388ff8ce2..95b66d50e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
@@ -52,7 +52,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
 		}
 			
 		if (result[0] == null) {
-			throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.cancelled"));
+			throw new OperationCanceledException(Policy.bind("WorkbenchUserAuthenticator.cancelled")); //$NON-NLS-1$
 		}
 		
 		if (userinfo.isUsernameMutable())
@@ -75,7 +75,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
 	private void promptForPassword(final ICVSRepositoryLocation location, final String username, final String message, final boolean userMutable, final String[] result) {
 		Display display = Display.getCurrent();
 		Shell shell = new Shell(display);
-		UserValidationDialog dialog = new UserValidationDialog(shell, location.getLocation(), (username==null)?"":username, message);
+		UserValidationDialog dialog = new UserValidationDialog(shell, location.getLocation(), (username==null)?"":username, message);//$NON-NLS-1$
 		dialog.setUsernameMutable(userMutable);
 		dialog.open();
 		shell.dispose();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 151234a8b..1f986c400 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -583,3 +583,9 @@ CVSRemoveResolutionGenerator.Commit_Deletion_to_CVS_1=Commit Deletion to CVS
 CVSRemoveResolutionGenerator.Undo_Deletion_from_Local_History_2=Undo Deletion from Local History
 CVSRemoveResolutionGenerator.No_local_history_available._Try_undoing_from_the_server_3=No local history available. Try undoing from the server
 CVSRemoveResolutionGenerator.Undo_Deletion_from_CVS_Server_4=Undo Deletion from CVS Server
+CVSMoveDeleteHook.Team_Private_Resource_1=Team Private Resource
+CVSMoveDeleteHook.Deletion_of_team_private_resources_is_not_permitted_2=Deletion of team private resource ''{0}'' is not permitted
+CVSRemoveResloutionGenerator.Commit_Deletion_to_CVS_1=Commit Deletion to CVS
+CVSRemoveResloutionGenerator.Undo_Deletion_from_Local_History_2=Undo Deletion from Local History
+CVSRemoveResloutionGenerator.No_local_history_available._Try_undoing_from_the_server_3=No local history available. Try undoing from the server
+CVSRemoveResloutionGenerator.Undo_Deletion_from_CVS_Server_4=Undo Deletion from CVS Server