From c2a78bd6d90ae18169104bdb6aeaf94de3d56218 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 19 Mar 2008 15:45:11 +0000 Subject: [PATCH] [223204] [cleanup] fix broken nls strings in files.ui and others --- .../SystemQualifiedRemoteFolderCombo.java | 4 +- .../files/core/SystemFileResources.java | 54 ++------------- .../files/core/SystemFileResources.properties | 68 +------------------ 3 files changed, 10 insertions(+), 116 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java index 9e51f7e4a92..fd95414dd44 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html @@ -18,6 +18,7 @@ * David McKnight (IBM) - [186363] get rid of obsolete calls to ISubSystem.connect() * 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.files.ui.widgets; @@ -124,6 +125,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite if (folderData instanceof GridData) ((GridData)folderData).widthHint = 200; browseButton = createPushButton(this,SystemFileResources.WIDGET_BROWSE_LABEL); + browseButton.setToolTipText(SystemFileResources.WIDGET_BROWSE_TOOLTIP); addOurButtonSelectionListener(); //scrubHistory(); this is too intensive as it starts all kinds of servers and stuff unnecessarily. } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java index 286a8771378..c3b848d71fb 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java @@ -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 @@ -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 *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.core; @@ -32,8 +33,6 @@ public class SystemFileResources extends NLS public static String RESID_FILTER_ROOTFILES; public static String RESID_FILTER_ROOTFOLDERS; public static String RESID_FILTER_DRIVES; - public static String RESID_FILTER_HOME; - public static String RESID_FILTER_USERHOME; public static String RESID_FILTER_MYHOME; // ------------------------- @@ -49,34 +48,20 @@ public class SystemFileResources extends NLS public static String RESID_NEWFILEFILTER_PAGE1_TITLE; public static String RESID_NEWFILEFILTER_PAGE1_DESCRIPTION; - // New Filter String wizard... - public static String RESID_NEWFILTERSTRING_TITLE; - public static String RESID_NEWFILTERSTRING_PAGE1_TITLE; - public static String RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION; - // File Filter String Re-Usable form (used in dialog and wizard) - - public static String RESID_FILEFILTERSTRING_FOLDER_LABEL; public static String RESID_FILEFILTERSTRING_FILE_LABEL; - public static String RESID_FILEFILTERSTRING_INCFOLDERS_LABEL; - public static String RESID_FILEFILTERSTRING_INCFILES_LABEL; public static String RESID_FILEFILTERSTRING_INCFILESONLY_LABEL; public static String RESID_FILEFILTERSTRING_BYFILENAME_LABEL; public static String RESID_FILEFILTERSTRING_BYFILETYPES_LABEL; public static String RESID_FILEFILTERSTRING_TYPES_LABEL; public static String RESID_FILEFILTERSTRING_SELECTTYPES_LABEL; - public static String RESID_FILEFILTERSTRING_TEST_LABEL; - - public static String RESID_FILEFILTERSTRING_FOLDER_TOOLTIP; + public static String RESID_FILEFILTERSTRING_FILE_TOOLTIP; - public static String RESID_FILEFILTERSTRING_INCFOLDERS_TOOLTIP; - public static String RESID_FILEFILTERSTRING_INCFILES_TOOLTIP; public static String RESID_FILEFILTERSTRING_INCFILESONLY_TOOLTIP; public static String RESID_FILEFILTERSTRING_BYFILENAME_TOOLTIP; public static String RESID_FILEFILTERSTRING_BYFILETYPES_TOOLTIP; public static String RESID_FILEFILTERSTRING_TYPES_TOOLTIP; public static String RESID_FILEFILTERSTRING_SELECTTYPES_TOOLTIP; - public static String RESID_FILEFILTERSTRING_TEST_TOOLTIP; // ------------------------- // DIALOGS... @@ -84,26 +69,20 @@ public class SystemFileResources extends NLS // Change System File Filter dialog... public static String RESID_CHGFILEFILTER_TITLE; - // Change System File Filter String dialog... - public static String RESID_CHGFILEFILTERSTRING_TITLE; // Select Directory dialog... public static String RESID_SELECTDIRECTORY_TITLE; public static String RESID_SELECTDIRECTORY_VERBIAGE; - public static String RESID_SELECTDIRECTORY_SELECT_LABEL; + public static String RESID_SELECTDIRECTORY_SELECT_TOOLTIP; // Select File dialog... public static String RESID_SELECTFILE_TITLE; public static String RESID_SELECTFILE_VERBIAGE; - public static String RESID_SELECTFILE_SELECT_LABEL; public static String RESID_SELECTFILE_SELECT_TOOLTIP; // Prompt for home folder dialog... public static String RESID_HOMEPROMPT_TITLE; - public static String RESID_HOMEPROMPT_VERBIAGE; - public static String RESID_HOMEPROMPT_PROMPT_LABEL; - public static String RESID_HOMEPROMPT_PROMPT_TOOLTIP; // ------------------------- // ACTIONS... @@ -111,19 +90,6 @@ public class SystemFileResources extends NLS public static String ACTION_NEWFILTER_LABEL; public static String ACTION_NEWFILTER_TOOLTIP; - public static String ACTION_NEWNESTEDFILTER_LABEL; - public static String ACTION_NEWNESTEDFILTER_TOOLTIP; - - - public static String ACTION_NEWFILTERSTRING_LABEL; - public static String ACTION_NEWFILTERSTRING_TOOLTIP; - - public static String ACTION_ADDFILTERSTRING_LABEL; - public static String ACTION_AddFILTERSTRING_TOOLTIP; - - public static String ACTION_UPDATEFILTERSTRING_LABEL; - public static String ACTION_UPDATEFILTERSTRING_TOOLTIP; - public static String ACTION_SELECTFILETYPES_LABEL; public static String ACTION_SELECTFILETYPES_TOOLTIP; @@ -139,7 +105,6 @@ public class SystemFileResources extends NLS // ------------------------- // PROPERTY PAGES... // ------------------------- - public static String RESID_PP_FILE_TITLE; public static String RESID_PP_FILE_TYPE_LABEL; public static String RESID_PP_FILE_TYPE_TOOLTIP; public static String RESID_PP_FILE_TYPE_FILE_VALUE; @@ -148,10 +113,8 @@ public class SystemFileResources extends NLS public static String RESID_PP_FILE_NAME_LABEL; public static String RESID_PP_FILE_PATH_LABEL; public static String RESID_PP_FILE_SIZE_LABEL; - public static String RESID_PP_FILE_SIZE_VALUE; public static String RESID_PP_FILE_MODIFIED_LABEL; public static String RESID_PP_FILE_READONLY_LABEL; - public static String RESID_PP_FILE_WRITABLE_LABEL; public static String RESID_PP_FILE_HIDDEN_LABEL; public static String RESID_PP_FILE_NAME_TOOLTIP; @@ -159,8 +122,6 @@ public class SystemFileResources extends NLS public static String RESID_PP_FILE_SIZE_TOOLTIP; public static String RESID_PP_FILE_MODIFIED_TOOLTIP; public static String RESID_PP_FILE_READONLY_TOOLTIP; - public static String RESID_PP_FILE_READABLE_TOOLTIP; - public static String RESID_PP_FILE_WRITABLE_TOOLTIP; public static String RESID_PP_FILE_HIDDEN_TOOLTIP; public static String RESID_PP_FILE_ENCODING_GROUP_LABEL; @@ -177,21 +138,14 @@ public class SystemFileResources extends NLS public static String RESID_JOB_DECORATEFILES_NAME; - 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 MSG_VALIDATE_NAME_EMPTY; public static String MSG_VALIDATE_NAME_EMPTY_DETAILS; public static String MSG_VALIDATE_NAME_NOTUNIQUE; public static String MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS; - public static String FILEMSG_FOLDER_NOTEMPTY; - public static String FILEMSG_FOLDER_NOTEMPTY_DETAILS; - public static String FILEMSG_FOLDER_NOTFOUND; - public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE; - public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS; public static String FILEMSG_FILE_NOTFOUND; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties index a272fbaa6a1..d89564bdffc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2007 IBM Corporation and others. +# Copyright (c) 2000, 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 @@ -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_VAR @@ -30,19 +31,6 @@ ACTION_NEWFILTER_LABEL=Filter... ACTION_NEWFILTER_TOOLTIP=Create a new file system filter -ACTION_NEWNESTEDFILTER_LABEL=Nested Filter... -ACTION_NEWNESTEDFILTER_TOOLTIP=Create a new file system filter within the selected filter - - -ACTION_NEWFILTERSTRING_LABEL=Filter String... -ACTION_NEWFILTERSTRING_TOOLTIP=Create a new file filter string - -ACTION_ADDFILTERSTRING_LABEL=Add... -ACTION_AddFILTERSTRING_TOOLTIP=Create a new file filter string - -ACTION_UPDATEFILTERSTRING_LABEL=Change -ACTION_UPDATEFILTERSTRING_TOOLTIP=Edit this filter string - ACTION_SELECTFILETYPES_LABEL=Select... ACTION_SELECTFILETYPES_TOOLTIP=Select file types @@ -57,8 +45,6 @@ RESID_FILTER_ROOTS=Roots RESID_FILTER_ROOTFILES=Root RESID_FILTER_ROOTFOLDERS=Folders RESID_FILTER_DRIVES=Drives -RESID_FILTER_HOME=Home -RESID_FILTER_USERHOME=Home RESID_FILTER_MYHOME=My Home #============================================================= # NEW FILE FILTER WIZARD... @@ -66,12 +52,6 @@ RESID_FILTER_MYHOME=My Home RESID_NEWFILEFILTER_PAGE1_TITLE=File Filter RESID_NEWFILEFILTER_PAGE1_DESCRIPTION=Create a file filter -#============================================================= -# NEW FILE FILTER STRING WIZARD... -#============================================================= -RESID_NEWFILTERSTRING_TITLE=New File Filter String -RESID_NEWFILTERSTRING_PAGE1_TITLE=File Filter String -RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION=Create a file name filter string #============================================================= @@ -79,17 +59,12 @@ RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION=Create a file name filter string #============================================================= RESID_CHGFILEFILTER_TITLE=Change File Filter -#============================================================= -# CHANGE FILE FILTER STRING DIALOG... -#============================================================= -RESID_CHGFILEFILTERSTRING_TITLE=Change File Filter String #============================================================= # SELECT DIRECTORY DIALOG... #============================================================= RESID_SELECTDIRECTORY_TITLE=Browse For Folder RESID_SELECTDIRECTORY_VERBIAGE=Select a folder -RESID_SELECTDIRECTORY_SELECT_LABEL=Selected folder: RESID_SELECTDIRECTORY_SELECT_TOOLTIP=Expand tree and select folder #============================================================= @@ -97,7 +72,6 @@ RESID_SELECTDIRECTORY_SELECT_TOOLTIP=Expand tree and select folder #============================================================= RESID_SELECTFILE_TITLE=Browse For File RESID_SELECTFILE_VERBIAGE=Select a file -RESID_SELECTFILE_SELECT_LABEL=Selected file: RESID_SELECTFILE_SELECT_TOOLTIP=Expand tree and select file #============================================================= @@ -105,11 +79,6 @@ RESID_SELECTFILE_SELECT_TOOLTIP=Expand tree and select file #============================================================= RESID_HOMEPROMPT_TITLE=Prompt For Home Folder -RESID_HOMEPROMPT_VERBIAGE=Please enter or select your personal home folder for this remote system -RESID_HOMEPROMPT_PROMPT_LABEL=Home folder -RESID_HOMEPROMPT_PROMPT_TOOLTIP=Enter or select the folder assigned to your user ID - - #============================================================= # REMOTE FILE SYSTEM PROPERTY VALUES @@ -119,11 +88,9 @@ RESID_PROPERTY_FILE_FILTER_VALUE=File filter #============================================================= # REMOTE FILE PROPERTIES PAGE... #============================================================= -RESID_PP_FILE_TITLE=Properties for File System Object RESID_PP_FILE_TYPE_ROOT_VALUE=Root RESID_PP_FILE_TYPE_FOLDER_VALUE=Folder RESID_PP_FILE_TYPE_FILE_VALUE=File -RESID_PP_FILE_SIZE_VALUE=&1 bytes @@ -133,17 +100,9 @@ RESID_PP_FILE_SIZE_VALUE=&1 bytes # NEW FILTER WIZARD... #============================================================= - -RESID_FILEFILTERSTRING_FOLDER_LABEL=Folder path -RESID_FILEFILTERSTRING_FOLDER_TOOLTIP=Folder containing the files to list RESID_FILEFILTERSTRING_FILE_LABEL=File name filter RESID_FILEFILTERSTRING_FILE_TOOLTIP=File name filter pattern -RESID_FILEFILTERSTRING_INCFOLDERS_LABEL=Include folders -RESID_FILEFILTERSTRING_INCFOLDERS_TOOLTIP=Select to includes folders in the list - -RESID_FILEFILTERSTRING_INCFILES_LABEL=Include files -RESID_FILEFILTERSTRING_INCFILES_TOOLTIP=Select to includes files in the list RESID_FILEFILTERSTRING_INCFILESONLY_LABEL=Show files only RESID_FILEFILTERSTRING_INCFILESONLY_TOOLTIP=Select to exclude folders from the list @@ -163,10 +122,6 @@ RESID_FILEFILTERSTRING_SELECTTYPES_LABEL=Select... RESID_FILEFILTERSTRING_SELECTTYPES_TOOLTIP=Select the file types to subset the list by -RESID_FILEFILTERSTRING_TEST_LABEL=Test... -RESID_FILEFILTERSTRING_TEST_TOOLTIP=Display results of running this filter string - - RESID_PP_FILE_PATH_LABEL=Location: RESID_PP_FILE_PATH_TOOLTIP=Path of the remote file or folder @@ -178,7 +133,6 @@ RESID_PP_FILE_TYPE_TOOLTIP=Type of the remote file or folder RESID_PP_FILE_SIZE_LABEL=Size: RESID_PP_FILE_SIZE_TOOLTIP=Size in bytes of the remote file -RESID_PP_FILE_SIZE_VALUE=&1 bytes RESID_PP_FILE_MODIFIED_LABEL=Last modified: RESID_PP_FILE_MODIFIED_TOOLTIP=Date this file or folder was last modified @@ -186,11 +140,6 @@ RESID_PP_FILE_MODIFIED_TOOLTIP=Date this file or folder was last modified RESID_PP_FILE_READONLY_LABEL=Read-only RESID_PP_FILE_READONLY_TOOLTIP=Is this file or folder read-only -RESID_PP_FILE_READABLE_TOOLTIP=Is reading of this file or folder permitted - -RESID_PP_FILE_WRITABLE_LABEL=Writable -RESID_PP_FILE_WRITABLE_TOOLTIP=Is writing of this file or folder permitted - RESID_PP_FILE_HIDDEN_LABEL=Hidden RESID_PP_FILE_HIDDEN_TOOLTIP=Is this file or folder typically hidden from lists @@ -216,24 +165,13 @@ WIDGET_BROWSE_TOOLTIP=Browse for folder path RESID_JOB_SEARCH_NAME=Search RESID_JOB_DECORATEFILES_NAME=Decorate Files - -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 - + MSG_VALIDATE_NAME_EMPTY = Enter name MSG_VALIDATE_NAME_EMPTY_DETAILS = You must enter a name in the field where the cursor is positioned. MSG_VALIDATE_NAME_NOTUNIQUE= Name in use MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS = This name is already used by another resource. Enter a unique name. - - -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