mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 22:35:43 +02:00
Code Issues Wiki Activity

[227213] Added RESID_CONFLICT_COPY_PATTERN to be used for copying resources to parent folder.

Browse source
This commit is contained in:
David McKnight 2008-05-05 21:56:18 +00:00
parent 92e300dc3f
commit 6c82af5a4b
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@
* David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
* David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others
* David McKnight (IBM) - [224377] "open with" menu does not have "other" option
* Rupen Mardirossian (IBM) - [227213] Added RESID_CONFLICT_COPY_PATTERN to be used for copying resources to parent folder.
*******************************************************************************/
package org.eclipse.rse.internal.files.ui;
@ -171,6 +172,9 @@ public class FileResources extends NLS
public static String RESID_CONFLICT_DOWNLOAD_MESSAGE_REMOTECHANGED;
public static String RESID_CONFLICT_DOWNLOAD_REPLACELOCAL;
public static String RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL;
// Resource conflict constants
public static String RESID_CONFLICT_COPY_PATTERN;
// RSE Cache Preferences
public static String RESID_PREF_CACHE_CLEAR;

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

@ -21,6 +21,7 @@
# David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others
# David McKnight (IBM) - [224377] "open with" menu does not have "other" option
# Martin Oberhuber (Wind River) - [226784] [nls] Standardize on Cancelled in PII
# Rupen Mardirossian (IBM) - [227213] Added RESID_CONFLICT_COPY_PATTERN to be used for copying resources to parent folder.
###############################################################################
# NLS_MESSAGEFORMAT_VAR
@ -153,6 +154,13 @@ RESID_CONFLICT_DOWNLOAD_MESSAGE_REMOTECHANGED= This file has pending changes tha
RESID_CONFLICT_DOWNLOAD_REPLACELOCAL= Replace pending changes with remote file
RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL= Open editor with pending changes
##################################################################################
############################Resource Conflict Constants #########################
##################################################################################
RESID_CONFLICT_COPY_PATTERN =Copy{0,choice,1#|1< ({0,number,integer})} of {1}
#==============================================================
# REMOTE FILE SYSTEM CACHE PREFERENCE PAGE
#=============================================================