[223204] [cleanup] fix broken nls strings in files.ui and others

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java

@@ -27,6 +27,7 @@
  * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  * David McKnight   (IBM)        - [220123] [api][dstore] Configurable timeout on irresponsiveness
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  *******************************************************************************/
 
 package org.eclipse.rse.connectorservice.dstore;
@@ -1026,7 +1027,8 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					else
 					{
 						String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION, launchStatus.getMessage());
-						msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_SSL_EXCEPTION, IStatus.ERROR, cmsg);
+						String cmsgDetails = ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION_DETAILS;
+						msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_SSL_EXCEPTION, IStatus.ERROR, cmsg, cmsgDetails);
 					}
 				} 	
 		    }

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java

@@ -40,11 +40,9 @@ public class ConnectorServiceResources extends NLS
 	public static String MSG_COMM_CONNECT_FAILED;
 	public static String MSG_COMM_CONNECT_FAILED_DETAILS;
 
-	public static String MSG_VALIDATE_PASSWORD_EMPTY;
 	public static String MSG_VALIDATE_PASSWORD_EXPIRED;
 	public static String MSG_VALIDATE_PASSWORD_INVALID;
 	
-	public static String MSG_VALIDATE_PASSWORD_EMPTY_DETAILS;
 	public static String MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
 	public static String MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
 	

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties

@@ -14,6 +14,7 @@
 # Contributors:
 # David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
 # David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+# David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
@@ -37,9 +38,6 @@ MSG_CONNECTING_TO_SERVER= Connecting to Remote System Explorer host server on po
 MSG_INITIALIZING_SERVER= Initializing Remote System Explorer host server
 MSG_PORT_OUT_RANGE = The specified server port is out of the allowed range: {0}
 
-MSG_VALIDATE_PASSWORD_EMPTY=Enter password
-MSG_VALIDATE_PASSWORD_EMPTY_DETAILS=You must specify your password.
-
 MSG_VALIDATE_PASSWORD_EXPIRED=Password has expired
 MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS=Your password has expired, and must be reset before continuing.
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java

@@ -18,6 +18,7 @@
  * David McKnight   (IBM)        - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  *******************************************************************************/
 
 package org.eclipse.rse.internal.files.ui;
@@ -40,23 +41,10 @@ public class FileResources extends NLS
 	public static String RSEOperation_message;
 
 	// --- File Editors ---
-	public static String FileEditorPreference_fileTypes;
+
-	public static String FileEditorPreference_add;
-	public static String FileEditorPreference_remove;
-	public static String FileEditorPreference_associatedEditors;
-	public static String FileEditorPreference_addEditor;
-	public static String FileEditorPreference_removeEditor;
-	public static String FileEditorPreference_default;
 	public static String FileEditorPreference_existsTitle;
 	public static String FileEditorPreference_existsMessage;
-	public static String FileEditorPreference_defaultLabel;
-    public static String FileEditorPreference_contentTypesRelatedLink;
-    public static String FileEditorPreference_isLocked;
 
-	public static String FileExtension_fileTypeMessage;
-	public static String FileExtension_fileTypeLabel;
-	public static String FileExtension_shellTitle;
-	public static String FileExtension_dialogTitle;
 	
 	public static String DefaultEditorDescription_name;
 
@@ -88,11 +76,9 @@ public class FileResources extends NLS
 	// PREFERENCES FOR UNIVERSAL FILE SYSTEM ...
 	// ---------------------------------------------------
 
-	public static String RESID_PREF_UNIVERSAL_FILES_TITLE;
 	public static String RESID_PREF_UNIVERSAL_SHOWHIDDEN_LABEL;
 	
 	public static String RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL;
-	public static String RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_TOOLTIP;
 
 	public static String RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_LABEL;
 	public static String RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_TOOLTIP;
@@ -168,30 +154,9 @@ public class FileResources extends NLS
 	public static String RESID_SEARCH_INCLUDE_SUBFOLDERS_LABEL;
 	public static String RESID_SEARCH_INCLUDE_SUBFOLDERS_TOOLTIP;
 
-	// advanced search filters
-	public static String RESID_SEARCH_CONNECTIONNAMELABEL_LABEL;
-	public static String RESID_SEARCH_CONNECTIONNAMELABEL_TOOLTIP;
 
