diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties index 55908f3e456..73284421175 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties @@ -12,6 +12,7 @@ # Contributors: # 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 +# Xuan Chen (IBM) - [226784] [nls] Review Canceled vs. Cancelled in NLS Strings ############################################################################### # NLS_MESSAGEFORMAT_VAR @@ -27,15 +28,15 @@ MSG_ERROR_UNEXPECTED=An unexpected error occurred. MSG_EXPAND_FAILED = Expand failed. Try again -MSG_EXPAND_CANCELLED = Expand canceled. Try again +MSG_EXPAND_CANCELLED = Expand cancelled. Try again # operation status MSG_OPERATION_RUNNING = {0} - Running MSG_OPERATION_FINISHED = {0} - Finished -MSG_OPERTION_STOPPED = {0} - Canceled +MSG_OPERTION_STOPPED = {0} - Cancelled MSG_OPERATION_DISCONNECTED = {0} - Disconnected MSG_OPERATION_FAILED = Operation failed with exception ''{0}'' -MSG_OPERATION_CANCELLED = Operation canceled. +MSG_OPERATION_CANCELLED = Operation cancelled. # messages @@ -43,12 +44,12 @@ MSG_CONNECT_PROGRESS = Connecting to {0} MSG_CONNECTWITHPORT_PROGRESS = Connecting to {0} at port {1} MSG_CONNECT_FAILED = Connect to {0} failed with an unexpected exception MSG_CONNECT_UNKNOWNHOST = Connect failed. Host {0} not found or not responding -MSG_CONNECT_CANCELLED = Connect to {0} was canceled +MSG_CONNECT_CANCELLED = Connect to {0} was cancelled MSG_DISCONNECT_PROGRESS = Disconnecting from {0} MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1} MSG_DISCONNECT_FAILED = Disconnect from {0} failed with exception -MSG_DISCONNECT_CANCELLED = Disconnect from {0} was canceled +MSG_DISCONNECT_CANCELLED = Disconnect from {0} was cancelled MSG_RESOLVE_PROGRESS = Resolving {0}