mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-22 07:43:56 +02:00
[226784] [nls] Standardize on Cancelled in PII
This commit is contained in:
parent
1ad1441f00
commit
8a9b6c2e00
4 changed files with 382 additions and 379 deletions
|
@ -82,7 +82,7 @@ h2 { background-color: #CCCCFF }
|
|||
<b>LevelTwo: </b>You have the new name entry field empty. You must enter a unique new name.<br>
|
||||
<H3>RSEG1013</H3>
|
||||
<b>Severity: </b>Error<br>
|
||||
<b>LevelOne: </b>Expand failed or canceled. Try again.<br>
|
||||
<b>LevelOne: </b>Expand failed or cancelled. Try again.<br>
|
||||
<b>LevelTwo: </b>When expanding a node in the tree, and retrieving the resources, either an error occurred or you cancelled the operation. The expand is cancelled.<br>
|
||||
<H3>RSEG1014</H3>
|
||||
<b>Severity: </b>Error<br>
|
||||
|
|
|
@ -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
|
||||
# Martin Oberhuber (Wind River) - [226784] [nls] Standardize on Cancelled in PII
|
||||
###############################################################################
|
||||
|
||||
# NLS_MESSAGEFORMAT_VAR
|
||||
|
@ -379,7 +380,7 @@ FILEMSG_COPY_INTERRUPTED_DETAILS=The following objects have been copied:\n{0}
|
|||
|
||||
# cache preferences
|
||||
MSG_CACHE_UPLOAD_BEFORE_DELETE = One or more cached files have changes that have not been saved on the host.
|
||||
MSG_CACHE_UNABLE_TO_SYNCH = Unable to synchronize cache changes to host. Operation canceled.
|
||||
MSG_CACHE_UNABLE_TO_SYNCH = Unable to synchronize cache changes to host. Operation cancelled.
|
||||
|
||||
# remote search messages
|
||||
MSG_REMOTE_SEARCH_INVALID_REGEX = Regular expression is not valid.
|
||||
|
|
|
@ -280,7 +280,7 @@ public class SystemViewRemoteFileAdapter
|
|||
filterString = filterString + " /ns"; //$NON-NLS-1$
|
||||
else if (foldersOnly && (filterString != null) && (filterString.indexOf("/nf") == -1)) //$NON-NLS-1$
|
||||
filterString = filterString + " /nf"; //$NON-NLS-1$
|
||||
this.filterString = filterString;
|
||||
super.setFilterString(filterString);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -289,7 +289,7 @@ public class SystemViewRemoteFileAdapter
|
|||
*/
|
||||
public String getFilterString()
|
||||
{
|
||||
return filterString;
|
||||
return super.getFilterString();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -673,6 +673,7 @@ public class SystemViewRemoteFileAdapter
|
|||
else
|
||||
{
|
||||
|
||||
String filterString = getFilterString();
|
||||
if (foldersOnly)
|
||||
{
|
||||
if (filterString == null)
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#
|
||||
# Contributors:
|
||||
# David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others
|
||||
# Martin Oberhuber (Wind River) - [226784] [nls] Standardize on Cancelled in PII
|
||||
###############################################################################
|
||||
|
||||
# NLS_MESSAGEFORMAT_VAR
|
||||
|
@ -45,7 +46,7 @@ RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATEDTASKS_VALUE=One or more pthread cr
|
|||
RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE=Swapped out (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE=Pthread created (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_OTHERKERNELWAIT_VALUE=Other kernel wait (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELLED_VALUE=Canceled (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELLED_VALUE=Cancelled (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_MULTITHREAD_VALUE=Multi-thread (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE=Medium weight thread (z/OS)
|
||||
RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE=Asynchronous thread (z/OS)
|
||||
|
|
Loading…
Add table
Reference in a new issue