Target Explorer: Bug fix #377851, Cleanup messages files after split.

20 files changed, 138 insertions, 603 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/QueryDoneOpenChannel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/QueryDoneOpenChannel.java
index 432f7bd90..a33d66433 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/QueryDoneOpenChannel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/QueryDoneOpenChannel.java
@@ -81,7 +81,7 @@ public class QueryDoneOpenChannel extends CallbackBase implements DoneOpenChanne
 						service.opendir(absPath, new QueryDoneOpen(proxy, channel, service, parentNode));

 					}

 				} else {

-					Status status = new Status(IStatus.ERROR, CorePlugin.getUniqueIdentifier(), Messages.QueryDoneOpenChannel_NoFService, null);

+					Status status = new Status(IStatus.ERROR, CorePlugin.getUniqueIdentifier(), Messages.Operation_NoFileSystemError, null);

 					proxy.done(this, status);

 				}

 			}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/RefreshStateDoneOpenChannel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/RefreshStateDoneOpenChannel.java
index 1e12e85bc..03a512a7f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/RefreshStateDoneOpenChannel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/callbacks/RefreshStateDoneOpenChannel.java
@@ -61,7 +61,7 @@ public class RefreshStateDoneOpenChannel extends CallbackBase implements IChanne
 			}

 			else {

 				Tcf.getChannelManager().closeChannel(channel);

-				String message = NLS.bind(Messages.StateManager_TCFNotProvideFSMessage, peer.getID());

+				String message = NLS.bind(Messages.Operation_NoFileSystemError, peer.getID());

 				IStatus status = new Status(IStatus.ERROR, CorePlugin.getUniqueIdentifier(), message, new TCFFileSystemException(message));

 				invokeCallback(status);

 			}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCommitAttr.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCommitAttr.java
index 0ef44029b..07894e37c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCommitAttr.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCommitAttr.java
@@ -69,7 +69,7 @@ public class OpCommitAttr extends Operation {
 						throw errors[0];

 					}

 				} else {

-					String message = NLS.bind(Messages.StateManager_TCFNotProvideFSMessage2, node.peerNode.getPeerId());

+					String message = NLS.bind(Messages.Operation_NoFileSystemError, node.peerNode.getPeerId());

 					throw new TCFFileSystemException(message);

 				}

 			}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCopy.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCopy.java
index 729bb31c0..621551654 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCopy.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCopy.java
@@ -91,7 +91,7 @@ public class OpCopy extends Operation {
 					}
 				}
 				else {
-					String message = NLS.bind(Messages.FSOperation_NoFileSystemError, head.peerNode.getPeerId());
+					String message = NLS.bind(Messages.Operation_NoFileSystemError, head.peerNode.getPeerId());
 					throw new TCFFileSystemException(message);
 				}
 			}
