removed unecessary cvs preferences and added f1 help for the remaining cvs prefrerences.

5 files changed, 57 insertions, 72 deletions

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 e09c5e7c4..4f0b2ced5 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
@@ -44,6 +44,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
 import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.help.WorkbenchHelp;
 
 /**
  * CVS Preference Page
@@ -65,8 +66,6 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 	private Combo ksubstCombo;
 	private List ksubstOptions;
 	private Button considerContentsInCompare;
-	private Button promptOnFileDelete;
-	private Button promptOnFolderDelete;
 	private Button showMarkers;
 	private Button replaceUnmanaged;
 	
@@ -76,6 +75,7 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 
 	public CVSPreferencesPage() {
 		// sort the options by display text
+		setDescription(Policy.bind("CVSPreferencePage.description")); //$NON-NLS-1$
 		KSubstOption[] options = KSubstOption.getAllKSubstOptions();
 		this.ksubstOptions = new ArrayList();
 		for (int i = 0; i < options.length; i++) {
@@ -173,8 +173,12 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 	protected Control createContents(Composite parent) {
 		Composite composite = createComposite(parent, 2);
 
-		// set F1 help
-//		WorkbenchHelp.setHelp(composite, new DialogPageContextComputer(this, ICVSHelpContextIds.CVS_PREFERENCE_PAGE));
+		pruneEmptyDirectoriesField = createCheckBox(composite, Policy.bind("CVSPreferencePage.pruneEmptyDirectories")); //$NON-NLS-1$
+		considerContentsInCompare = createCheckBox(composite, Policy.bind("CVSPreferencePage.considerContentsInCompare")); //$NON-NLS-1$		
+		showMarkers = createCheckBox(composite, Policy.bind("CVSPreferencePage.showAddRemoveMarkers")); //$NON-NLS-1$		
+		replaceUnmanaged = createCheckBox(composite, Policy.bind("CVSPreferencePage.replaceUnmanaged")); //$NON-NLS-1$
+				
+		createLabel(composite, ""); createLabel(composite, "");
 		
 		createLabel(composite, Policy.bind("CVSPreferencePage.timeoutValue")); //$NON-NLS-1$
 		timeoutValue = createTextField(composite);
@@ -207,23 +211,8 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 		}
 		ksubstCombo = createCombo(composite, chars);
 		
-		pruneEmptyDirectoriesField = createCheckBox(composite, Policy.bind("CVSPreferencePage.pruneEmptyDirectories")); //$NON-NLS-1$
-		
-		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")); //$NON-NLS-1$
-		promptOnFileDelete.setToolTipText(Policy.bind("CVSPreferencePage.promptOnFileDeleteTooltip")); //$NON-NLS-1$
-
-		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")); //$NON-NLS-1$
-		showMarkers.setToolTipText(Policy.bind("CVSPreferencePage.showAddRemoveMarkersTooltip")); //$NON-NLS-1$
-		
-		replaceUnmanaged = createCheckBox(composite, Policy.bind("CVSPreferencePage.replaceUnmanaged")); //$NON-NLS-1$
-		replaceUnmanaged.setToolTipText(Policy.bind("CVSPreferencePage.replaceUnmanagedTooltip")); //$NON-NLS-1$
-		
+		createLabel(composite, ""); createLabel(composite, "");
+				
 		createSaveCombo(composite);
 				
 		initializeValues();
@@ -239,6 +228,15 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 			}
 		});
 
+		WorkbenchHelp.setHelp(pruneEmptyDirectoriesField, IHelpContextIds.PREF_PRUNE);
+		WorkbenchHelp.setHelp(compressionLevelCombo, IHelpContextIds.PREF_COMPRESSION);
+		WorkbenchHelp.setHelp(quietnessCombo, IHelpContextIds.PREF_QUIET);
+		WorkbenchHelp.setHelp(ksubstCombo, IHelpContextIds.PREF_KEYWORDMODE);
+		WorkbenchHelp.setHelp(timeoutValue, IHelpContextIds.PREF_COMMS_TIMEOUT);
+		WorkbenchHelp.setHelp(considerContentsInCompare, IHelpContextIds.PREF_CONSIDER_CONTENT);
+		WorkbenchHelp.setHelp(replaceUnmanaged, IHelpContextIds.PREF_REPLACE_DELETE_UNMANAGED);
+		WorkbenchHelp.setHelp(showMarkers, IHelpContextIds.PREF_MARKERS_ENABLED);
+						
 		return composite;
 	}
 	/**
@@ -291,8 +289,6 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 		}
 		ksubstCombo.select(getKSubstComboIndexFor(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST)));
 		considerContentsInCompare.setSelection(store.getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS));
-		promptOnFileDelete.setSelection(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
-		promptOnFolderDelete.setSelection(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
 		showMarkers.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
 		replaceUnmanaged.setSelection(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
 		
@@ -329,8 +325,6 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 		store.setValue(ICVSUIConstants.PREF_COMPRESSION_LEVEL, compressionLevelCombo.getSelectionIndex());
 		store.setValue(ICVSUIConstants.PREF_TEXT_KSUBST, ((KSubstOption) ksubstOptions.get(ksubstCombo.getSelectionIndex())).toMode());
 		store.setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, considerContentsInCompare.getSelection());
-		store.setValue(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE, promptOnFileDelete.getSelection());
-		store.setValue(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE, promptOnFolderDelete.getSelection());
 		store.setValue(ICVSUIConstants.PREF_SHOW_MARKERS, showMarkers.getSelection());
 		store.setValue(ICVSUIConstants.PREF_REPLACE_UNMANAGED, replaceUnmanaged.getSelection());
 		store.setValue(PREF_SAVE_DIRTY_EDITORS, getSaveRadio());
@@ -348,10 +342,6 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 		KSubstOption oldKSubst = CVSProviderPlugin.getPlugin().getDefaultTextKSubstOption();
 		KSubstOption newKSubst = KSubstOption.fromMode(store.getString(ICVSUIConstants.PREF_TEXT_KSUBST));
 		CVSProviderPlugin.getPlugin().setDefaultTextKSubstOption(newKSubst);
-		CVSProviderPlugin.getPlugin().setPromptOnFileDelete(
-			store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
-		CVSProviderPlugin.getPlugin().setPromptOnFolderDelete(
-			store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
 		
 		// changing the default keyword substitution mode for text files may affect
 		// information displayed in the decorators
@@ -372,19 +362,17 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref
 		quietnessCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_QUIETNESS));
 		compressionLevelCombo.select(store.getDefaultInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL));
 		ksubstCombo.select(getKSubstComboIndexFor(store.getDefaultString(ICVSUIConstants.PREF_TEXT_KSUBST)));
-		promptOnFileDelete.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
-		promptOnFolderDelete.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
 		showMarkers.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
 		replaceUnmanaged.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
 		initializeSaveRadios(store.getDefaultInt(PREF_SAVE_DIRTY_EDITORS));
 	}
 
    private void createSaveCombo(Composite composite) {
-		Group group = new Group(composite, SWT.LEFT);
-		GridLayout layout = new GridLayout();
-		group.setLayout(layout);
+		Group group = new Group(composite, SWT.NULL);
 		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
 		group.setLayoutData(data);
+		GridLayout layout = new GridLayout();
+		group.setLayout(layout);
 		group.setText(Policy.bind("CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1")); //$NON-NLS-1$
 		
 		never = new Button(group, SWT.RADIO | SWT.LEFT);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 976d0a2ee..8bd5a8351 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -247,8 +247,6 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 		store.setDefault(ICVSUIConstants.PREF_TIMEOUT, CVSProviderPlugin.DEFAULT_TIMEOUT);
 		store.setDefault(ICVSUIConstants.PREF_SHOW_MODULES, false);
 		store.setDefault(ICVSUIConstants.PREF_CONSIDER_CONTENTS, false);
-		store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE, true);
-		store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE, true);
 		store.setDefault(ICVSUIConstants.PREF_SHOW_MARKERS, true);
 		store.setDefault(ICVSUIConstants.PREF_COMPRESSION_LEVEL, CVSProviderPlugin.DEFAULT_COMPRESSION_LEVEL);
 		store.setDefault(ICVSUIConstants.PREF_TEXT_KSUBST, CVSProviderPlugin.DEFAULT_TEXT_KSUBST_OPTION.toMode());
@@ -286,8 +284,6 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 		CVSProviderPlugin.getPlugin().setCvsRshCommand(store.getString(ICVSUIConstants.PREF_CVS_RSH));
 		CVSProviderPlugin.getPlugin().setCvsServer(store.getString(ICVSUIConstants.PREF_CVS_SERVER));
 		CVSProviderPlugin.getPlugin().setQuietness(CVSPreferencesPage.getQuietnessOptionFor(store.getInt(ICVSUIConstants.PREF_QUIETNESS)));
-		CVSProviderPlugin.getPlugin().setPromptOnFileDelete(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
-		CVSProviderPlugin.getPlugin().setPromptOnFolderDelete(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
 		CVSProviderPlugin.getPlugin().setShowTasksOnAddAndDelete(store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
 		CVSProviderPlugin.getPlugin().setCompressionLevel(store.getInt(ICVSUIConstants.PREF_COMPRESSION_LEVEL));
 		CVSProviderPlugin.getPlugin().setReplaceUnmanaged(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index a63cd7ed4..142a9f737 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -47,8 +47,6 @@ public interface ICVSUIConstants {
 	public final String PREF_CVS_RSH = "pref_cvs_rsh"; //$NON-NLS-1$
 	public final String PREF_CVS_SERVER = "pref_cvs_server"; //$NON-NLS-1$
 	public final String PREF_CONSIDER_CONTENTS = "pref_consider_contents"; //$NON-NLS-1$
-	public final String PREF_PROMPT_ON_FILE_DELETE = "pref_prompt_on_file_delete"; //$NON-NLS-1$
-	public final String PREF_PROMPT_ON_FOLDER_DELETE = "pref_prompt_on_folder_delete"; //$NON-NLS-1$
 	public final String PREF_SHOW_MARKERS = "pref_show_markers"; //$NON-NLS-1$
 	public final String PREF_REPLACE_UNMANAGED = "pref_replace_unmanaged"; //$NON-NLS-1$
 	public final String PREF_COMPRESSION_LEVEL = "pref_compression_level"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
index 2ca718c29..fa7ea11a3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
@@ -17,4 +17,14 @@ public interface IHelpContextIds {
 	public static final String TAG_CONFIGURATION_OVERVIEW = PREFIX + "tag_configuration_overview"; //$NON-NLS-1$
 	public static final String TAG_CONFIGURATION_REFRESHLIST = PREFIX + "tag_configuration_refreshlist"; //$NON-NLS-1$
 	public static final String TAG_CONFIGURATION_REFRESHACTION = PREFIX + "tag_configuration_refreshaction"; //$NON-NLS-1$
+	
+	// Preference Pages
+	public static final String PREF_PRUNE = PREFIX + "prune_empty_directories_pref"; //$NON-NLS-1$
+	public static final String PREF_QUIET = PREFIX + "quietness_level_pref"; //$NON-NLS-1$
+	public static final String PREF_COMPRESSION = PREFIX + "compression_level_pref"; //$NON-NLS-1$
+	public static final String PREF_KEYWORDMODE = PREFIX + "default_keywordmode_pref"; //$NON-NLS-1$
+	public static final String PREF_COMMS_TIMEOUT = PREFIX + "comms_timeout_pref"; //$NON-NLS-1$
+	public static final String PREF_CONSIDER_CONTENT = PREFIX + "consider_content_pref"; //$NON-NLS-1$
+	public static final String PREF_MARKERS_ENABLED = PREFIX + "markers_enabled_pref"; //$NON-NLS-1$
+	public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$
 }
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 b759bb280..1bb326151 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
@@ -143,28 +143,34 @@ CVSPropertiesPage.defaultPort=Default
 CVSPropertiesPage.tag=Tag:
 CVSPropertiesPage.update=Change &Tag...
 
+CVSPreferencePage.description=General CVS settings:
 CVSPreferencePage.pruneEmptyDirectories=&Prune empty directories
-CVSPreferencePage.timeoutValue=&Communication timeout value (in seconds)
-CVSPreferencePage.quietness=&Quietness level
+CVSPreferencePage.timeoutValue=&Communication timeout (in seconds):
+CVSPreferencePage.quietness=&Quietness level:
 CVSPreferencePage.notquiet=Verbose
 CVSPreferencePage.somewhatquiet=Somewhat quiet
 CVSPreferencePage.reallyquiet=Very quiet
 CVSPreferencePage.silentWarningTitle="Very Quiet" mode is dangerous
 CVSPreferencePage.silentWarningMessage= In "Very Quiet" mode, some cvs servers may not communicate important information about errors that have occured. You may want to consider using "Somewhat quiet" mode instead.
-CVSPreferencePage.showModules=&Show modules from CVSROOT/modules in repository view 
-CVSPreferencePage.considerContentsInCompare=&Consider file contents instead of timestamp information when comparing CVS files
-CVSPreferencePage.considerContentsInCompareTooltip=The fastest method of comparing CVS files is to consider the timestamps.\nHowever, in some cases a more accurate comparison can be achieved\nby comparing the content of files. This setting applies to all\nCVS compare editors and the Synchronize view.
-CVSPreferencePage.promptOnFileDelete=&Prompt for confirmation on deletion of managed files
-CVSPreferencePage.promptOnFileDeleteTooltip=Deletion of managed files results in an outgoing deletion that will be sent to the \nserver on the next commit. The user can choose to be prompted for confirmation \non the deletion of managed files.
-CVSPreferencePage.promptOnFolderDelete=Prompt for confirmation on deletion of managed &folders
-CVSPreferencePage.promptOnFolderDeleteTooltip=Deletion of managed folders deletes any child files but not the folder or any sub-folders. \nAny deleted files will result in outgoing deletion that will be sent to the server on the next commit. \nThe user can choose to be prompted for confirmation on the deletion of managed folders.
-CVSPreferencePage.showAddRemoveMarkers=Show &markers for added and removed resources in the Task view
-CVSPreferencePage.showAddRemoveMarkersTooltip=Markers will be placed in the task view for resources that have been locally removed but not \ncommitted and resources that have been locally added but not placed under CVS control.
-CVSPreferencePage.replaceUnmanaged=&Delete unmanaged resources on any Replace With operation
-CVSPreferencePage.replaceUnmanagedTooltip=On a Replace With... operation, files that are not under CVS control can be left as is or deleted automatically.
-CVSPreferencePage.defaultTextKSubst=Default &keyword substitution mode for text files
-
-CVSPreferencePage.title=General settings CVS.
+CVSPreferencePage.considerContentsInCompare=Con&sider file contents in comparisons
+CVSPreferencePage.showAddRemoveMarkers=Show added/deleted &markers
+CVSPreferencePage.replaceUnmanaged=&Delete unmanaged resources on replace
+CVSPreferencePage.defaultTextKSubst=Default &keyword substitution:
+CVSPreferencePage.compressionLevel=Compression &level:
+CVSPreferencePage.level0=0 (disabled)
+CVSPreferencePage.level1=1 (lowest compression)
+CVSPreferencePage.level2=2
+CVSPreferencePage.level3=3
+CVSPreferencePage.level4=4
+CVSPreferencePage.level5=5
+CVSPreferencePage.level6=6 (default)
+CVSPreferencePage.level7=7
+CVSPreferencePage.level8=8
+CVSPreferencePage.level9=9 (highest compression)
+CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1=Save dirty editors before CVS operations
+CVSPreferencePage.&Never_2=&Never
+CVSPreferencePage.&Prompt_3=&Prompt
+CVSPreferencePage.Auto-&save_4=Auto-s&ave
 
 CVSRemoteFilePropertySource.name=Name
 CVSRemoteFilePropertySource.revision=Revision
@@ -635,18 +641,6 @@ CVSRemoveResloutionGenerator.Undo_Deletion_from_Local_History_2=Undo Deletion fr
 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
 
-CVSPreferencePage.compressionLevel=Compression &level (if supported by server)
-CVSPreferencePage.level0=0 (disabled)
-CVSPreferencePage.level1=1 (lowest compression)
-CVSPreferencePage.level2=2
-CVSPreferencePage.level3=3
-CVSPreferencePage.level4=4
-CVSPreferencePage.level5=5
-CVSPreferencePage.level6=6 (default)
-CVSPreferencePage.level7=7
-CVSPreferencePage.level8=8
-CVSPreferencePage.level9=9 (highest compression)
-
 TagConfigurationDialog.1=Tag Configuration for {0}
 TagConfigurationDialog.2=Tag Configuration for {0} projects
 TagConfigurationDialog.4=Configure the branch and version tags you will see in the workbench for these projects.
@@ -704,13 +698,12 @@ IgnoreResourcesDialog.addCustomEntryButton=Add a custom pattern.
 IgnoreResourcesDialog.addCustomEntryExample=The wildcard characters ''*'' and ''?'' are permitted.
 IgnoreResourcesDialog.patternMustNotBeEmpty=Pattern must not be empty.
 IgnoreResourcesDialog.patternDoesNotMatchFile=Pattern does not match all selected resources: eg. {0}
+
 ContentAction.Confirm_Long_Operation_1=Confirm Long Operation
 ContentAction.Changing_this_setting_will_involve_contacting_the_server_and_may_be_long-running_2=Changing this setting will involve contacting the server and may be long-running
-CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1=Save dirty editors before CVS operations
-CVSPreferencePage.&Never_2=&Never
-CVSPreferencePage.&Prompt_3=&Prompt
-CVSPreferencePage.Auto-&save_4=Auto-&save
+
 CVSProjectPropertiesPage.You_can_change_the_sharing_of_this_project_to_another_repository_location._However,_this_is_only_possible_if_the_new_location_is___compatible___(on_the_same_host_with_the_same_repository_path)._1=You can change the sharing of this project to another repository location. However, this is only possible if the new location is \"compatible\" (on the same host with the same repository path).
+
 ConfigurationWizardMainPage.Location_1=Location
 ConfigurationWizardMainPage.Authentication_2=Authentication
 ConfigurationWizardMainPage.Connection_3=Connection