-	public static String RESID_SEARCH_TARGETGROUP_LABEL;
-	public static String RESID_SEARCH_TARGETGROUP_TOOLTIP;
-
-	public static String RESID_SEARCH_COLUMNSGROUP_LABEL;
-	public static String RESID_SEARCH_COLUMNSGROUP_TOOLTIP;
-
-	public static String RESID_SEARCH_ALLCOLUMNSLABEL_LABEL;
-	public static String RESID_SEARCH_ALLCOLUMNSLABEL_TOOLTIP;
-
-	public static String RESID_SEARCH_BETWEENLABEL_LABEL;
-	public static String RESID_SEARCH_ANDLABEL_LABEL;
-	public static String RESID_SEARCH_EOLLABEL_LABEL;
-	public static String RESID_SEARCH_FIRSTCOLUMN_TOOLTIP;
-	public static String RESID_SEARCH_SECONDCOLUMN_TOOLTIP;
-	public static String RESID_SEARCH_BOTHCOLUMNSLABEL_TOOLTIP;
-	public static String RESID_SEARCH_STARTCOLUMNLABEL_TOOLTIP;
 
 	public static String RESID_SEARCH_MESSAGE_SEARCHING;
-	public static String RESID_SEARCH_MESSAGE_ONEMATCH;
-	public static String RESID_SEARCH_MESSAGE_MULTIPLEMATCHES;
 
 	// Resource conflict dlg constants
 	public static String RESID_CONFLICT_SAVE_TITLE;
@@ -207,16 +172,12 @@ public class FileResources extends NLS
 	public static String RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL;
 
 	// RSE Cache Preferences
-	public static String RESID_PREF_CACHE_DESCRIPTION;
 	public static String RESID_PREF_CACHE_CLEAR;
-	public static String RESID_PREF_CACHE_CLEAR_LABEL;
 	public static String RESID_PREF_CACHE_CLEAR_TOOLTIP;
 	public static String RESID_PREF_CACHE_LIMIT_CACHE_SIZE_LABEL;
 	public static String RESID_PREF_CACHE_LIMIT_CACHE_SIZE_TOOLTIP;
 	public static String RESID_PREF_CACHE_MAX_CACHE_SIZE_LABEL;
-	public static String RESID_PREF_CACHE_MAX_CACHE_SIZE_DESCRIPTION;
 	public static String RESID_PREF_CACHE_MAX_CACHE_SIZE_TOOLTIP;
-	public static String RESID_PREF_CACHE_CLEAR_WARNING_LABEL;
 	public static String RESID_PREF_CACHE_CLEAR_WARNING_DESCRIPTION;
 
 	// SUPERTRANSFER PROGRESS MONITOR CONSTANTS
@@ -226,7 +187,6 @@ public class FileResources extends NLS
 
 	public static String RESID_SUPERTRANSFER_PROGMON_SUBTASK_TRANSFER;
 	public static String RESID_SUPERTRANSFER_PROGMON_SUBTASK_EXTRACT;
-	public static String RESID_SUPERTRANSFER_PROGMON_ARCHIVE;
 
 	// SUPERTRANSFER PREFERENCES PAGE CONSTANTS
 	public static String RESID_SUPERTRANSFER_PREFS_ENABLE;
@@ -245,8 +205,6 @@ public class FileResources extends NLS
 	public static String ACTION_REPLACEWITH_HISTORY_TOOLTIP;
 
 
-	// Project menu item 
-	public static String RESID_OPEN_FROM_ASSOCIATED_PROJECT;
 	
 	// Other Actions
 	public static String ACTION_NEWFOLDER_LABEL;
@@ -338,11 +296,6 @@ public class FileResources extends NLS
 	public static String	RESID_PROPERTY_FILE_READONLY_LABEL;
 	public static String	RESID_PROPERTY_FILE_READONLY_TOOLTIP;
 
-	public static String	RESID_PROPERTY_FILE_READABLE_LABEL;
-	public static String	RESID_PROPERTY_FILE_READABLE_TOOLTIP;
-
-	public static String	RESID_PROPERTY_FILE_WRITABLE_LABEL;
-	public static String	RESID_PROPERTY_FILE_WRITABLE_TOOLTIP;
 
 	public static String	RESID_PROPERTY_FILE_HIDDEN_LABEL;
 	public static String	RESID_PROPERTY_FILE_HIDDEN_TOOLTIP;
@@ -358,12 +311,7 @@ public class FileResources extends NLS
 
 	
 	// messages
-
-	public static String MSG_ERROR_FOLDER_NOTFOUND;
 	public static String MSG_ERROR_FILE_NOTFOUND; 
-	public static String MSG_ERROR_FOLDERORFILE_NOTFOUND;
-	public static String MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED;
-	public static String MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED_DETAILS;
 
 	// Remote editing messages
 	public static String MSG_DOWNLOAD_NO_WRITE;
@@ -373,44 +321,33 @@ public class FileResources extends NLS
 	public static String MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR_DETAILS;
 
 	// file transfer messages