@@ -183,7 +183,7 @@ public class OpCopy extends Operation {
 	 */
 	private void copyFile(IFileSystem service, FSTreeNode node, FSTreeNode dest) throws TCFFileSystemException, InterruptedException {
 		if (monitor.isCanceled()) throw new InterruptedException();
-		monitor.subTask(NLS.bind(Messages.FSCopy_Copying, node.name));
+		monitor.subTask(NLS.bind(Messages.OpCopy_Copying, node.name));
 		// Create the copy target file
 		final FSTreeNode copy = createCopyDestination(service, node, dest);
 		String src_path = node.getLocation(true);
@@ -194,7 +194,7 @@ public class OpCopy extends Operation {
 			@Override
 			public void doneCopy(IToken token, FileSystemException error) {
 				if (error != null) {
-					String message = NLS.bind(Messages.FSCopy_CannotCopyFile, copy.name, error);
+					String message = NLS.bind(Messages.OpCopy_CannotCopyFile, copy.name, error);
 					errors[0] = new TCFFileSystemException(message, error);
 				}
 			}
@@ -212,7 +212,7 @@ public class OpCopy extends Operation {
 	 */
 	@Override
     public String getName() {
-	    return Messages.FSCopy_CopyingFile;
+	    return Messages.OpCopy_CopyingFile;
     }
 
 	/*
@@ -240,7 +240,7 @@ public class OpCopy extends Operation {
 								ref.set(Integer.valueOf(count(service, nodes)));
 							}
 							else {
-								String message = NLS.bind(Messages.FSOperation_NoFileSystemError, head.peerNode.getPeerId());
+								String message = NLS.bind(Messages.Operation_NoFileSystemError, head.peerNode.getPeerId());
 								throw new TCFFileSystemException(message);
 							}
 						}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCreate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCreate.java
index d426a6110..0f304cc96 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCreate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpCreate.java
@@ -76,7 +76,7 @@ public abstract class OpCreate extends Operation {
 				monitor.worked(1);

 			}

 			else {

-				String message = NLS.bind(Messages.FSOperation_NoFileSystemError, folder.peerNode.getPeerId());

+				String message = NLS.bind(Messages.Operation_NoFileSystemError, folder.peerNode.getPeerId());

 				throw new TCFFileSystemException(message);

 			}

 		}

@@ -174,7 +174,7 @@ public abstract class OpCreate extends Operation {
 	 */

 	@Override

     public String getName() {

-	    return NLS.bind(Messages.FSCreate_TaskName, name);

+	    return NLS.bind(Messages.OpCreate_TaskName, name);

     }

 

 	/*

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpDelete.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpDelete.java
index 98a8bf849..f86927d7d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpDelete.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpDelete.java
@@ -66,7 +66,7 @@ public class OpDelete extends Operation {
 					}
 				}
 				else {
-					String message = NLS.bind(Messages.FSOperation_NoFileSystemError, head.peerNode.getPeerId());
+					String message = NLS.bind(Messages.Operation_NoFileSystemError, head.peerNode.getPeerId());
 					throw new TCFFileSystemException(message);
 				}
 			}
@@ -116,7 +116,7 @@ public class OpDelete extends Operation {
 				remove(child, service);
 			}
 		}
-		monitor.subTask(NLS.bind(Messages.FSDelete_RemovingFileFolder, node.name));
+		monitor.subTask(NLS.bind(Messages.OpDelete_RemovingFileFolder, node.name));
 		super.removeFolder(node, service);
 		monitor.worked(1);
 	}
@@ -131,7 +131,7 @@ public class OpDelete extends Operation {
 	 */
 	protected void removeFile(final FSTreeNode node, IFileSystem service) throws TCFFileSystemException, InterruptedException {
 		if (monitor.isCanceled()) throw new InterruptedException();
-		monitor.subTask(NLS.bind(Messages.FSDelete_RemovingFileFolder, node.name));
+		monitor.subTask(NLS.bind(Messages.OpDelete_RemovingFileFolder, node.name));
 		// If the file is read only on windows or not writable on unix, then make it deletable.
 		if (confirmCallback != null && confirmCallback.requires(node)) {
 			if (!yes2All) {
@@ -187,7 +187,7 @@ public class OpDelete extends Operation {
 	 */
 	@Override
     public String getName() {
-	    return Messages.FSDelete_Deleting;
+	    return Messages.OpDelete_Deleting;
     }
 
 	/*
@@ -215,7 +215,7 @@ public class OpDelete extends Operation {
 								ref.set(Integer.valueOf(count(service, nodes)));
 							}
 							else {
-								String message = NLS.bind(Messages.FSOperation_NoFileSystemError, head.peerNode.getPeerId());
+								String message = NLS.bind(Messages.Operation_NoFileSystemError, head.peerNode.getPeerId());
 								throw new TCFFileSystemException(message);
 							}
 						}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpMove.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpMove.java
index 720f62364..1d212024b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpMove.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpMove.java
@@ -85,7 +85,7 @@ public class OpMove extends Operation {
 						}
 					}
 					else {
-						String message = NLS.bind(Messages.FSOperation_NoFileSystemError, head.peerNode.getPeerId());
+						String message = NLS.bind(Messages.Operation_NoFileSystemError, head.peerNode.getPeerId());
 						throw new TCFFileSystemException(message);
 					}
 				}
@@ -112,7 +112,7 @@ public class OpMove extends Operation {
 	 */
 	void moveNode(IFileSystem service, final FSTreeNode node, FSTreeNode dest) throws TCFFileSystemException, InterruptedException {
 		if (monitor.isCanceled()) throw new InterruptedException();
-		monitor.subTask(NLS.bind(Messages.FSMove_Moving, node.name));
+		monitor.subTask(NLS.bind(Messages.OpMove_Moving, node.name));
 		FSTreeNode copy = findChild(service, dest, node.name);
 		if (copy == null || !copy.equals(node) && confirmReplace(node, confirmCallback)) {
 			if (copy != null && copy.isDirectory() && node.isDirectory()) {
@@ -124,11 +124,11 @@ public class OpMove extends Operation {
 				monitor.worked(1);
 			}
 			else if (copy != null && copy.isFile() && node.isDirectory()) {
-				String error = NLS.bind(Messages.FSMove_FileExistsError, copy.name);
+				String error = NLS.bind(Messages.OpMove_FileExistsError, copy.name);
 				throw new TCFFileSystemException(error);
 			}
 			else if (copy != null && copy.isDirectory() && node.isFile()) {
-				String error = NLS.bind(Messages.FSMove_FolderExistsError, copy.name);
+				String error = NLS.bind(Messages.OpMove_FolderExistsError, copy.name);
 				throw new TCFFileSystemException(error);
 			}
 			else {
@@ -147,7 +147,7 @@ public class OpMove extends Operation {
 					@Override
 					public void doneRename(IToken token, FileSystemException error) {
 						if (error != null) {
-							String message = NLS.bind(Messages.FSMove_CannotMove, node.name, error);
+							String message = NLS.bind(Messages.OpMove_CannotMove, node.name, error);
 							errors[0] = new TCFFileSystemException(message, error);
 						}
 						else {
@@ -190,7 +190,7 @@ public class OpMove extends Operation {
 	 */
 	@Override
     public String getName() {
-	    return Messages.FSMove_MovingFile;
+	    return Messages.OpMove_MovingFile;
     }
 
 	/*
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpOutStreamOp.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpOutStreamOp.java
index 4dc6eea6c..2dc64d497 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpOutStreamOp.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpOutStreamOp.java
@@ -75,7 +75,7 @@ public class OpOutStreamOp extends OpStreamOp {
 						monitor.worked(percent - percentRead);

 						percentRead = percent; // Remember the percentage.

 						// Report the progress.

-						monitor.subTask(NLS.bind(Messages.CacheManager_DownloadingProgress, formatSize(bytesRead), total_size));

+						monitor.subTask(NLS.bind(Messages.OpOutStreamOp_DownloadingProgress, formatSize(bytesRead), total_size));

 					}

 				}

 			}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRefresh.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRefresh.java
index 012cdd7ca..7071d701a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRefresh.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRefresh.java
@@ -59,7 +59,7 @@ public class OpRefresh extends Operation {
 						refresh(node, service);

 					}

 					else {

-						String message = NLS.bind(Messages.FSOperation_NoFileSystemError, node.peerNode.getPeerId());

+						String message = NLS.bind(Messages.Operation_NoFileSystemError, node.peerNode.getPeerId());

 						throw new TCFFileSystemException(message);

 					}

 				}

@@ -152,7 +152,7 @@ public class OpRefresh extends Operation {
 	 */

 	@Override

     public String getName() {

-	    return NLS.bind(Messages.RefreshDirectoryHandler_RefreshJobTitle, node == null ? "" : node.name); //$NON-NLS-1$

+	    return NLS.bind(Messages.OpRefresh_RefreshJobTitle, node == null ? "" : node.name); //$NON-NLS-1$

     }

 

 	/*

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
index cd77efdf0..48d9d5dee 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
@@ -64,7 +64,7 @@ public class OpRename extends Operation {
 					renameNode(service);
 				}
 				else {
-					String message = NLS.bind(Messages.FSOperation_NoFileSystemError, node.peerNode.getPeerId());
+					String message = NLS.bind(Messages.Operation_NoFileSystemError, node.peerNode.getPeerId());
 					throw new TCFFileSystemException(message);
 				}
 			}
@@ -95,7 +95,7 @@ public class OpRename extends Operation {
 			@Override
 			public void doneRename(IToken token, FileSystemException error) {
 				if (error != null) {
-					String message = NLS.bind(Messages.FSRename_CannotRename, node.name, error);
+					String message = NLS.bind(Messages.OpRename_CannotRename, node.name, error);
 					errors[0] = new TCFFileSystemException(message, error);
 				}
 				else {
@@ -119,6 +119,6 @@ public class OpRename extends Operation {
 	 */
 	@Override
     public String getName() {
-	    return Messages.RenameFilesHandler_TitleRename;
+	    return Messages.OpRename_TitleRename;
     }
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpStreamOp.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpStreamOp.java
index 177c9c31c..98857be1e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpStreamOp.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpStreamOp.java
@@ -39,7 +39,7 @@ public abstract class OpStreamOp extends Operation {
 				@Override

                 public void run() throws Exception {

 					if (!file.setReadOnly()) {

-						throw new Exception(NLS.bind(Messages.CacheManager_SetReadOnlyFailed, file.getAbsolutePath()));

+						throw new Exception(NLS.bind(Messages.OpStreamOp_SetReadOnlyFailed, file.getAbsolutePath()));

 					}

                 }

 

@@ -64,11 +64,11 @@ public abstract class OpStreamOp extends Operation {
 	protected String formatSize(long size) {

 		double kbSize = size / 1024.0;

 		if (kbSize < 1.0) {

-			return SIZE_FORMAT.format(size) + Messages.CacheManager_Bytes;

+			return SIZE_FORMAT.format(size) + Messages.OpStreamOp_Bytes;

 		}

 		double mbSize = kbSize / 1024.0;

 		if (mbSize < 1.0)

-			return SIZE_FORMAT.format(kbSize) + Messages.CacheManager_KBs;

-		return SIZE_FORMAT.format(mbSize) + Messages.CacheManager_MBs;

+			return SIZE_FORMAT.format(kbSize) + Messages.OpStreamOp_KBs;

+		return SIZE_FORMAT.format(mbSize) + Messages.OpStreamOp_MBs;

 	}		

 }

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUpload.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUpload.java
index ad49182da..1c831ec01 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUpload.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUpload.java
@@ -197,7 +197,7 @@ public class OpUpload extends OpStreamOp {
 							percentRead = percent; // Remember the percentage.

 							// Report the progress.

 							monitor.subTask(NLS

-							                .bind(Messages.CacheManager_UploadingProgress, new Object[] { file

+							                .bind(Messages.OpUpload_UploadingProgress, new Object[] { file

 							                                .getName(), formatSize(bytesRead), formatSize(file

 							                                .length()) }));

 						}

@@ -243,7 +243,7 @@ public class OpUpload extends OpStreamOp {
 							monitor.worked(percent - percentRead);

 							percentRead = percent; // Remember the percentage.

 							// Report the progress.

-							monitor.subTask(NLS.bind(Messages.CacheManager_UploadingProgress, new Object[]{file.getName(), formatSize(bytesRead), fileLength}));

+							monitor.subTask(NLS.bind(Messages.OpUpload_UploadingProgress, new Object[]{file.getName(), formatSize(bytesRead), fileLength}));

 						}

 					}

 				}

@@ -414,9 +414,9 @@ public class OpUpload extends OpStreamOp {
     public String getName() {

 		String message;

 		if(srcFiles.length==1)

-			message = NLS.bind(Messages.CacheManager_UploadSingleFile, srcFiles[0].getName());

+			message = NLS.bind(Messages.OpUpload_UploadSingleFile, srcFiles[0].getName());

 		else

-			message = NLS.bind(Messages.CacheManager_UploadNFiles, Long.valueOf(srcFiles.length));

+			message = NLS.bind(Messages.OpUpload_UploadNFiles, Long.valueOf(srcFiles.length));

 		return message;

     }

 

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUser.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUser.java
index eae2b0054..ded84d1d5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUser.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpUser.java
@@ -120,7 +120,7 @@ public class OpUser extends Operation {
 			}

 			return accounts[0];

 		}

-		String message = NLS.bind(Messages.UserManager_TCFNotProvideFSMessage, channel.getRemotePeer().getID());

+		String message = NLS.bind(Messages.Operation_NoFileSystemError, channel.getRemotePeer().getID());

 		throw new TCFFileSystemException(message);

 	}

 

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
index 93dbe29ee..8ceb7b0cb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
@@ -139,7 +139,7 @@ public class Operation implements IOperation {
 				@Override
                 public void run() throws Exception {
 					if (!file.delete()) {
-						throw new Exception(NLS.bind(Messages.FSOperation_DeletingFileFailed, file.getAbsolutePath()));
+						throw new Exception(NLS.bind(Messages.Operation_DeletingFileFailed, file.getAbsolutePath()));
 					}
                 }
 
@@ -180,11 +180,11 @@ public class Operation implements IOperation {
 			public void doneOpenChannel(Throwable error, IChannel channel) {
 				if (error != null) {
 					if (error instanceof ConnectException) {
-						String message = NLS.bind(Messages.FSOperation_NotResponding, peer.getID());
+						String message = NLS.bind(Messages.Operation_NotResponding, peer.getID());
 						errors[0] = new TCFChannelException(message);
 					}
 					else {
-						String message = NLS.bind(Messages.OpeningChannelFailureMessage, peer.getID(), error.getMessage());
+						String message = NLS.bind(Messages.Operation_OpeningChannelFailureMessage, peer.getID(), error.getMessage());
 						errors[0] = new TCFChannelException(message, error);
 					}
 				}
@@ -284,7 +284,7 @@ public class Operation implements IOperation {
 			if (service != null) {
 				return getChildren(node, service);
 			}
-			String message = NLS.bind(Messages.FSOperation_NoFileSystemError, node.peerNode.getPeerId());
+			String message = NLS.bind(Messages.Operation_NoFileSystemError, node.peerNode.getPeerId());
 			throw new TCFFileSystemException(message);
 		}
 		finally {
@@ -323,7 +323,7 @@ public class Operation implements IOperation {
 				@Override
 				public void doneOpen(IToken token, FileSystemException error, IFileHandle handle) {
 					if (error != null) {
-						String message = NLS.bind(Messages.FSOperation_CannotOpenDir, node.name, error);
+						String message = NLS.bind(Messages.Operation_CannotOpenDir, node.name, error);
 						errors[0] = new TCFFileSystemException(message, error);
 					}
 					else {
@@ -445,10 +445,10 @@ public class Operation implements IOperation {
 		FSTreeNode possibleChild = findChild(service, dest, name);
 		for (int n = 0; possibleChild != null; n++) {
 			if (n > 0) {
-				name = NLS.bind(Messages.FSOperation_CopyNOfFile, Integer.valueOf(n), node.name);
+				name = NLS.bind(Messages.Operation_CopyNOfFile, Integer.valueOf(n), node.name);
 			}
 			else {
-				name = NLS.bind(Messages.FSOperation_CopyOfFile, node.name);
+				name = NLS.bind(Messages.Operation_CopyOfFile, node.name);
 			}
 			possibleChild = findChild(service, dest, name);
 		}
@@ -472,7 +472,7 @@ public class Operation implements IOperation {
 			public void doneMkDir(IToken token, FileSystemException error) {
 				if (error != null) {
 					String message = NLS
-					                .bind(Messages.FSOperation_CannotCreateDirectory, new Object[] { node.name, error });
+					                .bind(Messages.Operation_CannotCreateDirectory, new Object[] { node.name, error });
 					errors[0] = new TCFFileSystemException(message, error);
 				}
 			}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/url/TcfURLConnection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/url/TcfURLConnection.java
index 887d6a898..b13eca21f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/url/TcfURLConnection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/url/TcfURLConnection.java
@@ -194,7 +194,7 @@ public class TcfURLConnection extends URLConnection {
 					throw new IOException(Messages.TcfURLConnection_NoFileHandleReturned);
 				}
 			} else {
-				throw new IOException(Messages.TcfURLConnection_NoFSServiceAvailable);
+				throw new IOException(Messages.Operation_NoFileSystemError);
 			}
 		}
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/utils/CacheManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/utils/CacheManager.java
index e4388c66d..e4919fe56 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/utils/CacheManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/utils/CacheManager.java
@@ -88,7 +88,7 @@ public class CacheManager {
 				@Override

                 public void run() throws Exception {

 					if (!file.delete()) {

-						throw new Exception(NLS.bind(Messages.FSOperation_DeletingFileFailed, file.getAbsolutePath()));

+						throw new Exception(NLS.bind(Messages.Operation_DeletingFileFailed, file.getAbsolutePath()));

 					}

                 }

 

@@ -111,7 +111,7 @@ public class CacheManager {
 				@Override

                 public void run() throws Exception {

 					if (!file.setReadOnly()) {

-						throw new Exception(NLS.bind(Messages.CacheManager_SetReadOnlyFailed, file.getAbsolutePath()));

+						throw new Exception(NLS.bind(Messages.OpStreamOp_SetReadOnlyFailed, file.getAbsolutePath()));

 					}

                 }

 

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/FSTreeNode.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/FSTreeNode.java
index 5d5febd0a..8022a9a20 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/FSTreeNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/FSTreeNode.java
@@ -625,7 +625,7 @@ public final class FSTreeNode extends PlatformObject implements Cloneable, IPeer
 		}
 		int lastDot = name.lastIndexOf("."); //$NON-NLS-1$
 		if (lastDot == -1) {
-			return Messages.GeneralInformationPage_UnknownFileType;
+			return Messages.FSTreeNode_TypeUnknownFile;
 		}
 		return name.substring(lastDot + 1).toUpperCase() + " " + Messages.FSTreeNode_TypeFile; //$NON-NLS-1$
     }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.java
index 7a89597ef..8b1ae1e64 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.java
@@ -67,289 +67,54 @@ public class Messages extends NLS {
 
 		return null;
 	}
-
-	// **** Declare externalized string id's down here *****
-
-	public static String AdvancedAttributesDialog_Archive;
-	public static String AdvancedAttributesDialog_ArchiveIndex;
-	public static String AdvancedAttributesDialog_Compress;
-	public static String AdvancedAttributesDialog_Compressed;
-	public static String AdvancedAttributesDialog_CompressEncrypt;
-	public static String AdvancedAttributesDialog_Device;
-	public static String AdvancedAttributesDialog_Directory;
-	public static String AdvancedAttributesDialog_Encrypt;
-	public static String AdvancedAttributesDialog_Encrypted;
-	public static String AdvancedAttributesDialog_FileArchive;
-	public static String AdvancedAttributesDialog_FileBanner;
-	public static String AdvancedAttributesDialog_FolderArchive;
-	public static String AdvancedAttributesDialog_FolderBanner;
-	public static String AdvancedAttributesDialog_Hidden;
-	public static String AdvancedAttributesDialog_Indexed;
-	public static String AdvancedAttributesDialog_IndexFile;
-	public static String AdvancedAttributesDialog_IndexFolder;
-	public static String AdvancedAttributesDialog_Normal;
-	public static String AdvancedAttributesDialog_Offline;
-	public static String AdvancedAttributesDialog_ReadOnly;
-	public static String AdvancedAttributesDialog_Reparse;
-	public static String AdvancedAttributesDialog_ShellTitle;
-	public static String AdvancedAttributesDialog_Sparse;
-	public static String AdvancedAttributesDialog_System;
-	public static String AdvancedAttributesDialog_Temporary;
-	public static String AdvancedAttributesDialog_Virtual;
-	public static String BasicFolderSection_BasicInfoText;
-
-	public static String CacheManager_Bytes;
-	public static String CacheManager_DowloadingFile;
-	public static String CacheManager_DownloadingError;
-	public static String CacheManager_DownloadingProgress;
-	public static String CacheManager_KBs;
-	public static String CacheManager_MBs;
-	public static String CacheManager_MkdirFailed;
-	public static String CacheManager_SetLastModifiedFailed;
-	public static String CacheManager_SetReadOnlyFailed;
-	public static String CacheManager_UploadingProgress;
-	public static String CacheManager_UploadNFiles;
-	public static String CacheManager_UploadSingleFile;
-
-	public static String CmmitHandler_Cancel;
-	public static String CmmitHandler_CommitAnyway;
-	public static String CmmitHandler_ErrorTitle;
-	public static String CmmitHandler_FileDeleted;
-	public static String CmmitHandler_Merge;
-	public static String CmmitHandler_StateChangedDialogTitle;
-	public static String CmmitHandler_StateChangedMessage;
-
-	public static String FolderValidator_DirNotExist;
-	public static String FolderValidator_NotWritable;
-	public static String FolderValidator_SpecifyFolder;
-	public static String FSDelete_ButtonCancel;
-	public static String FSDelete_ButtonNo;
-	public static String FSDelete_ButtonYes;
-	public static String FSDelete_ButtonYes2All;
-	public static String FSDelete_CannotRemoveFile;
-	public static String FSDelete_CannotRemoveFolder;
-	public static String FSDelete_ConfirmDelete;
-	public static String FSDelete_ConfirmMessage;
-	public static String FSDelete_Deleting;
-	public static String FSDelete_PrepareToDelete;
-	public static String FSDelete_RemovingFileFolder;
-
-	public static String DeleteFilesHandler_DeleteMultipleFilesConfirmation;
-	public static String DeleteFilesHandler_DeleteOneFileConfirmation;
-	public static String DeleteFilesHandler_ConfirmDialogTitle;
-
-	public static String GeneralInformationPage_Accessed;
-	public static String GeneralInformationPage_Advanced;
-	public static String GeneralInformationPage_Attributes;
-	public static String GeneralInformationPage_Computer;
-	public static String GeneralInformationPage_File;
-	public static String GeneralInformationPage_FileSizeInfo;
-	public static String GeneralInformationPage_Folder;
-	public static String GeneralInformationPage_Hidden;
-	public static String GeneralInformationPage_Location;
-	public static String GeneralInformationPage_Modified;
-	public static String GeneralInformationPage_Name;
-	public static String GeneralInformationPage_ReadOnly;
-	public static String GeneralInformationPage_Size;
-	public static String GeneralInformationPage_Type;
-	public static String GeneralInformationPage_PermissionText;
-	public static String GeneralInformationPage_PropertiesChangeFailure;
-	public static String GeneralInformationPage_PropertiesChangeTitle;
-	public static String GeneralInformationPage_UnknownFileType;
-
-	public static String FSExplorerTreeControl_section_title;
-
-	public static String FSFolderSelectionDialog_MoveDialogMessage;
-	public static String FSFolderSelectionDialog_MoveDialogTitle;
-
-	public static String FSTreeControl_column_name_label;
-	public static String FSTreeControl_column_size_label;
-	public static String FSTreeControl_column_modified_label;
-
+	public static String FSTreeNodeContentProvider_rootNode_label;
 	public static String FSTreeNode_TypeFile;
 	public static String FSTreeNode_TypeFileFolder;
 	public static String FSTreeNode_TypeLocalDisk;
 	public static String FSTreeNode_TypeSystemFile;
-
-	public static String FSTreeNodeContentProvider_rootNode_label;
-
-	public static String FSOpenFileDialog_message;
-	public static String FSOpenFileDialog_title;
-	public static String FSOperation_CopyNOfFile;
-	public static String FSOperation_CopyOfFile;
-
-	public static String LinuxPermissionsSection_Permissions;
-	public static String LocalTypedElement_SavingFile;
-
-	public static String OpDownload_DownloadingMultipleFiles;
+	public static String FSTreeNode_TypeUnknownFile;
+	public static String Operation_DeletingFileFailed;
+	public static String Operation_NotResponding;
+	public static String Operation_OpeningChannelFailureMessage;
+	public static String Operation_NoFileSystemError;
+	public static String Operation_CannotOpenDir;
+	public static String Operation_CopyNOfFile;
+	public static String Operation_CopyOfFile;
+	public static String Operation_CannotCreateDirectory;
+	public static String OpCopy_Copying;
+	public static String OpCopy_CannotCopyFile;
+	public static String OpCopy_CopyingFile;
+	public static String OpCreate_TaskName;
+	public static String TcfURLConnection_NoFileHandleReturned;
+	public static String TcfURLConnection_NoPeerFound;
+	public static String TcfURLConnection_NoSuchTcfAgent;
+	public static String OpDelete_Deleting;
+	public static String OpDelete_PrepareToDelete;
+	public static String OpDelete_RemovingFileFolder;
 	public static String OpDownload_Downloading;
+	public static String OpDownload_DownloadingMultipleFiles;
 	public static String OpDownload_DownloadingSingleFile;
-	public static String OpenFileHandler_Cancel;
-	public static String OpenFileHandler_ConflictingMessage;
-	public static String OpenFileHandler_ConflictingTitle;
-	public static String OpenFileHandler_Merge;
-	public static String OpenFileHandler_OpenAnyway;
-	public static String OpenFileHandler_OpeningBinaryNotSupported;
-	public static String OpenFileHandler_Warning;
-
-	public static String OpenWithMenu_ChooseEditorForOpening;
-	public static String OpenWithMenu_DefaultEditor;
-	public static String OpenWithMenu_NoEditorFound;
-	public static String OpenWithMenu_OpenWith;
-
-	public static String FSCopy_CannotCopyFile;
-	public static String FSCopy_CopyFileFolderTitle;
-	public static String FSCopy_Copying;
-	public static String FSCopy_CopyingFile;
-	public static String FSCopy_PrepareToCopy;
-
-	public static String FSCreate_CreationFailed;
-	public static String FSCreate_JobTitle;
-	public static String FSCreate_TaskName;
-	public static String FSMove_CannotMove;
-	public static String FSMove_FileExistsError;
-	public static String FSMove_FolderExistsError;
-	public static String FSMove_MovingFile;
-	public static String FSMove_Moving;
-	public static String FSMove_PrepareToMove;
-	public static String FSMove_MoveFileFolderTitle;
-
-	public static String FSDelete_DeleteFileFolderTitle;
-
-	public static String FSDropTargetListener_ConfirmMoveTitle;
-	public static String FSDropTargetListener_MovingWarningMultiple;
-	public static String FSDropTargetListener_MovingWarningSingle;
-	public static String FSRename_CannotRename;
-	public static String FSRename_JobTitle;
-	public static String FSRename_RenameFileFolderTitle;
-
-	public static String FSOperation_CannotCreateDirectory;
-	public static String FSOperation_ConfirmDialogCancel;
-	public static String FSOperation_ConfirmDialogNo;
-	public static String FSOperation_ConfirmDialogYes;
-	public static String FSOperation_ConfirmDialogYesToAll;
-	public static String FSOperation_ConfirmFileReplace;
-	public static String FSOperation_ConfirmFileReplaceMessage;
-	public static String FSOperation_ConfirmFolderReplaceMessage;
-	public static String FSOperation_ConfirmFolderReplaceTitle;
-	public static String FSOperation_NoFileSystemError;
-	public static String FSOperation_NotResponding;
-	public static String FSOperation_CannotOpenDir;
-	public static String FSOperation_CannotReadDir;
-	public static String FSOperation_DeletingFileFailed;
-	public static String FSOperation_TimedOutWhenOpening;
-
-	public static String PermissionsGroup_Executable;
-	public static String PermissionsGroup_GroupPermissions;
-	public static String PermissionsGroup_OtherPermissions;
-	public static String PermissionsGroup_Readable;
-	public static String PermissionsGroup_UserPermissions;
-	public static String PermissionsGroup_Writable;
-
-	public static String RefreshDirectoryHandler_RefreshJobTitle;
-	public static String RefreshViewerHandler_RefreshJobTitle;
-	public static String RemoteTypedElement_GettingRemoteContent;
-	public static String RenameFilesHandler_PromptNewName;
-	public static String RenameFilesHandler_RenamePromptMessage;
-	public static String RenameFilesHandler_TitleRename;
-	public static String RenameFilesHandler_TitleRenameFile;
-	public static String RenameFilesHandler_TitleRenameFolder;
-	public static String FSRenamingAssistant_NameAlreadyExists;
-	public static String FSRenamingAssistant_NoNodeSelected;
-	public static String FSRenamingAssistant_SpecifyNonEmptyName;
-	public static String FSRenamingAssistant_UnixIllegalCharacters;
-	public static String FSRenamingAssistant_WinIllegalCharacters;
-	public static String FSUpload_Cancel;
-	public static String FSUpload_No;
-	public static String FSUpload_OverwriteConfirmation;
-	public static String FSUpload_OverwriteTitle;
-	public static String FSUpload_UploadTitle;
-	public static String FSUpload_Yes;
-	public static String FSUpload_YesToAll;
-
-	public static String SaveAllListener_Cancel;
-	public static String SaveAllListener_Merge;
-	public static String SaveAllListener_SaveAnyway;
-	public static String SaveAllListener_SingularMessage;
-	public static String SaveAllListener_StateChangedDialogTitle;
-
-	public static String SaveListener_Cancel;
-	public static String SaveListener_Merge;
-	public static String SaveListener_SaveAnyway;
-	public static String SaveListener_StateChangedDialogTitle;
-	public static String SaveListener_StateChangedMessage;
-
-	public static String StateManager_CannotGetFileStatMessage;
-	public static String StateManager_CannotSetFileStateMessage;
-	public static String StateManager_CommitFailureTitle;
-	public static String StateManager_RefreshFailureTitle;
-	public static String StateManager_TCFNotProvideFSMessage;
-	public static String StateManager_TCFNotProvideFSMessage2;
-	public static String StateManager_UpdateFailureTitle;
-
-	public static String PreferencePage_AutoSavingText;
-	public static String PreferencePage_CopyOwnershipText;
-	public static String PreferencePage_CopyPermissionText;
-	public static String PreferencePage_RenamingOptionText;
-
-	public static String TargetSelectionPage_Description;
-	public static String TargetSelectionPage_Targets;
-	public static String TargetSelectionPage_Title;
-
-	public static String TcfInputStream_CloseTimeout;
+	public static String OpMove_Moving;
+	public static String OpMove_FileExistsError;
+	public static String OpMove_FolderExistsError;
+	public static String OpMove_CannotMove;
+	public static String OpMove_MovingFile;
+	public static String OpOutStreamOp_DownloadingProgress;
+	public static String OpRefresh_RefreshJobTitle;
+	public static String OpRename_CannotRename;
+	public static String OpRename_TitleRename;
+	public static String OpStreamOp_SetReadOnlyFailed;
+	public static String OpStreamOp_Bytes;
+	public static String OpStreamOp_KBs;
+	public static String OpStreamOp_MBs;
+	public static String OpUpload_UploadingProgress;
+	public static String OpUpload_UploadNFiles;
+	public static String OpUpload_UploadSingleFile;
 	public static String TcfInputStream_NoDataAvailable;
-	public static String TcfInputStream_NoFileReturned;
-	public static String TcfInputStream_NoFSServiceAvailable;
-	public static String TcfInputStream_OpenFileTimeout;
-	public static String TcfInputStream_OpenTCFTimeout;
-	public static String TcfInputStream_ReadTimeout;
 	public static String TcfInputStream_StreamClosed;
-
 	public static String TcfOutputStream_StreamClosed;
-	public static String TcfOutputStream_WriteTimeout;
-
-	public static String TcfURLConnection_CloseFileTimeout;
-	public static String TcfURLConnection_NoFileHandleReturned;
-	public static String TcfURLConnection_NoFSServiceAvailable;
-	public static String TcfURLConnection_NoPeerFound;
-	public static String TcfURLConnection_NoSuchTcfAgent;
-	public static String TcfURLConnection_OpenFileTimeout;
-	public static String TcfURLConnection_OpenTCFChannelTimeout;
 	public static String TcfURLStreamHandlerService_ErrorURLFormat;
 	public static String TcfURLStreamHandlerService_IllegalCharacter;
 	public static String TcfURLStreamHandlerService_OnlyDiskPartError;
-
-	public static String OpeningChannelFailureMessage;
-	public static String OpeningChannelFailureTitle;
-
-	public static String UpdateHandler_Cancel;
-	public static String UpdateHandler_Merge;
-	public static String UpdateHandler_StateChangedDialogTitle;
-	public static String UpdateHandler_StateChangedMessage;
-	public static String UpdateHandler_UpdateAnyway;
-
-	public static String UserManager_CannotGetUserAccountMessage;
-	public static String UserManager_CannotGetUserAccountMessage2;
-	public static String UserManager_TCFNotProvideFSMessage;
-	public static String UserManager_UserAccountTitle;
-
-	public static String MergeEditorInput_CompareLeftAndRight;
-	public static String MergeEditorInput_CompareWithLocalCache;
-	public static String MergeEditorInput_LocalFile;
-	public static String MergeEditorInput_RemoteFile;
-	public static String MergeInput_CopyNotSupported;
-	public static String NameValidator_SpecifyFolder;
-	public static String NewFileWizard_NewFileWizardTitle;
-	public static String NewFileWizardPage_NewFileWizardPageDescription;
-	public static String NewFileWizardPage_NewFileWizardPageNameLabel;
-	public static String NewFileWizardPage_NewFileWizardPageTitle;
-	public static String NewFolderWizard_NewFolderWizardTitle;
-	public static String NewFolderWizardPage_NewFolderWizardPageDescription;
-	public static String NewFolderWizardPage_NewFolderWizardPageNameLabel;
-	public static String NewFolderWizardPage_NewFolderWizardPageTitle;
-	public static String NewNodeWizardPage_LstatTimedout;
-	public static String NewNodeWizardPage_PromptFolderLabel;
-	public static String WindowsAttributesSection_Attributes;
-	public static String PendingOperation_label;
-	public static String QueryDoneOpenChannel_NoFService;
+	public static String CacheManager_MkdirFailed;
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.properties
index 9557c19fd..c17dbdf85 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/nls/Messages.properties
@@ -1,280 +1,50 @@
-FolderValidator_SpecifyFolder=Please specify the folder where the file/folder is going to be created.
-#
-# org.eclipse.tcf.te.tcf.filesystem
-# Externalized Strings.
-#
-
-FolderValidator_DirNotExist=The directory {0} does not exist in the current target.
-FolderValidator_NotWritable=The directory {0} is not writable. Please choose a different one.
-
-FSExplorerTreeControl_section_title=Exploring File System
-
-FSFolderSelectionDialog_MoveDialogMessage=Choose destination for the files to be moved:
-FSFolderSelectionDialog_MoveDialogTitle=Move Files and Folders
-
-FSTreeControl_column_name_label=Name
-FSTreeControl_column_size_label=Size
-FSTreeControl_column_modified_label=Date Modified
-
-FSTreeNode_TypeFile=file
-FSTreeNode_TypeFileFolder=File Folder
-FSTreeNode_TypeLocalDisk=Local Disk
-FSTreeNode_TypeSystemFile=System file
-
-FSTreeNodeContentProvider_rootNode_label=File System
-
-FSOpenFileDialog_message=Please select an image file for the process.
-FSOpenFileDialog_title=Select Process Image
-
-FSOperation_CopyNOfFile=Copy ({0}) of {1}
-FSOperation_CopyOfFile=Copy of {0}
-
-GeneralInformationPage_Accessed=Accessed:
-GeneralInformationPage_Advanced=\ A&dvanced... 
-GeneralInformationPage_Attributes=Attributes:
-GeneralInformationPage_File=File ({0})
-GeneralInformationPage_FileSizeInfo={0} KB ({1} bytes)
-GeneralInformationPage_Folder=Folder
-GeneralInformationPage_Hidden=Hidden
-GeneralInformationPage_ReadOnly=Read-only
-GeneralInformationPage_Computer=computer
-GeneralInformationPage_Location=Location:
-GeneralInformationPage_Modified=Modified:
-GeneralInformationPage_Name=Name:
-GeneralInformationPage_Size=Size:
-GeneralInformationPage_Type=Type:
-GeneralInformationPage_PermissionText=Permissions:
-GeneralInformationPage_PropertiesChangeFailure=Properties changes to {0} failed due to the following reason:{1}
-GeneralInformationPage_PropertiesChangeTitle=Properties Change
-GeneralInformationPage_UnknownFileType=Unknown File
-
-AdvancedAttributesDialog_Archive=Archive
-AdvancedAttributesDialog_ArchiveIndex=Archive and Index attributes
-AdvancedAttributesDialog_Compress=Compress contents to save disk space
-AdvancedAttributesDialog_Compressed=Compressed
-AdvancedAttributesDialog_CompressEncrypt=Compress or Encrypt attributes
-AdvancedAttributesDialog_Device=Device
-AdvancedAttributesDialog_Directory=Directory
-AdvancedAttributesDialog_Encrypt=Encrypt contents to secure data
-AdvancedAttributesDialog_Encrypted=Encrypted
-AdvancedAttributesDialog_FileArchive=File is ready for archiving
-AdvancedAttributesDialog_FileBanner=Choose the options you want for this file.
-AdvancedAttributesDialog_FolderArchive=Folder is ready for archiving
-AdvancedAttributesDialog_FolderBanner=Choose the settings you want for this folder.\n\nWhen you apply these changes you will be asked if you want the\n changes to affect all subfolders and files as well.
-AdvancedAttributesDialog_Hidden=Hidden
-AdvancedAttributesDialog_Indexed=Indexed
-AdvancedAttributesDialog_IndexFile=For fast searching, allow Indexing Service to index this file
-AdvancedAttributesDialog_IndexFolder=For fast searching, allow Indexing Service to index this folder
-AdvancedAttributesDialog_Normal=Normal
-AdvancedAttributesDialog_Offline=Offline
-AdvancedAttributesDialog_ReadOnly=Read-only
-AdvancedAttributesDialog_Reparse=Reparse
-AdvancedAttributesDialog_ShellTitle=Advanced Attributes
-AdvancedAttributesDialog_Sparse=Sparse
-AdvancedAttributesDialog_System=System
-AdvancedAttributesDialog_Temporary=Temporary
-AdvancedAttributesDialog_Virtual=Virtual
-BasicFolderSection_BasicInfoText=Basic Information
-
-CacheManager_Bytes=\ bytes
-CacheManager_DowloadingFile=Downloading file {0}...
-CacheManager_DownloadingError=Downloading Error
-CacheManager_DownloadingProgress=Downloading {0}/{1}.
-CacheManager_KBs=\ KBs
-CacheManager_MBs=\ MBs
-CacheManager_MkdirFailed=Making directory {0} failed
-CacheManager_SetLastModifiedFailed=Setting the last modified time of {0} failed\!
-CacheManager_SetReadOnlyFailed=Setting the read-only attribute of {0} failed\!
-CacheManager_UploadingProgress=Uploading file {0}: {1}/{2}
-CacheManager_UploadNFiles=Uploading {0} files...
-CacheManager_UploadSingleFile=Uploading file {0}...
-
-CmmitHandler_Cancel=Cancel
-CmmitHandler_CommitAnyway=Commit anyway
-CmmitHandler_ErrorTitle=File Deleted
-CmmitHandler_FileDeleted=The local file {0} that you are trying to commit has been deleted\!
-CmmitHandler_Merge=Merge
-CmmitHandler_StateChangedDialogTitle=State Changed
-CmmitHandler_StateChangedMessage={0} on the target has changed and is conflicting with the local file. What do you want?
-FSDelete_ButtonCancel=Cancel
-FSDelete_ButtonNo=&No
-FSDelete_ButtonYes=&Yes
-FSDelete_ButtonYes2All=Yes to &All
-FSDelete_CannotRemoveFile=Cannot remove the file {0}\!. Caused by {1}
-FSDelete_CannotRemoveFolder=Cannot remove the folder {0}\!. Caused by {1}
-FSDelete_ConfirmDelete=Confirm Delete
-DeleteFilesHandler_ConfirmDialogTitle=Confirm Delete
-FSDelete_ConfirmMessage=Are you sure you want to remove the read-only file ''{0}''?
-DeleteFilesHandler_DeleteMultipleFilesConfirmation=Are you sure you want to delete these {0} files/folders?
-DeleteFilesHandler_DeleteOneFileConfirmation=Are you sure you want to delete ''{0}''?
-FSDelete_Deleting=Deleting files
-FSDelete_PrepareToDelete=Prepare to delete files ...
-FSDelete_RemovingFileFolder=Removing {0} ...
-
-LinuxPermissionsSection_Permissions=Permissions
-LocalTypedElement_SavingFile=Saving file:
-
-OpDownload_Downloading=Downloading file {0}:{1}/{2}
-OpDownload_DownloadingMultipleFiles=Downloading {0} files...
-OpDownload_DownloadingSingleFile=Downloading file {0}...
-OpenFileHandler_Cancel=Cancel
-OpenFileHandler_ConflictingMessage=The local {0} is conflicting with the remote version. What do you want?
-OpenFileHandler_ConflictingTitle=Conflicting content
-OpenFileHandler_Merge=Merge
-OpenFileHandler_OpenAnyway=Open anyway
-OpenFileHandler_OpeningBinaryNotSupported=Opening a binary file is not supported yet.
-OpenFileHandler_Warning=Warning
-
-OpenWithMenu_ChooseEditorForOpening=Choose the editor for opening {0}
-OpenWithMenu_DefaultEditor=&Default Editor
-OpenWithMenu_NoEditorFound=No editor found to edit the file resource.
-OpenWithMenu_OpenWith=Open With
-
-FSCopy_CannotCopyFile=Cannot copy file {0} because: {1}
-FSOperation_CannotCreateDirectory=Cannot create the directory {0} because: {1}
-FSMove_CannotMove=Cannot move {0} because {1}
-FSMove_FileExistsError=Cannot replace {0}: There is already a file with the same name as the folder you are moving.
-FSMove_FolderExistsError=Cannot replace {0}: There is already a folder with the same name as the file you are moving.
-FSRename_CannotRename=Cannot rename {0} because {1}
-FSRename_JobTitle=Renaming
-FSOperation_ConfirmDialogCancel=Cancel
-FSOperation_ConfirmDialogNo=&No
-FSOperation_ConfirmDialogYes=&Yes
-FSOperation_ConfirmDialogYesToAll=Yes to &All
-FSOperation_ConfirmFileReplace=Confirm File Replace
-FSOperation_ConfirmFileReplaceMessage=This folder already contains a file named {0}.\n\n If the files in the existing folder have the same name as files in the folder you are moving or copying, they will be replaced. Do you still want to move or copy the file?
-FSOperation_ConfirmFolderReplaceMessage=This folder already contains a folder named {0}.\n\n If the files in the existing folder have the same name as files in the folder you are moving or copying, they will be replaced. Do you still want to move or copy the folder?
-FSOperation_ConfirmFolderReplaceTitle=Confirm Folder Replace
-FSCopy_CopyFileFolderTitle=Error Copying File or Folder
-FSMove_MoveFileFolderTitle=Error Moving File or Folder
-FSRename_RenameFileFolderTitle=Error Renaming File or Folder
-FSDelete_DeleteFileFolderTitle=Error Deleting File or Folder
-FSDropTargetListener_ConfirmMoveTitle=Confirm Move
-FSDropTargetListener_MovingWarningMultiple=This operation will delete the files after moving. You can copy them without deletion by CTRL + dragging. \n\nAre you sure you want to move these {0} files/folders?
-FSDropTargetListener_MovingWarningSingle=This operation will delete the file after moving. You can copy it without deletion by CTRL + dragging. \n\nAre you sure you want to move ''{0}''?
-FSCopy_Copying=Copying {0} ...
-FSCopy_CopyingFile=Copying files
-FSMove_MovingFile=Moving files
-FSMove_Moving=Moving {0} ...
-FSOperation_NoFileSystemError=This TCF agent, {0}, does not provide a file system service\!
-FSOperation_NotResponding=The TCF agent on the target {0} is probably down. It is not responding.
-FSCopy_PrepareToCopy=Prepare to copy files ...
-FSCreate_CreationFailed=Creation Failed
-FSCreate_JobTitle=Create file or folder
-FSCreate_TaskName=Creating {0}...
-FSMove_PrepareToMove=Prepare to move files...
-PermissionsGroup_Executable=Executable
-PermissionsGroup_GroupPermissions=Group:
-PermissionsGroup_OtherPermissions=Other:
-PermissionsGroup_Readable=Readable
-PermissionsGroup_UserPermissions=User:
-PermissionsGroup_Writable=Writable
-
-RefreshDirectoryHandler_RefreshJobTitle=Refresh {0}
-RefreshViewerHandler_RefreshJobTitle=Refresh the file system
-RemoteTypedElement_GettingRemoteContent=Getting content from the remote file:
-RenameFilesHandler_PromptNewName=New name:
-RenameFilesHandler_RenamePromptMessage=Please enter a new name
-RenameFilesHandler_TitleRename=Rename
-RenameFilesHandler_TitleRenameFile=Rename File
-RenameFilesHandler_TitleRenameFolder=Rename Folder
-FSRenamingAssistant_NameAlreadyExists=A file/folder with the name you specified already exists\! Specify a different name.
-FSRenamingAssistant_NoNodeSelected=No node is selected.
-FSRenamingAssistant_SpecifyNonEmptyName=Specify a non-empty name.
-FSRenamingAssistant_UnixIllegalCharacters=A file/folder name cannot contain any of the following characters:\n/
-FSRenamingAssistant_WinIllegalCharacters=A file/folder name cannot contain any of the following characters:\n\\/:*?<>|
-
-SaveAllListener_Cancel=Cancel
-SaveAllListener_Merge=Merge
-SaveAllListener_SaveAnyway=Save anyway
-SaveAllListener_SingularMessage=The file {0} on the target has changed and is conflicting with the local file. What do you want?
-SaveAllListener_StateChangedDialogTitle=State Changed
-
-SaveListener_Cancel=Cancel
-SaveListener_Merge=Merge
-SaveListener_SaveAnyway=Save anyway
-SaveListener_StateChangedDialogTitle=State Changed
-SaveListener_StateChangedMessage={0} on the target has changed and is conflicting with the local file. What do you want?
-
-StateManager_CannotGetFileStatMessage=Cannot get the file's stat of {0}\. {1}.
-StateManager_CannotSetFileStateMessage=Cannot set the file's stat of {0}\. {1}.
-StateManager_CommitFailureTitle=Commit Failure
-StateManager_RefreshFailureTitle=Refresh Failure
-StateManager_TCFNotProvideFSMessage=This TCF agent, {0}, does not provide a file system service\!
-StateManager_TCFNotProvideFSMessage2=This TCF agent, {0}, does not provide a file system service\!
-StateManager_UpdateFailureTitle=Update Failure
-
-PreferencePage_AutoSavingText=Automatically upload files to targets upon saving
-PreferencePage_CopyOwnershipText=Copy source UID and GID when copying files
-PreferencePage_CopyPermissionText=Copy source permissions when copying files
-PreferencePage_RenamingOptionText=Use In-place Editor when renaming a file/folder
-TargetSelectionPage_Description=Please select the target where the new file/folder is created.
-TargetSelectionPage_Targets=Targets:
-TargetSelectionPage_Title=Select the target.
-TcfInputStream_CloseTimeout=Closing has timed out\!
-TcfInputStream_NoDataAvailable=No data available
-TcfInputStream_NoFileReturned=No file handle returned\!
-TcfInputStream_NoFSServiceAvailable=No remote File System Service available\!
-TcfInputStream_OpenFileTimeout=Opening file has timed out\!
-TcfInputStream_OpenTCFTimeout=Opening TCF channel has timed out\!
-TcfInputStream_ReadTimeout=Reading has timed out\!
-TcfInputStream_StreamClosed=Stream is already closed\!
-
-TcfOutputStream_StreamClosed=Stream is already closed\!
-TcfOutputStream_WriteTimeout=Writing has timed out\!
-
-TcfURLConnection_CloseFileTimeout=Closing has timed out\!
-TcfURLConnection_NoFileHandleReturned=No file handle returned\!
-TcfURLConnection_NoFSServiceAvailable=No remote File System Service available\!
-TcfURLConnection_NoPeerFound=Could not find the specified target with the ID {0}
-TcfURLConnection_NoSuchTcfAgent=TCF agent is already disconnected\!
-TcfURLConnection_OpenFileTimeout=Opening file has timed out\!
-TcfURLConnection_OpenTCFChannelTimeout=Opening TCF channel has timed out\!
-TcfURLStreamHandlerService_ErrorURLFormat=Error TCF URL format\!
-TcfURLStreamHandlerService_IllegalCharacter=A Windows path does not permit character {0}.
-TcfURLStreamHandlerService_OnlyDiskPartError=A Windows path should not contain only disk part.
-
-OpeningChannelFailureMessage=We cannot open a TCF channel to the target: {0}. It is caused by {1}.
-OpeningChannelFailureTitle=Opening Channel
-
-UpdateHandler_Cancel=Cancel
-UpdateHandler_Merge=Merge
-UpdateHandler_StateChangedDialogTitle=State Changed
-UpdateHandler_StateChangedMessage=The local {0} has changed and is conflicting with the remote file. What do you want?
-UpdateHandler_UpdateAnyway=Update anyway
-
-UserManager_CannotGetUserAccountMessage=Cannot get the user account from the agent {0}
-UserManager_CannotGetUserAccountMessage2=Cannot get the user account from the agent {0}. Caused by: networking too slow.
-UserManager_TCFNotProvideFSMessage=This TCF agent, {0}, does not provide a file system service\!
-UserManager_UserAccountTitle=User Account
-
-FSOperation_CannotOpenDir=Cannot open directory {0} because {1}
-FSOperation_CannotReadDir=Cannot read directory {0} because {1}
-FSOperation_DeletingFileFailed=Deleting {0} failed\!
-FSOperation_TimedOutWhenOpening=it has timed out when opening the directory\!
-FSUpload_Cancel=Cancel
-FSUpload_No=No
-FSUpload_OverwriteConfirmation=A file with a same name already exists. Are you sure to overwrite {0}?
-FSUpload_OverwriteTitle=Confirm Overwrite
-FSUpload_UploadTitle=Upload Files
-FSUpload_Yes=Yes
-FSUpload_YesToAll=Yes to All
-MergeEditorInput_CompareLeftAndRight=Compare {0} and {1}
-MergeEditorInput_CompareWithLocalCache=Compare {0} with Local Cache
-MergeEditorInput_LocalFile=Local: {0}
-MergeEditorInput_RemoteFile=Remote: {0}
-MergeInput_CopyNotSupported=Copy is not support by this type of compare input
-NameValidator_SpecifyFolder=Please specify the folder where the file/folder is going to be created.
-NewFileWizard_NewFileWizardTitle=New File Wizard
-NewFileWizardPage_NewFileWizardPageDescription=Create a new file in the directory.
-NewFileWizardPage_NewFileWizardPageNameLabel=File name:
-NewFileWizardPage_NewFileWizardPageTitle=New File
-NewFolderWizard_NewFolderWizardTitle=New Folder Wizard
-NewFolderWizardPage_NewFolderWizardPageDescription=Create a new folder in the directory.
-NewFolderWizardPage_NewFolderWizardPageNameLabel=Folder name:
-NewFolderWizardPage_NewFolderWizardPageTitle=New Folder
-NewNodeWizardPage_LstatTimedout=lstat timed out\!
-NewNodeWizardPage_PromptFolderLabel=Enter or select the parent folder:
-WindowsAttributesSection_Attributes=Attributes
-PendingOperation_label=Pending...
-QueryDoneOpenChannel_NoFService=No File System service\!
+FSTreeNodeContentProvider_rootNode_label=File System

+FSTreeNode_TypeFile=File

+FSTreeNode_TypeFileFolder=File Folder

+FSTreeNode_TypeLocalDisk=Local Disk

+FSTreeNode_TypeSystemFile=System file

+FSTreeNode_TypeUnknownFile=Unknown File

+Operation_DeletingFileFailed=Deleting {0} failed\!

+Operation_NotResponding=The TCF agent on the target {0} is probably down. It is not responding.

+Operation_OpeningChannelFailureMessage=We cannot open a TCF channel to the target: {0}. It is caused by {1}.

+Operation_NoFileSystemError=This TCF agent, {0}, does not provide a file system service\!

+Operation_CannotOpenDir=Cannot open directory {0} because {1}

+Operation_CopyNOfFile=Copy ({0}) of {1}

+Operation_CopyOfFile=Copy of {0}

+Operation_CannotCreateDirectory=Cannot create the directory {0} because: {1}

+OpCopy_Copying=Copying {0} ...

+OpCopy_CannotCopyFile=Cannot copy file {0} because: {1}

+OpCopy_CopyingFile=Copying files

+OpCreate_TaskName=Creating {0}...

+TcfURLConnection_NoFileHandleReturned=No file handle returned\!

+TcfURLConnection_NoPeerFound=Could not find the specified target with the ID {0}

+TcfURLConnection_NoSuchTcfAgent=TCF agent is already disconnected\!

+OpDelete_Deleting=Deleting files

+OpDelete_PrepareToDelete=Prepare to delete files ...

+OpDelete_RemovingFileFolder=Removing {0} ...

+OpDownload_Downloading=Downloading file {0}:{1}/{2}

+OpDownload_DownloadingMultipleFiles=Downloading {0} files...

+OpDownload_DownloadingSingleFile=Downloading file {0}...

+OpMove_Moving=Moving {0} ...

+OpMove_FileExistsError=Cannot replace {0}: There is already a file with the same name as the folder you are moving.

+OpMove_FolderExistsError=Cannot replace {0}: There is already a folder with the same name as the file you are moving.

+OpMove_CannotMove=Cannot move {0} because {1}

+OpMove_MovingFile=Moving files

+OpOutStreamOp_DownloadingProgress=Downloading {0}/{1}.

+OpRefresh_RefreshJobTitle=Refresh {0}

+OpRename_CannotRename=Cannot rename {0} because {1}

+OpRename_TitleRename=Rename

+OpStreamOp_SetReadOnlyFailed=Setting the read-only attribute of {0} failed\!

+OpStreamOp_Bytes=\ bytes

+OpStreamOp_KBs=\ KBs

+OpStreamOp_MBs=\ MBs

+OpUpload_UploadingProgress=Uploading file {0}: {1}/{2}

+OpUpload_UploadNFiles=Uploading {0} files...

+OpUpload_UploadSingleFile=Uploading file {0}...

+TcfInputStream_NoDataAvailable=No data available

+TcfInputStream_StreamClosed=Stream is already closed\!

+TcfOutputStream_StreamClosed=Stream is already closed\!

+TcfURLStreamHandlerService_ErrorURLFormat=Error TCF URL format\!

+TcfURLStreamHandlerService_IllegalCharacter=A Windows path does not permit character {0}.

+TcfURLStreamHandlerService_OnlyDiskPartError=A Windows path should not contain only disk part.

+CacheManager_MkdirFailed=Making directory {0} failed

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/services/FileTransferService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/services/FileTransferService.java
index 52b583c22..eccf14cbd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/services/FileTransferService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/services/FileTransferService.java
@@ -337,11 +337,11 @@ public class FileTransferService {
 			public void doneOpenChannel(Throwable error, IChannel channel) {
 				if (error != null) {
 					if (error instanceof ConnectException) {
-						String message = NLS.bind(Messages.FSOperation_NotResponding, peer.getID());
+						String message = NLS.bind(Messages.Operation_NotResponding, peer.getID());
 						errors[0] = new TCFChannelException(message);
 					}
 					else {
-						String message = NLS.bind(Messages.OpeningChannelFailureMessage, peer.getID(), error.getMessage());
+						String message = NLS.bind(Messages.Operation_OpeningChannelFailureMessage, peer.getID(), error.getMessage());
 						errors[0] = new TCFChannelException(message, error);
 					}
 				}