Mnemonic collision fixes

18087: "Set Keyword Substitution" should be renamed?
19951: Need global preference for treating repositories as binary only
18609: Making un-added more obvious

1 files changed, 22 insertions, 10 deletions

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 9b15669c0..c7126d8b1 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
@@ -47,7 +47,7 @@ BranchWizardPage.existingVersionsAndBranches=Existing Versions and Branches:
 ConsolePreferencePage.consoleColorSettings=Console text color settings.
 ConsolePreferencePage.commandColor=Command &Line:
 ConsolePreferencePage.messageColor=&Message:
-ConsolePreferencePage.errorColor=&Error:
+ConsolePreferencePage.errorColor=E&rror:
 ConsolePreferencePage.font=Console font setting:
 ConsolePreferencePage.autoOpen=&Show CVS Console when there is output
 
@@ -108,6 +108,8 @@ CVSDecorator.fileDecorationWithTag={0} [{1}:{2}]
 CVSDecorator.fileDecorationNoTag={0} [{1}]
 CVSDecorator.folderDecoration={0} [{1}]
 
+CVSDecoratorPreferencesPage.newResources=Indicate is &new resource
+
 CVSFilePropertiesPage.ignored=The file is ignored by CVS.
 CVSFilePropertiesPage.notManaged=The file is not managed by CVS.
 CVSFilePropertiesPage.isAdded=This file has been added to CVS control but has not been committed
@@ -174,6 +176,7 @@ CVSPreferencePage.Save_dirty_editors_before_CVS_operations_1=Save dirty editors
 CVSPreferencePage.&Never_2=&Never
 CVSPreferencePage.&Prompt_3=P&rompt
 CVSPreferencePage.Auto-&save_4=&Auto-save
+CVSPreferencePage.repositoriesAreBinary=&Treat all new files as binary
 
 CVSRemoteFilePropertySource.name=Name
 CVSRemoteFilePropertySource.revision=Revision
@@ -198,6 +201,15 @@ CVSSyncCompareInput.confirmMergeMessage=Your changes have been saved. When you a
 					select 'Mark as Merged' to make this file an outgoing change. 
 CVSSyncCompareInput.projectDeleted=Project ''{0}'' has been deleted locally and cannot be synchronized.
 
+CVSSyncSet.conflicts={0} conflicts, 
+CVSSyncSet.incomings={0} incoming change(s), 
+CVSSyncSet.noConflicts=No conflicts, 
+CVSSyncSet.noIncomings=no incoming changes, 
+CVSSyncSet.noOutgoings=no outgoing changes, 
+CVSSyncSet.outgoings={0} outgoing change(s), 
+CVSSyncSet.noNew=no new resources.
+CVSSyncSet.new={0} new resource(s).
+
 CVSUIPlugin.refreshTitle=Refresh Resource?
 CVSUIPlugin.refreshQuestion={0} Would you like to refresh resource ''{1}''?
 CVSUIPlugin.refreshMultipleQuestion={0} Would you like to refresh the selected resources?
@@ -464,14 +476,14 @@ KSubstWizardSelectionPage.binaryButton=&Binary (-kb)
 KSubstWizardSelectionPage.binaryLabel=\
   Binary files are stored in the repository without alteration.\n\
   CVS does not directly support conflict resolution for binary files.
-KSubstWizardSelectionPage.textButton=&Text without keyword substitution (-ko)
+KSubstWizardSelectionPage.textButton=A&SCII without keyword substitution (-ko)
 KSubstWizardSelectionPage.textLabel=\
   End of lines are replaced with the appropriate convention for the client system.\n\
-  CVS supports conflict resolution and differencing of text files with single line granularity.
-KSubstWizardSelectionPage.textWithSubstitutionsButton=Text with &keyword substitution
+  CVS supports conflict resolution and differencing of ASCII files with single line granularity.
+KSubstWizardSelectionPage.textWithSubstitutionsButton=ASCII with &keyword substitution
 KSubstWizardSelectionPage.textWithSubstitutionsLabel=\
   End of lines are replaced with the appropriate convention for the client system.\n\
-  Text files may contain keywords that are expanded by the CVS server during file transfers.\n\
+  ASCII files may contain keywords that are expanded by the CVS server during file transfers.\n\
   Please consult the CVS documentation for a description of the various supported keywords and modes.
 
 KSubstWizardSummaryPage.pageTitle=Summary
@@ -487,7 +499,7 @@ KSubstWizardSummaryPage.summaryViewer.fileHeader=File Location
 KSubstWizardSummaryPage.summaryViewer.ksubstHeader=Keyword Substitution Mode
 
 SharingWizard.autoConnectTitle=Connect Project to Repository
-SharingWizard.autoConnectOneOTitle=Connect Project from Eclise 1.0 to Repository
+SharingWizard.autoConnectOneOTitle=Connect Project from Eclipse 1.0 to Repository
 SharingWizard.autoConnectTitleDescription=Project is already configured with CVS repository information.
 SharingWizard.couldNotImport=Remote Project Exists
 SharingWizard.couldNotImportLong=Module ''{0}'' already exists remotely. Would you like to synchronize your local project with the existing remote module?
@@ -612,11 +624,11 @@ Add_Varia&bles_17=Add Varia&bles
 &Project_Format__18=&Project Format:
 Add_Variable&s_19=Add Variable&s
 &Label_decoration_for_outgoing__20=&Label decoration for outgoing:
-Label_decorat&ion_for_added__22=Label decorat&ion for added:
+Label_decorat&ion_for_added__22=Label decora&tion for added:
 Icon_Overlays_24=Icons
-Sho&w_outgoing_25=Sho&w outgoing
-Show_has_&remote_26=Show has &remote
-S&how_is_added_27=S&how is added
+Sho&w_outgoing_25=Indicate is out&going
+Show_has_&remote_26=Indicate &has remote
+S&how_is_added_27=Indi&cate is added
 &Compute_deep_outgoing_state_for_folders_(disabling_this_will_improve_decorator_performance)_28=&Compute deep outgoing state for folders (disabling this will improve decorator performance)
 Select_the_&variables_to_add_to_the_decoration_format__30=Select the &variables to add to the decoration format:
 Add_Variables_31=Add Variables