-	public static String MSG_DOWNLOAD_PROGRESS;
-	public static String MSG_UPLOAD_PROGRESS;
 	public static String MSG_SYNCHRONIZE_PROGRESS;
 	public static String MSG_EXTRACT_PROGRESS;
-	public static String MSG_PERCENT_DONE;
 	public static String MSG_DOWNLOADING_PROGRESS;
 	public static String MSG_UPLOADING_PROGRESS;
 	
     // Remote File Exception Messages
   	public static String FILEMSG_SECURITY_ERROR;
   	public static String FILEMSG_IO_ERROR;
-  	public static String FILEMSG_FOLDER_NOTEMPTY;
   	public static String FILEMSG_FOLDER_NOTFOUND;
-  	public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE;
   	public static String FILEMSG_FILE_NOTFOUND;
 		
   	public static String FILEMSG_SECURITY_ERROR_DETAILS;
   	public static String FILEMSG_IO_ERROR_DETAILS;
-  	public static String FILEMSG_FOLDER_NOTEMPTY_DETAILS;
+
-  	public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS;
 
   	
     // --------------------------
     // UNIVERSAL FILE MESSAGES...
     // --------------------------	
-	public static  String FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY;
 	public static  String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE;
-	public static  String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID;
+
-	public static  String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES;
 	
     public static  String FILEMSG_DELETE_FILE_FAILED;
-    public static  String FILEMSG_RENAME_FILE_FAILED;
     public static  String FILEMSG_CREATE_FILE_FAILED;
     public static  String FILEMSG_CREATE_FILE_FAILED_EXIST;
-    public static  String FILEMSG_CREATE_FOLDER_FAILED;
     public static  String FILEMSG_CREATE_FOLDER_FAILED_EXIST;
     public static  String FILEMSG_CREATE_RESOURCE_NOTVISIBLE;
-    public static  String FILEMSG_RENAME_RESOURCE_NOTVISIBLE;
 	public static  String FILEMSG_ERROR_NOFILETYPES;
     public static  String FILEMSG_COPY_FILE_FAILED;
     public static  String FILEMSG_MOVE_FILE_FAILED;
@@ -420,13 +357,10 @@ public class FileResources extends NLS
 	public static  String FILEMSG_MOVE_FILTER_NOT_VALID;
 
     public static  String FILEMSG_DELETE_FILE_FAILED_DETAILS;
-    public static  String FILEMSG_RENAME_FILE_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FILE_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS;
-    public static  String FILEMSG_CREATE_FOLDER_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS;
     public static  String FILEMSG_CREATE_RESOURCE_NOTVISIBLE_DETAILS;
-    public static  String FILEMSG_RENAME_RESOURCE_NOTVISIBLE_DETAILS;
 	public static  String FILEMSG_ERROR_NOFILETYPES_DETAILS;
     public static  String FILEMSG_COPY_FILE_FAILED_DETAILS;
     public static  String FILEMSG_MOVE_FILE_FAILED_DETAILS;
@@ -436,31 +370,21 @@ public class FileResources extends NLS
 	public static  String FILEMSG_MOVE_FILTER_NOT_VALID_DETAILS;
 	
 	public static String FILEMSG_MOVE_INTERRUPTED;
-	public static String FILEMSG_RENAME_INTERRUPTED;	
-	public static String FILEMSG_DELETE_INTERRUPTED;
 	public static String FILEMSG_COPY_INTERRUPTED;
 	public static String FILEMSG_MOVE_INTERRUPTED_DETAILS;
-	public static String FILEMSG_RENAME_INTERRUPTED_DETAILS;	
-	public static String FILEMSG_DELETE_INTERRUPTED_DETAILS;
 	public static String FILEMSG_COPY_INTERRUPTED_DETAILS;
 	
 	// cache preferences
 	public static String MSG_CACHE_UPLOAD_BEFORE_DELETE;
 	public static String MSG_CACHE_UNABLE_TO_SYNCH;
 
-	public static  String FILEMSG_DELETING;
-
-	public static String MSG_ERROR_CONNECTION_NOTFOUND;
 	public static String MSG_ERROR_PROFILE_NOTFOUND;
-	public static String MSG_ERROR_CONNECTION_NOTFOUND_DETAILS;
+	public static String MSG_ERROR_CONNECTION_NOTFOUND;
-	public static String MSG_ERROR_PROFILE_NOTFOUND_DETAILS;
 	
 	public static String MSG_VALIDATE_PATH_EMPTY;
-	public static String MSG_VALIDATE_PATH_NOTUNIQUE;
+
-	public static String MSG_VALIDATE_PATH_NOTVALID;
 	public static String MSG_VALIDATE_PATH_EMPTY_DETAILS;
-	public static String MSG_VALIDATE_PATH_NOTUNIQUE_DETAILS;
+
-	public static String MSG_VALIDATE_PATH_NOTVALID_DETAILS;
 	
 
 
@@ -473,8 +397,6 @@ public class FileResources extends NLS
 	public static String MSG_CREATEFILEGENERIC_PROGRESS;
 	public static String MSG_CREATEFOLDERGENERIC_PROGRESS;
   	
-	// universal commands
-	public static String MSG_UCMD_INVOCATION_EMPTY;
 
 	// preferences
 	public static String MSG_ERROR_FILENAME_INVALID;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties

@@ -18,6 +18,7 @@
 # David McKnight (IBM)- [216252] [nls] Resources specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
 # David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 # David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
+# David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -35,23 +36,9 @@ ResourceNavigator_openWith = Open Wit&h
 RSEOperation_message = Remote System Explorer Operation
 
 # --- File Editors ---
-FileEditorPreference_fileTypes = File &types:
-FileEditorPreference_add = &Add...
-FileEditorPreference_remove = &Remove
-FileEditorPreference_associatedEditors = Associated &editors:
-FileEditorPreference_addEditor = A&dd...
-FileEditorPreference_removeEditor = Re&move
-FileEditorPreference_default = De&fault
 FileEditorPreference_existsTitle = File Type Exists
 FileEditorPreference_existsMessage = An entry already exists for that file type
-FileEditorPreference_defaultLabel = (default)
-FileEditorPreference_contentTypesRelatedLink = See <a>''{0}''</a> for content-type based file associations.
-FileEditorPreference_isLocked = {0} (locked by ''{1}'' content type)
 
-FileExtension_fileTypeMessage =Enter file type to add: (*.doc or report.doc for example)
-FileExtension_fileTypeLabel = File &type:
-FileExtension_shellTitle = New File Type
-FileExtension_dialogTitle = Define a New File Type
 
 DefaultEditorDescription_name = &Default Editor
 
@@ -84,11 +71,9 @@ RESID_NEWFOLDER_FOLDER_TIP=Folder in which the new folder will be created
 ##############################################################
 # Preference pages for universal file system
 ##############################################################
-RESID_PREF_UNIVERSAL_FILES_TITLE=File System Preferences
 RESID_PREF_UNIVERSAL_SHOWHIDDEN_LABEL=Show hidden files
 
 RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL=Copy timestamps during file transfer
-RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_TOOLTIP=When files are transferred copy the source timestamps to the destination files
 
 RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_LABEL=File types:
 RESID_PREF_UNIVERSAL_FILES_FILETYPES_TYPE_TOOLTIP=List of file types
@@ -147,26 +132,9 @@ RESID_SEARCH_INCLUDE_ARCHIVES_LABEL= Search archive files
 RESID_SEARCH_INCLUDE_ARCHIVES_TOOLTIP= Specify whether archive files such as zip, jar and tar files should also be searched
 RESID_SEARCH_INCLUDE_SUBFOLDERS_LABEL= Search subfolders
 RESID_SEARCH_INCLUDE_SUBFOLDERS_TOOLTIP= Specify whether subfolders should also be searched
-RESID_SEARCH_CONNECTIONNAMELABEL_LABEL= Connection name:
-RESID_SEARCH_CONNECTIONNAMELABEL_TOOLTIP= Connection name
-RESID_SEARCH_TARGETGROUP_LABEL= Target
-RESID_SEARCH_TARGETGROUP_TOOLTIP= Specify search target
-RESID_SEARCH_COLUMNSGROUP_LABEL= Columns
-RESID_SEARCH_COLUMNSGROUP_TOOLTIP= Specify columns
-RESID_SEARCH_ALLCOLUMNSLABEL_LABEL= All columns
-RESID_SEARCH_ALLCOLUMNSLABEL_TOOLTIP= Search all columns
-RESID_SEARCH_BETWEENLABEL_LABEL= Between
-RESID_SEARCH_ANDLABEL_LABEL= and
-RESID_SEARCH_EOLLABEL_LABEL= and end of line
-RESID_SEARCH_FIRSTCOLUMN_TOOLTIP= Specify start column
-RESID_SEARCH_SECONDCOLUMN_TOOLTIP= Specify end column
-RESID_SEARCH_BOTHCOLUMNSLABEL_TOOLTIP= Search between specified columns
-RESID_SEARCH_STARTCOLUMNLABEL_TOOLTIP= Search between specified column and end of line
 
 # Search dialog
 RESID_SEARCH_MESSAGE_SEARCHING= Searching...
-RESID_SEARCH_MESSAGE_ONEMATCH= {0} match
-RESID_SEARCH_MESSAGE_MULTIPLEMATCHES= {0} matches
 
 ##################################################################################
 ############################Resource Conflict Dlgs #########################
@@ -186,16 +154,12 @@ RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL= Open editor with pending changes
 #==============================================================
 # REMOTE FILE SYSTEM CACHE PREFERENCE PAGE
 #=============================================================
-RESID_PREF_CACHE_DESCRIPTION=When RSE is used for editing, the remote files are cached.  Use this page to clear or limit the size of the file cache.
 RESID_PREF_CACHE_CLEAR=Clear Cached Files
-RESID_PREF_CACHE_CLEAR_LABEL=&Clear cached files
 RESID_PREF_CACHE_CLEAR_TOOLTIP=Delete remote files that have been cached in the local workspace
 RESID_PREF_CACHE_LIMIT_CACHE_SIZE_LABEL=&Limit cache size
 RESID_PREF_CACHE_LIMIT_CACHE_SIZE_TOOLTIP=Check this box to limit the cache size. Leave unchecked to specify no limit.
 RESID_PREF_CACHE_MAX_CACHE_SIZE_LABEL=&Maximum cache size (MB):
-RESID_PREF_CACHE_MAX_CACHE_SIZE_DESCRIPTION=Enter the maxium size space that can be used by the cache
 RESID_PREF_CACHE_MAX_CACHE_SIZE_TOOLTIP=Enter the maxium size space that can be used by the cache
-RESID_PREF_CACHE_CLEAR_WARNING_LABEL=Note:
 RESID_PREF_CACHE_CLEAR_WARNING_DESCRIPTION=Note: Clearing the cache closes all open remote files
 
 #=============================================================
@@ -206,7 +170,6 @@ RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE=Creating temp archive
 RESID_SUPERTRANSFER_PROGMON_SUBTASK_POPULATE=Populating temp archive
 RESID_SUPERTRANSFER_PROGMON_SUBTASK_TRANSFER=Transferring temp archive
 RESID_SUPERTRANSFER_PROGMON_SUBTASK_EXTRACT=Extracting temp archive
-RESID_SUPERTRANSFER_PROGMON_ARCHIVE=archive
 
 #=============================================================
 # SUPERTRANSFER PREFERENCE PAGE
@@ -230,14 +193,6 @@ ACTION_REPLACEWITH_HISTORY_LABEL= Local History...
 ACTION_REPLACEWITH_HISTORY_TOOLTIP= Replace the remote file with a previous edition from it's local history
 
 
-
-##################################################################################
-############################Project menu item#############################
-##################################################################################
-RESID_OPEN_FROM_ASSOCIATED_PROJECT=Open from Associated Project (&1)
-
-
-
 #=============================================================
 # ACTIONS...
 #=============================================================
@@ -296,10 +251,6 @@ RESID_PROPERTY_FILE_SIZE_LABEL=Size
 RESID_PROPERTY_FILE_SIZE_VALUE=&1 bytes
 RESID_PROPERTY_FILE_SIZE_TOOLTIP=Number of bytes in this file
 
-RESID_PROPERTY_FILE_READABLE_LABEL=Readable
-RESID_PROPERTY_FILE_READABLE_TOOLTIP=Is this file readable
-RESID_PROPERTY_FILE_WRITABLE_LABEL=Writable
-RESID_PROPERTY_FILE_WRITABLE_TOOLTIP=Is this file writable
 RESID_PROPERTY_FILE_READONLY_LABEL=Read-only
 RESID_PROPERTY_FILE_READONLY_TOOLTIP=Is this file read-only
 RESID_PROPERTY_FILE_HIDDEN_LABEL=Hidden
@@ -348,12 +299,7 @@ RESID_PROPERTY_SEARCH_STATUS_INACTIVE_VALUE=Finished
 
 
 #MESSAGES
-
-MSG_ERROR_FOLDER_NOTFOUND=Folder {0} not found on host {1}
 MSG_ERROR_FILE_NOTFOUND=File {0} not found on host {1}
-MSG_ERROR_FOLDERORFILE_NOTFOUND=File or folder {0} not found on host {1}
-MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED=Archive Management is not supported by the current File subsystem's configuration.
-MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED_DETAILS=In the properties for the File subsystem, choose a configuration that supports Archive Management.
 
 MSG_DOWNLOAD_NO_WRITE=You do not have write access to file {0} on {1}. Do you want to open the file in browse mode?
 MSG_DOWNLOAD_NO_WRITE_DETAILS=You do not have write permission to the file {0} on {1}. You can open the file in browse (read-only) mode. If you want to edit the file, change file permissions to allow write access to the file.
@@ -361,11 +307,10 @@ MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR=You are currently editing file {0} on {1}. D
 MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR_DETAILS=You are allowed to edit a file in one editor only. You can, however, open the file in another editor for browsing. Browsing lets you view the file but does not allow you to edit its contents.
 MSG_UPLOAD_FILE_EXISTS=File {0} already exists. Do you want to replace it?
 
-MSG_DOWNLOAD_PROGRESS=Downloading {0}
+
-MSG_UPLOAD_PROGRESS=Uploading {0}
 MSG_SYNCHRONIZE_PROGRESS=Synchronizing Resources...
 MSG_EXTRACT_PROGRESS=Extracting {0}
-MSG_PERCENT_DONE={0} of {1} complete ({2})
+
 MSG_DOWNLOADING_PROGRESS=Downloading resources...
 MSG_UPLOADING_PROGRESS=Uploading resources...
 
@@ -376,53 +321,31 @@ FILEMSG_SECURITY_ERROR_DETAILS=Message reported from file system: {0}
 FILEMSG_IO_ERROR=Operation failed. File system input or output error
 FILEMSG_IO_ERROR_DETAILS=Message reported from file system: {0}
 
-FILEMSG_FOLDER_NOTEMPTY=Folder is not empty. Cannot delete
-FILEMSG_FOLDER_NOTEMPTY_DETAILS=The operation failed. One possible reason is that the folder is not empty
-
 FILEMSG_FOLDER_NOTFOUND=Folder ''{0}'' not found
-
-FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE=Folder ''{0}'' not found. Would you like to create it?
-FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS=The folder you specified does not exist. Select Yes to create it, No to cancel the operation
 FILEMSG_FILE_NOTFOUND=File ''{0}'' not found
 
 # PATH VALIDATION
 MSG_VALIDATE_PATH_EMPTY=Enter path
 MSG_VALIDATE_PATH_EMPTY_DETAILS=You must specify a file system path.
-MSG_VALIDATE_PATH_NOTUNIQUE=Path is not unique
-MSG_VALIDATE_PATH_NOTUNIQUE_DETAILS=The path you specified is already in use.
-MSG_VALIDATE_PATH_NOTVALID= Path syntax is not valid
-MSG_VALIDATE_PATH_NOTVALID_DETAILS=The syntax of the path you specified is not valid. Enter a file system path that is valid for the remote operating system.
 
 # Universal File Messages
-FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY=Enter file name pattern
 FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE=Filter string ''{0}'' already exists in this filter
-FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID =Filter string name pattern not valid
-FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES =You must include files or folders or both
 
 FILEMSG_DELETE_FILE_FAILED=Deletion of the object {0} failed
 FILEMSG_DELETE_FILE_FAILED_DETAILS=Either the object does not exist or you do not have enough authority to delete the object. If this is a folder, the folder may not be empty
 
-FILEMSG_RENAME_FILE_FAILED=Renaming of the object {0} failed
-FILEMSG_RENAME_FILE_FAILED_DETAILS=Rename operation failed because, the object to rename does not exist, or the object with new object name already exists, or the user does not have enough authority to rename the object
-
 FILEMSG_CREATE_FILE_FAILED=No authority or file name not valid
 FILEMSG_CREATE_FILE_FAILED_DETAILS=The file could not be created because of one of the following reasons:\n- the user does not have enough authority to create the file \n- the file name is not valid 
 
 FILEMSG_CREATE_FILE_FAILED_EXIST=File already exists
 FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS=The new file {0} already exists
 
-FILEMSG_CREATE_FOLDER_FAILED=Creation of the folder failed
-FILEMSG_CREATE_FOLDER_FAILED_DETAILS=The folder {0} could not be created because of one of the following reasons:\n- the user does not have enough authority to create the folder \n- the folder name is not valid 
-
 FILEMSG_CREATE_FOLDER_FAILED_EXIST= Folder already exists
 FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS=The new folder {0} already exists
 
 FILEMSG_CREATE_RESOURCE_NOTVISIBLE=New resource will not be visible due to subsetting. Create it anyway?
 FILEMSG_CREATE_RESOURCE_NOTVISIBLE_DETAILS=The name of the resource you are creating does not match the current filter criteria. If you select Yes to create the resource, it will not be visible within the current filter.
 
-FILEMSG_RENAME_RESOURCE_NOTVISIBLE=Resource will not be visible due to subsetting. Rename it anyway?
-FILEMSG_RENAME_RESOURCE_NOTVISIBLE_DETAILS=The new name of the resource does not match the current filter criteria. If you select Yes to rename the resource, it will not be visible within the current filter.
-
 FILEMSG_ERROR_NOFILETYPES =No file types specified
 FILEMSG_ERROR_NOFILETYPES_DETAILS=Either specify one or more file types, or select to subset by file name
 
@@ -444,21 +367,12 @@ FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOURCE_DETAILS=It is impossible to move a fold
 FILEMSG_MOVE_FILTER_NOT_VALID = Selected filter is not a valid destination.
 FILEMSG_MOVE_FILTER_NOT_VALID_DETAILS=Some filters, such as the Root or Drives filter, do not designate locations on the remote file system and cannot have files moved into them.
 
-FILEMSG_DELETING =Deleting {0}...
-
 MSG_ERROR_CONNECTION_NOTFOUND = Connection {0} not found
-MSG_ERROR_CONNECTION_NOTFOUND_DETAILS=No connection named {0} currently exists<
 
 MSG_ERROR_PROFILE_NOTFOUND =Profile {0} not found
-MSG_ERROR_PROFILE_NOTFOUND_DETAILS=No profile named {0} currently exists
-
 
 FILEMSG_MOVE_INTERRUPTED = Operation interrupted. Some objects have been moved.
 FILEMSG_MOVE_INTERRUPTED_DETAILS = The following objects have been moved:\n{0}
-FILEMSG_RENAME_INTERRUPTED =Operation interrupted. Some objects have been renamed.
-FILEMSG_RENAME_INTERRUPTED_DETAILS= The following objects have been renamed:\n{0}
-FILEMSG_DELETE_INTERRUPTED =Operation interrupted. Some objects have been deleted.
-FILEMSG_DELETE_INTERRUPTED_DETAILS = The following objects have been deleted:\n{0}
 FILEMSG_COPY_INTERRUPTED = Operation interrupted. Some objects have been copied to the destination.
 FILEMSG_COPY_INTERRUPTED_DETAILS=The following objects have been copied:\n{0}
 
@@ -473,9 +387,6 @@ MSG_REMOTE_SEARCH_INVALID_REGEX_DETAILS=The value {0} you entered is not a valid
 MSG_CREATEFILEGENERIC_PROGRESS = Creating file {0}...
 MSG_CREATEFOLDERGENERIC_PROGRESS =Creating folder {0}...            
 
-# universal commands
-MSG_UCMD_INVOCATION_EMPTY      = The invocation may not be blank
-
 # preferences
 MSG_ERROR_FILENAME_INVALID = File type extension must not contain '*' or '.'
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/UniversalPreferencePage.java

@@ -18,6 +18,7 @@
  * David McKnight   (IBM)        - [210142] for accessibility need transfer mode toggle button
  * Martin Oberhuber (Wind River) - [220020][api][breaking] SystemFileTransferModeRegistry should be internal
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  ********************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.propertypages;
@@ -292,6 +293,7 @@ public class UniversalPreferencePage
 				ISystemFilePreferencesConstants.PRESERVETIMESTAMPS, 
 				FileResources.RESID_PREF_UNIVERSAL_PRESERVE_TIMESTAMPS_LABEL,
 				propertiesComposite);
+
 		addField(preserveTimestamps);
 		
 		
@@ -455,6 +457,7 @@ public class UniversalPreferencePage
 		tableCol = new TableColumn(resourceTypeTable, SWT.NONE, 1);
 		tableCol.setResizable(true);
 		tableCol.setText(FileResources.RESID_PREF_UNIVERSAL_FILES_FILETYPES_TABLECOL_LABEL);
+		tableCol.setToolTipText(FileResources.RESID_PREF_UNIVERSAL_FILES_FILETYPES_TABLECOL_TOOLTIP);
 		tableCol.pack();
 		tableCol.setWidth(100);
 
@@ -464,7 +467,7 @@ public class UniversalPreferencePage
 		tableCol = new TableColumn(resourceTypeTable, SWT.NONE, 2);
 		tableCol.setResizable(true);
 		tableCol.setText(FileResources.RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_LABEL);
-		
+		tableCol.setToolTipText(FileResources.RESID_PREF_UNIVERSAL_FILES_FILETYPES_MODE_TOOLTIP);
 		tableCol.pack();
 		tableCol.setWidth(200);
 		

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizard.java

@@ -17,6 +17,7 @@
  * Xuan Chen        (IBM)        - [209828] Need to move the Create operation to a job.
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  ********************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.wizards;
@@ -111,7 +112,7 @@ public class SystemNewFileWizard
             	ok = false;
             	SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileIOException " );  	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             	String msgTxt = FileResources.FILEMSG_CREATE_FILE_FAILED;
-            	String msgDetails = NLS.bind(FileResources.FILEMSG_COPY_FILE_FAILED_DETAILS, absName);
+            	String msgDetails = NLS.bind(FileResources.FILEMSG_CREATE_FILE_FAILED_DETAILS, absName);
             	
             	msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
             			ISystemFileConstants.FILEMSG_COPY_FILE_FAILED,

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.java

@@ -14,6 +14,7 @@
  * Contributors:
  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.dstore;
@@ -39,16 +40,8 @@ public class ServiceResources extends NLS
 	
     // Remote File Exception Messages
   	public static String FILEMSG_SECURITY_ERROR;
-  	public static String FILEMSG_IO_ERROR;
-  	public static String FILEMSG_FOLDER_NOTEMPTY;
-  	public static String FILEMSG_FOLDER_NOTFOUND;
-  	public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE;
-  	public static String FILEMSG_FILE_NOTFOUND;
 		
   	public static String FILEMSG_SECURITY_ERROR_DETAILS;
-  	public static String FILEMSG_IO_ERROR_DETAILS;
-  	public static String FILEMSG_FOLDER_NOTEMPTY_DETAILS;
-  	public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS;
 
     // --------------------------
     // UNIVERSAL FILE MESSAGES...
@@ -57,7 +50,6 @@ public class ServiceResources extends NLS
     public static  String FILEMSG_RENAME_FILE_FAILED;
     public static  String FILEMSG_CREATE_FILE_FAILED;
     public static  String FILEMSG_CREATE_FILE_FAILED_EXIST;
-    public static  String FILEMSG_CREATE_FOLDER_FAILED;
     public static  String FILEMSG_CREATE_FOLDER_FAILED_EXIST;
     public static  String FILEMSG_COPY_FILE_FAILED;
 
@@ -65,7 +57,6 @@ public class ServiceResources extends NLS
     public static  String FILEMSG_RENAME_FILE_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FILE_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS;
-    public static  String FILEMSG_CREATE_FOLDER_FAILED_DETAILS;
     public static  String FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS;
     public static  String FILEMSG_COPY_FILE_FAILED_DETAILS;
 

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.properties

@@ -14,6 +14,7 @@
 # Contributors:
 # David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
 # David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+# David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -36,18 +37,6 @@ DStore_Process_Service_Description=The DStore Process Service uses the RSE DataS
 FILEMSG_SECURITY_ERROR=Operation failed. Security violation
 FILEMSG_SECURITY_ERROR_DETAILS=Message reported from file system: {0}
 
-FILEMSG_IO_ERROR=Operation failed. File system input or output error
-FILEMSG_IO_ERROR_DETAILS=Message reported from file system: {0}
-	
-FILEMSG_FOLDER_NOTEMPTY=Folder is not empty. Cannot delete
-FILEMSG_FOLDER_NOTEMPTY_DETAILS=The operation failed. One possible reason is that the folder is not empty
-
-FILEMSG_FOLDER_NOTFOUND=Folder ''{0}'' not found
-
-FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE=Folder ''{0}'' not found. Would you like to create it?
-FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS=The folder you specified does not exist. Select Yes to create it, No to cancel the operation
-FILEMSG_FILE_NOTFOUND=File ''{0}'' not found
-
 
 # Universal File Messages
 FILEMSG_DELETE_FILE_FAILED=Deletion of the object {0} failed
@@ -62,9 +51,6 @@ FILEMSG_CREATE_FILE_FAILED_DETAILS=The file could not be created because of one
 FILEMSG_CREATE_FILE_FAILED_EXIST=File already exists
 FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS=The new file {0} already exists
 
-FILEMSG_CREATE_FOLDER_FAILED=Creation of the folder failed
-FILEMSG_CREATE_FOLDER_FAILED_DETAILS=The folder {0} could not be created because of one of the following reasons:\n- the user does not have enough authority to create the folder \n- the folder name is not valid 
-
 FILEMSG_CREATE_FOLDER_FAILED_EXIST= Folder already exists
 FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS=The new folder {0} already exists
 

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java

@@ -51,6 +51,10 @@ public class DStoreSearchService extends AbstractDStoreService implements ISearc
 	{
 		return ServiceResources.DStore_Search_Service_Label;
 	}
+	public String getDescription()
+	{
+		return ServiceResources.DStore_Search_Service_Description;
+	}
 	
 	protected String getMinerId()
 	{

rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java

@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [181066] NLS missing messages with DAEMON and Shells
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
+ * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
  ********************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.core;
@@ -32,7 +33,6 @@ public class ShellStrings extends NLS
 	public static String RSESubSystemOperation_Refresh_Output;
 	
 	public static String MSG_CONNECT_FAILED;	
-	public static String MSG_OPERATION_CANCELED;
 
 	
 	static 

rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
+# Copyright (c) 2006, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
+# David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -27,5 +28,4 @@ RSESubSystemOperation_Send_command_to_Shell_message = Send command to Shell
 RSESubSystemOperation_Refresh_Output = Refresh Output
 
 MSG_CONNECT_FAILED      = Connect to {0} failed with an unexpected exception
-MSG_OPERATION_CANCELED   = Operation canceled.