Converted to using Runtime NLS support

7 files changed, 294 insertions, 255 deletions

diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java
new file mode 100644
index 000000000..64fd56d83
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java
@@ -0,0 +1,117 @@
+/**********************************************************************
+ * Copyright (c) 2005 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
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.team.internal.ccvs.ssh2;
+
+import org.eclipse.osgi.util.NLS;
+
+public class CVSSSH2Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.team.internal.ccvs.ssh2.messages";//$NON-NLS-1$
+	
+	public static String JSchSession_5;
+	public static String CVSSSH2ServerConnection_open;
+	public static String CVSSSH2PreferencePage_18;
+	public static String CVSSSH2PreferencePage_19;
+	public static String CVSSSH2PreferencePage_20;
+	public static String CVSSSH2PreferencePage_21;
+	public static String CVSSSH2PreferencePage_22;
+	public static String CVSSSH2PreferencePage_23;
+	public static String CVSSSH2PreferencePage_24;
+	public static String CVSSSH2PreferencePage_25;
+	public static String CVSSSH2PreferencePage_26;
+	public static String CVSSSH2PreferencePage_27;
+	public static String CVSSSH2PreferencePage_30;
+	public static String CVSSSH2PreferencePage_31;
+	public static String CVSSSH2PreferencePage_32;
+	public static String CVSSSH2PreferencePage_33;
+	public static String CVSSSH2PreferencePage_34;
+	public static String CVSSSH2PreferencePage_35;
+	public static String CVSSSH2PreferencePage_36;
+	public static String CVSSSH2PreferencePage_37;
+	public static String CVSSSH2PreferencePage_38;
+	public static String CVSSSH2PreferencePage_39;
+	public static String CVSSSH2PreferencePage_41;
+	public static String CVSSSH2PreferencePage_42;
+	public static String CVSSSH2PreferencePage_43;
+	public static String CVSSSH2PreferencePage_44;
+	public static String CVSSSH2PreferencePage_45;
+	public static String CVSSSH2PreferencePage_47;
+	public static String CVSSSH2PreferencePage_48;
+	public static String CVSSSH2PreferencePage_49;
+	public static String CVSSSH2PreferencePage_50;
+	public static String CVSSSH2PreferencePage_53;
+	public static String CVSSSH2PreferencePage_55;
+	public static String CVSSSH2PreferencePage_57;
+	public static String CVSSSH2PreferencePage_59;
+	public static String CVSSSH2PreferencePage_66;
+	public static String CVSSSH2PreferencePage_67;
+	public static String CVSSSH2PreferencePage_68;
+	public static String CVSSSH2PreferencePage_69;
+	public static String CVSSSH2PreferencePage_70;
+	public static String CVSSSH2PreferencePage_71;
+	public static String CVSSSH2PreferencePage_72;
+	public static String CVSSSH2PreferencePage_73;
+	public static String CVSSSH2PreferencePage_74;
+	public static String CVSSSH2PreferencePage_75;
+	public static String CVSSSH2PreferencePage_76;
+	public static String CVSSSH2PreferencePage_77;
+	public static String CVSSSH2PreferencePage_79;
+	public static String CVSSSH2PreferencePage_80;
+	public static String CVSSSH2PreferencePage_81;
+	public static String CVSSSH2PreferencePage_82;
+	public static String CVSSSH2PreferencePage_83;
+	public static String CVSSSH2PreferencePage_86;
+	public static String CVSSSH2PreferencePage_87;
+	public static String CVSSSH2PreferencePage_93;
+	public static String CVSSSH2PreferencePage_95;
+	public static String CVSSSH2PreferencePage_97;
+	public static String CVSSSH2PreferencePage_99;
+	public static String CVSSSH2PreferencePage_100;
+	public static String CVSSSH2PreferencePage_101;
+	public static String CVSSSH2PreferencePage_102;
+	public static String CVSSSH2PreferencePage_103;
+	public static String CVSSSH2PreferencePage_104;
+	public static String CVSSSH2PreferencePage_105;
+	public static String CVSSSH2PreferencePage_106;
+	public static String CVSSSH2PreferencePage_107;
+	public static String CVSSSH2PreferencePage_108;
+	public static String CVSSSH2PreferencePage_109;
+	public static String CVSSSH2PreferencePage_110;
+	public static String CVSSSH2PreferencePage_111;
+	public static String CVSSSH2ServerConnection_3;
+	public static String CVSSSH2ServerConnection_0;
+	public static String CVSSSH2ServerConnection_1;
+	public static String CVSSSH2PreferencePage_info;
+	public static String CVSSSH2PreferencePage_warning;
+	public static String CVSSSH2PreferencePage_information;
+	public static String CVSSSH2PreferencePage_error;
+	public static String CVSSSH2PreferencePage_confirmation;
+	public static String CVSSSH2PreferencePage_question;
+	public static String CVSSSH2PreferencePage_125;
+	public static String CVSSSH2PreferencePage_126;
+	public static String CVSSSH2PreferencePage_127;
+	public static String CVSSSH2PreferencePage_128;
+	public static String CVSSSH2PreferencePage_129;
+	public static String CVSSSH2PreferencePage_130;
+	public static String CVSSSH2PreferencePage_131;
+	public static String CVSSSH2PreferencePage_132;
+	public static String CVSSSH2PreferencePage_133;
+	public static String CVSSSH2PreferencePage_134;
+	public static String CVSSSH2PreferencePage_135;
+	public static String CVSSSH2PreferencePage_136;
+	public static String CVSSSH2PreferencePage_137;
+	public static String CVSSSH2PreferencePage_138;
+	public static String CVSSSH2PreferencePage_139;
+	public static String Util_timeout;
+
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, CVSSSH2Messages.class);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
index 49c713141..9bf775ef7 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
@@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.custom.TableEditor;
@@ -101,7 +102,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 //    super(GRID);
     IPreferenceStore store=CVSSSH2Plugin.getDefault().getPreferenceStore();
     setPreferenceStore(store);
-    setDescription(Policy.bind("CVSSSH2PreferencePage.18")); //$NON-NLS-1$
+    setDescription(CVSSSH2Messages.CVSSSH2PreferencePage_18); //$NON-NLS-1$
   }
   
   protected Control createContents(Composite parent) {
@@ -114,19 +115,19 @@ public class CVSSSH2PreferencePage extends PreferencePage
     tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
 
     TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
-    tabItem.setText(Policy.bind("CVSSSH2PreferencePage.19")); //$NON-NLS-1$
+    tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_19); //$NON-NLS-1$
     tabItem.setControl(createGeneralPage(tabFolder));
 
     tabItem = new TabItem(tabFolder, SWT.NONE);
-    tabItem.setText(Policy.bind("CVSSSH2PreferencePage.20")); //$NON-NLS-1$
+    tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_20); //$NON-NLS-1$
     tabItem.setControl(createProxyPage(tabFolder));
 
     tabItem = new TabItem(tabFolder, SWT.NONE);
-    tabItem.setText(Policy.bind("CVSSSH2PreferencePage.21")); //$NON-NLS-1$
+    tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_21); //$NON-NLS-1$
     tabItem.setControl(createKeyManagementPage(tabFolder));
     
     tabItem = new TabItem(tabFolder, SWT.NONE);
-    tabItem.setText(Policy.bind("CVSSSH2PreferencePage.133")); //$NON-NLS-1$
+    tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_133); //$NON-NLS-1$
     tabItem.setControl(createHostKeyManagementPage(tabFolder));
 
     initControls();
@@ -147,7 +148,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     createSpacer(group, 3);
 
     ssh2HomeLabel=new Label(group, SWT.NONE);
-    ssh2HomeLabel.setText(Policy.bind("CVSSSH2PreferencePage.23")); //$NON-NLS-1$
+    ssh2HomeLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_23); //$NON-NLS-1$
 
     ssh2HomeText=new Text(group, SWT.SINGLE | SWT.BORDER);
     ssh2HomeText.setFont(group.getFont());
@@ -156,7 +157,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     ssh2HomeText.setLayoutData(gd);
 
     ssh2HomeBrowse=new Button(group, SWT.NULL);
-    ssh2HomeBrowse.setText(Policy.bind("CVSSSH2PreferencePage.24")); //$NON-NLS-1$
+    ssh2HomeBrowse.setText(CVSSSH2Messages.CVSSSH2PreferencePage_24); //$NON-NLS-1$
     gd=new GridData(GridData.HORIZONTAL_ALIGN_FILL);
     gd.horizontalSpan=1;
     ssh2HomeBrowse.setLayoutData(gd);
@@ -164,7 +165,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     createSpacer(group, 3);
 
     privateKeyLabel=new Label(group, SWT.NONE);
-    privateKeyLabel.setText(Policy.bind("CVSSSH2PreferencePage.25")); //$NON-NLS-1$
+    privateKeyLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_25); //$NON-NLS-1$
 
     privateKeyText=new Text(group, SWT.SINGLE | SWT.BORDER);
     privateKeyText.setFont(group.getFont());
@@ -173,7 +174,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     privateKeyText.setLayoutData(gd);
 
     privateKeyAdd=new Button(group, SWT.NULL);
-    privateKeyAdd.setText(Policy.bind("CVSSSH2PreferencePage.26")); //$NON-NLS-1$
+    privateKeyAdd.setText(CVSSSH2Messages.CVSSSH2PreferencePage_26); //$NON-NLS-1$
     gd=new GridData(GridData.HORIZONTAL_ALIGN_FILL);
     gd.horizontalSpan=1;
     privateKeyAdd.setLayoutData(gd);
@@ -193,7 +194,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 
 	  DirectoryDialog dd=new DirectoryDialog(getShell());
 	  dd.setFilterPath(home);
-	  dd.setMessage(Policy.bind("CVSSSH2PreferencePage.27")); //$NON-NLS-1$
+	  dd.setMessage(CVSSSH2Messages.CVSSSH2PreferencePage_27); //$NON-NLS-1$
 	  String dir=dd.open();
 	  if(dir==null){ // cancel
 	    return;
@@ -240,13 +241,13 @@ public class CVSSSH2PreferencePage extends PreferencePage
     group.setLayoutData(data);
 
     enableProxy=new Button(group, SWT.CHECK);
-    enableProxy.setText(Policy.bind("CVSSSH2PreferencePage.30")); //$NON-NLS-1$
+    enableProxy.setText(CVSSSH2Messages.CVSSSH2PreferencePage_30); //$NON-NLS-1$
     GridData gd=new GridData();
     gd.horizontalSpan=3;
     enableProxy.setLayoutData(gd);
 
     proxyTypeLabel=new Label(group, SWT.NONE);
-    proxyTypeLabel.setText(Policy.bind("CVSSSH2PreferencePage.31")); //$NON-NLS-1$
+    proxyTypeLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_31); //$NON-NLS-1$
     proxyTypeCombo=new Combo(group, SWT.READ_ONLY);
     proxyTypeCombo.setFont(group.getFont());
     gd=new GridData(GridData.FILL_HORIZONTAL);
@@ -270,7 +271,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     proxyTypeCombo.select(0);
 
     proxyHostLabel=new Label(group, SWT.NONE);
-    proxyHostLabel.setText(Policy.bind("CVSSSH2PreferencePage.32")); //$NON-NLS-1$
+    proxyHostLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_32); //$NON-NLS-1$
 
     proxyHostText=new Text(group, SWT.SINGLE | SWT.BORDER);
     proxyHostText.setFont(group.getFont());
@@ -279,7 +280,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     proxyHostText.setLayoutData(gd);
 
     proxyPortLabel=new Label(group, SWT.NONE);
-    proxyPortLabel.setText(Policy.bind("CVSSSH2PreferencePage.33")); //$NON-NLS-1$
+    proxyPortLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_33); //$NON-NLS-1$
 
     proxyPortText=new Text(group, SWT.SINGLE | SWT.BORDER);
     proxyPortText.setFont(group.getFont());
@@ -299,13 +300,13 @@ public class CVSSSH2PreferencePage extends PreferencePage
     createSpacer(group, 3);
 
     enableAuth=new Button(group, SWT.CHECK);
-    enableAuth.setText(Policy.bind("CVSSSH2PreferencePage.34")); //$NON-NLS-1$
+    enableAuth.setText(CVSSSH2Messages.CVSSSH2PreferencePage_34); //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=3;
     enableAuth.setLayoutData(gd);
 
     proxyUserLabel=new Label(group, SWT.NONE);
-    proxyUserLabel.setText(Policy.bind("CVSSSH2PreferencePage.35")); //$NON-NLS-1$
+    proxyUserLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_35); //$NON-NLS-1$
 
     proxyUserText=new Text(group, SWT.SINGLE | SWT.BORDER);
     proxyUserText.setFont(group.getFont());
@@ -314,7 +315,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     proxyUserText.setLayoutData(gd);
 
     proxyPassLabel=new Label(group, SWT.NONE);
-    proxyPassLabel.setText(Policy.bind("CVSSSH2PreferencePage.36")); //$NON-NLS-1$
+    proxyPassLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_36); //$NON-NLS-1$
 
     proxyPassText=new Text(group, SWT.SINGLE | SWT.BORDER);
     proxyPassText.setFont(group.getFont());
@@ -352,25 +353,25 @@ public class CVSSSH2PreferencePage extends PreferencePage
     group.setLayoutData(gd);
 
     keyGenerateDSA=new Button(group, SWT.NULL);
-    keyGenerateDSA.setText(Policy.bind("CVSSSH2PreferencePage.131")); //$NON-NLS-1$
+    keyGenerateDSA.setText(CVSSSH2Messages.CVSSSH2PreferencePage_131); //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=1;
     keyGenerateDSA.setLayoutData(gd);
 
     keyGenerateRSA=new Button(group, SWT.NULL);
-    keyGenerateRSA.setText(Policy.bind("CVSSSH2PreferencePage.132")); //$NON-NLS-1$
+    keyGenerateRSA.setText(CVSSSH2Messages.CVSSSH2PreferencePage_132); //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=1;
     keyGenerateRSA.setLayoutData(gd);
 
     keyLoad=new Button(group, SWT.NULL);
-    keyLoad.setText(Policy.bind("CVSSSH2PreferencePage.128"));  //$NON-NLS-1$
+    keyLoad.setText(CVSSSH2Messages.CVSSSH2PreferencePage_128);  //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=1;
     keyLoad.setLayoutData(gd);
 
     publicKeylabel=new Label(group, SWT.NONE);
-    publicKeylabel.setText(Policy.bind("CVSSSH2PreferencePage.39")); //$NON-NLS-1$
+    publicKeylabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_39); //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=columnSpan;
     publicKeylabel.setLayoutData(gd);
@@ -387,7 +388,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     publicKeyText.setLayoutData(gd);
     
     keyFingerPrintLabel=new Label(group, SWT.NONE);
-    keyFingerPrintLabel.setText(Policy.bind("CVSSSH2PreferencePage.41")); //$NON-NLS-1$
+    keyFingerPrintLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_41); //$NON-NLS-1$
     keyFingerPrintText=new Text(group, SWT.SINGLE | SWT.BORDER);
     keyFingerPrintText.setFont(group.getFont());
     keyFingerPrintText.setEditable(false);
@@ -396,7 +397,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     keyFingerPrintText.setLayoutData(gd);
 
     keyCommentLabel=new Label(group, SWT.NONE);
-    keyCommentLabel.setText(Policy.bind("CVSSSH2PreferencePage.42")); //$NON-NLS-1$
+    keyCommentLabel.setText(CVSSSH2Messages.CVSSSH2PreferencePage_42); //$NON-NLS-1$
     keyCommentText=new Text(group, SWT.SINGLE | SWT.BORDER);
     keyCommentText.setFont(group.getFont());
     gd=new GridData(GridData.FILL_HORIZONTAL);
@@ -416,7 +417,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     }});
 
     keyPassphrase1Label=new Label(group, SWT.NONE);
-    keyPassphrase1Label.setText(Policy.bind("CVSSSH2PreferencePage.43")); //$NON-NLS-1$
+    keyPassphrase1Label.setText(CVSSSH2Messages.CVSSSH2PreferencePage_43); //$NON-NLS-1$
     keyPassphrase1Text=new Text(group, SWT.SINGLE | SWT.BORDER);
     keyPassphrase1Text.setFont(group.getFont());
     keyPassphrase1Text.setEchoChar('*');
@@ -425,7 +426,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     keyPassphrase1Text.setLayoutData(gd);
 
     keyPassphrase2Label=new Label(group, SWT.NONE);
-    keyPassphrase2Label.setText(Policy.bind("CVSSSH2PreferencePage.44")); //$NON-NLS-1$
+    keyPassphrase2Label.setText(CVSSSH2Messages.CVSSSH2PreferencePage_44); //$NON-NLS-1$
     keyPassphrase2Text=new Text(group, SWT.SINGLE | SWT.BORDER);
     keyPassphrase2Text.setFont(group.getFont());
     keyPassphrase2Text.setEchoChar('*');
@@ -451,7 +452,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     			setErrorMessage(null);
     		}
     		else{
-    			setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    			setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     		}
     	}
     });	
@@ -471,7 +472,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     				setErrorMessage(null);
     			}
     			else{
-    				setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    				setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     			}
     			return;
     		}
@@ -479,7 +480,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     			setErrorMessage(null);
     		}
     		else{
-    			setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    			setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     		}
     	}
     });
@@ -493,7 +494,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     				setErrorMessage(null);
     			}
     			else{
-    				setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    				setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     			}
     			return;
     		}
@@ -501,7 +502,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     			setErrorMessage(null);
     		}
     		else{
-    			setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    			setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     		}   	
     	}
     	public void focusLost(FocusEvent e){
@@ -511,7 +512,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     			setErrorMessage(null);
     		}
     		else{
-    			setErrorMessage(Policy.bind("CVSSSH2PreferencePage.48")); //$NON-NLS-1$
+    			setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_48); //$NON-NLS-1$
     		}
     	}
     });
@@ -525,12 +526,12 @@ public class CVSSSH2PreferencePage extends PreferencePage
     buttons.setLayoutData(gd);
     
     keyExport=new Button(buttons, SWT.NULL);
-    keyExport.setText(Policy.bind("CVSSSH2PreferencePage.105")); //$NON-NLS-1$
+    keyExport.setText(CVSSSH2Messages.CVSSSH2PreferencePage_105); //$NON-NLS-1$
     gd=new GridData(GridData.FILL_BOTH);
     keyExport.setLayoutData(gd);
     
     saveKeyPair=new Button(buttons, SWT.NULL);
-    saveKeyPair.setText(Policy.bind("CVSSSH2PreferencePage.45")); //$NON-NLS-1$
+    saveKeyPair.setText(CVSSSH2Messages.CVSSSH2PreferencePage_45); //$NON-NLS-1$
     gd=new GridData(GridData.FILL_BOTH);
     saveKeyPair.setLayoutData(gd);
     
@@ -592,8 +593,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  }
 	  if(!ok){
  	    MessageDialog.openError(getShell(),
-				    Policy.bind("CVSSSH2PreferencePage.error"),  //$NON-NLS-1$
-				    Policy.bind("CVSSSH2PreferencePage.47"));  //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_error,  //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_47);  //$NON-NLS-1$
 	  }
 	}
       };
@@ -618,7 +619,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	    PassphrasePrompt prompt=null;
 	    while(_kpair.isEncrypted()){
 	      if(prompt==null){
-		prompt=new PassphrasePrompt(Policy.bind("CVSSSH2PreferencePage.126", pkey));   //$NON-NLS-1$
+		prompt=new PassphrasePrompt(NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_126, new String[] { pkey }));   //$NON-NLS-1$
 	      }
 	      Display.getDefault().syncExec(prompt);
 	      String passphrase=prompt.getPassphrase();
@@ -627,8 +628,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	      	break;
 	      }
 	      MessageDialog.openError(getShell(),
-				      Policy.bind("CVSSSH2PreferencePage.error"),  //$NON-NLS-1$
-				      Policy.bind("CVSSSH2PreferencePage.129", pkey));  //$NON-NLS-1$
+				      CVSSSH2Messages.CVSSSH2PreferencePage_error,  //$NON-NLS-1$
+				      NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_129, new String[] { pkey }));  //$NON-NLS-1$
 	    }
 	    if(_kpair.isEncrypted()){
 	      return;
@@ -654,8 +655,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  }
 	  if(!ok){
 	    MessageDialog.openError(getShell(),
-				    Policy.bind("CVSSSH2PreferencePage.error"),  //$NON-NLS-1$
-				    Policy.bind("CVSSSH2PreferencePage.130"));  //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_error,  //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_130);  //$NON-NLS-1$
 	  }
 	}
       });
@@ -667,8 +668,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
           setErrorMessage(null);
 
 	  final String[] target=new String[1];
-	  final String title=Policy.bind("CVSSSH2PreferencePage.106");  //$NON-NLS-1$
-	  final String message=Policy.bind("CVSSSH2PreferencePage.107");  //$NON-NLS-1$
+	  final String title=CVSSSH2Messages.CVSSSH2PreferencePage_106;  //$NON-NLS-1$
+	  final String message=CVSSSH2Messages.CVSSSH2PreferencePage_107;  //$NON-NLS-1$
 	  Display.getDefault().syncExec(new Runnable(){
 	      public void run(){
 		Display display=Display.getCurrent();
@@ -700,7 +701,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  if(user.length()==0 || 
 	     host.length()==0 ||
 	     port==-1){
-	    setErrorMessage(Policy.bind("CVSSSH2PreferencePage.108", target[0])); //$NON-NLS-1$
+	    setErrorMessage(NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_108, new String[] { target[0] })); //$NON-NLS-1$
 	    return;
 	  }
 
@@ -720,7 +721,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  catch(IOException ee){
 	  }
 	  catch(JSchException ee){
-	  	setErrorMessage(Policy.bind("CVSSSH2PreferencePage.111")); //$NON-NLS-1$
+	  	setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_111); //$NON-NLS-1$
 	  }
 	}});
 
@@ -737,8 +738,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  */
 	  if(pass.length()==0){
 	    if(!MessageDialog.openConfirm(getShell(),
-					  Policy.bind("CVSSSH2PreferencePage.confirmation"), //$NON-NLS-1$
-					  Policy.bind("CVSSSH2PreferencePage.49") //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_confirmation, //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_49
 					  )){
 	      return ;
 	    }
@@ -753,13 +754,13 @@ public class CVSSSH2PreferencePage extends PreferencePage
 
 	  if(!_home.exists()){
 	    if(!MessageDialog.openConfirm(getShell(),
-					  Policy.bind("CVSSSH2PreferencePage.confirmation"), //$NON-NLS-1$
-					  Policy.bind("CVSSSH2PreferencePage.50",home) //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_confirmation, //$NON-NLS-1$
+					  NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_50, new String[] { home }) //$NON-NLS-1$
 					  )){
 	      return ;
 	    }
 	    if(!_home.mkdirs()){
-	      setErrorMessage(Policy.bind("CVSSSH2PreferencePage.100")+home); //$NON-NLS-1$
+	      setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_100+home); //$NON-NLS-1$
 	      return;
 	    }
 	  }
@@ -775,8 +776,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
 
 	  if(new File(file).exists()){
 	    if(!MessageDialog.openConfirm(getShell(),
-					  Policy.bind("CVSSSH2PreferencePage.confirmation"), //$NON-NLS-1$ 
-					  Policy.bind("CVSSSH2PreferencePage.53", file) //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_confirmation, //$NON-NLS-1$ 
+					  NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_53, new String[] { file }) //$NON-NLS-1$
 					  )){
 	      return;
 	    }
@@ -793,12 +794,12 @@ public class CVSSSH2PreferencePage extends PreferencePage
 
 	  if(ok){
  	    MessageDialog.openInformation(getShell(),
-					  Policy.bind("CVSSSH2PreferencePage.information"), //$NON-NLS-1$
-					  Policy.bind("CVSSSH2PreferencePage.55")+ //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_information, //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_55+ //$NON-NLS-1$
 					  "\n"+ //$NON-NLS-1$
-					  Policy.bind("CVSSSH2PreferencePage.57")+file+ //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_57+file+ //$NON-NLS-1$
 					  "\n"+ //$NON-NLS-1$
-					  Policy.bind("CVSSSH2PreferencePage.59")+ //$NON-NLS-1$
+					  CVSSSH2Messages.CVSSSH2PreferencePage_59+ //$NON-NLS-1$
 					  file+
 					  ".pub"); //$NON-NLS-1$
 	  }
@@ -844,7 +845,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     group.setLayoutData(gd);
 
     Label label=new Label(group, SWT.NONE);
-    label.setText(Policy.bind("CVSSSH2PreferencePage.139")); //$NON-NLS-1$
+    label.setText(CVSSSH2Messages.CVSSSH2PreferencePage_139); //$NON-NLS-1$
     gd=new GridData();
     gd.horizontalSpan=2;
     label.setLayoutData(gd);
@@ -874,13 +875,13 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	new TableColumn(table, SWT.NULL);
 	new TableColumn(table, SWT.NULL);
 	TableColumn[] columns = table.getColumns();
-	columns[0].setText(Policy.bind("CVSSSH2PreferencePage.134"));  //$NON-NLS-1$
-	columns[1].setText(Policy.bind("CVSSSH2PreferencePage.135"));  //$NON-NLS-1$
-	columns[2].setText(Policy.bind("CVSSSH2PreferencePage.136"));  //$NON-NLS-1$
+	columns[0].setText(CVSSSH2Messages.CVSSSH2PreferencePage_134);  //$NON-NLS-1$
+	columns[1].setText(CVSSSH2Messages.CVSSSH2PreferencePage_135);  //$NON-NLS-1$
+	columns[2].setText(CVSSSH2Messages.CVSSSH2PreferencePage_136);  //$NON-NLS-1$
 	viewer.setColumnProperties(new String[] {
-				Policy.bind("CVSSSH2PreferencePage.134"),  //$NON-NLS-1$ 
-				Policy.bind("CVSSSH2PreferencePage.135"),  //$NON-NLS-1$ 
-				Policy.bind("CVSSSH2PreferencePage.136")}); //$NON-NLS-1$
+				CVSSSH2Messages.CVSSSH2PreferencePage_134,  //$NON-NLS-1$ 
+				CVSSSH2Messages.CVSSSH2PreferencePage_135,  //$NON-NLS-1$ 
+				CVSSSH2Messages.CVSSSH2PreferencePage_136}); //$NON-NLS-1$
 	viewer.setLabelProvider(new TableLabelProvider());
 	viewer.setContentProvider(new IStructuredContentProvider() {
 		public void dispose() {
@@ -906,7 +907,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	buttons.setLayout(layout);
 
 	addHostKeyButton = new Button(buttons, SWT.PUSH);
-	addHostKeyButton.setText(Policy.bind("CVSSSH2PreferencePage.137"));  //$NON-NLS-1$
+	addHostKeyButton.setText(CVSSSH2Messages.CVSSSH2PreferencePage_137);  //$NON-NLS-1$
 	gd = new GridData();
 	gd.horizontalAlignment = GridData.FILL;
 	addHostKeyButton.setLayoutData(gd);
@@ -917,7 +918,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 		}
 	});
 	removeHostKeyButton = new Button(buttons, SWT.PUSH);
-	removeHostKeyButton.setText(Policy.bind("CVSSSH2PreferencePage.138"));  //$NON-NLS-1$
+	removeHostKeyButton.setText(CVSSSH2Messages.CVSSSH2PreferencePage_138);  //$NON-NLS-1$
 	gd = new GridData();
 	gd.horizontalAlignment = GridData.FILL;
 	removeHostKeyButton.setLayoutData(gd);
@@ -976,7 +977,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
       IProgressMonitor pm=new org.eclipse.core.runtime.NullProgressMonitor();
       Session session=JSchSession.getSession(null, user, "", host, port, pm).getSession(); //$NON-NLS-1$
       if(session.getServerVersion().indexOf("OpenSSH")==-1){ //$NON-NLS-1$
-      	setErrorMessage(Policy.bind("CVSSSH2PreferencePage.110")); //$NON-NLS-1$
+      	setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_110); //$NON-NLS-1$
     	return;
       }
       Channel channel=session.openChannel("sftp"); //$NON-NLS-1$
@@ -1015,8 +1016,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
       }
 
       MessageDialog.openInformation(getShell(),
-				    Policy.bind("CVSSSH2PreferencePage.information"),  //$NON-NLS-1$
-				    Policy.bind("CVSSSH2PreferencePage.109")+ //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_information,  //$NON-NLS-1$
+				    CVSSSH2Messages.CVSSSH2PreferencePage_109+ //$NON-NLS-1$
 				    (user+"@"+host+(port==22 ? "" : ":"+port)+":~/.ssh/authorized_keys")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
       c.disconnect();
@@ -1105,11 +1106,11 @@ public class CVSSSH2PreferencePage extends PreferencePage
 			String home = ssh2HomeText.getText();
 			File _home = new File(home);
 			if (!_home.exists()) {
-				if (MessageDialog.openQuestion(getShell(), Policy.bind("CVSSSH2PreferencePage.question"), //$NON-NLS-1$
-						Policy.bind("CVSSSH2PreferencePage.99", home) //$NON-NLS-1$
+				if (MessageDialog.openQuestion(getShell(), CVSSSH2Messages.CVSSSH2PreferencePage_question, //$NON-NLS-1$
+						NLS.bind(CVSSSH2Messages.CVSSSH2PreferencePage_99, new String[] { home }) //$NON-NLS-1$
 						)) {
 					if (!(_home.mkdirs())) {
-						setErrorMessage(Policy.bind("CVSSSH2PreferencePage.100") + home); //$NON-NLS-1$
+						setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_100 + home); //$NON-NLS-1$
 						return false;
 					}
 				}
@@ -1153,7 +1154,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 //  		return false;
   	}
   	if((i < 0) || (i > 65535)){
-  		setErrorMessage(Policy.bind("CVSSSH2PreferencePage.104")); //$NON-NLS-1$
+  		setErrorMessage(CVSSSH2Messages.CVSSSH2PreferencePage_104); //$NON-NLS-1$
   		return false;
   	}
   	return true;
@@ -1233,7 +1234,7 @@ class ExportDialog extends Dialog {
   }
 
   protected void createTargetFields(Composite parent) {
-    new Label(parent, SWT.NONE).setText(Policy.bind("CVSSSH2PreferencePage.125")); //$NON-NLS-1$
+    new Label(parent, SWT.NONE).setText(CVSSSH2Messages.CVSSSH2PreferencePage_125); //$NON-NLS-1$
 		
     field=new Text(parent, SWT.BORDER);
     GridData data=new GridData(GridData.FILL_HORIZONTAL);
@@ -1321,7 +1322,7 @@ class PassphraseDialog extends Dialog {
   }
 
   protected void createPassphraseFields(Composite parent) {
-    new Label(parent, SWT.NONE).setText(Policy.bind("CVSSSH2PreferencePage.127")); //$NON-NLS-1$
+    new Label(parent, SWT.NONE).setText(CVSSSH2Messages.CVSSSH2PreferencePage_127); //$NON-NLS-1$
     passphraseField=new Text(parent, SWT.BORDER);
     GridData data=new GridData(GridData.FILL_HORIZONTAL);
     data.widthHint=convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
index 324a79e3c..9b9952e27 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
@@ -15,6 +15,7 @@ import java.net.NoRouteToHostException;
 import java.net.UnknownHostException;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.core.IServerConnection;
 import org.eclipse.team.internal.ccvs.core.connection.CVSAuthenticationException;
@@ -87,7 +88,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
 			ssh1.open(monitor);
 			return;
 		}
-		monitor.subTask(Policy.bind("CVSSSH2ServerConnection.open", location.getHost())); //$NON-NLS-1$
+		monitor.subTask(NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_open, new String[] { location.getHost() })); //$NON-NLS-1$
 		monitor.worked(1);
 		internalOpen(monitor);
 	}
@@ -155,7 +156,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
 			    String message = e.getMessage();
 			    if (JSchSession.isAuthenticationFailure(e)) {
                     // Do not retry as the Jsh library has it's own retry logic
-                    throw new CVSAuthenticationException(Policy.bind("CVSSSH2ServerConnection.0"), CVSAuthenticationException.NO_RETRY, e); //$NON-NLS-1$
+                    throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_0, CVSAuthenticationException.NO_RETRY, e); //$NON-NLS-1$
 			    } else if (message.startsWith("Session.connect: ")) { //$NON-NLS-1$
 			        // Jsh has messages formatted like "Session.connect: java.net.NoRouteToHostException: ..."
 			        // Strip of the exception and try to convert it to a more meaningfull string
@@ -165,7 +166,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
 				        if (end != -1) {
 				            String exception = message.substring(start, end).trim();
 				            if (exception.indexOf("NoRouteToHostException") != -1) { //$NON-NLS-1$
-				                message = Policy.bind("CVSSSH2ServerConnection.1", location.getHost()); //$NON-NLS-1$
+				                message = NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_1, new String[] { location.getHost() }); //$NON-NLS-1$
 				                throw new NoRouteToHostException(message);
 				            } else if (exception.indexOf("java.net.UnknownHostException") != -1) { //$NON-NLS-1$
 				                throw new UnknownHostException(location.getHost());
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
index 73e4ad78e..ad26bdd36 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
@@ -209,7 +209,7 @@ class JSchSession {
 			int prompt = authenticator.prompt(
 					location, 
 					IUserAuthenticator.QUESTION, 
-					Policy.bind("JSchSession.5"),  //$NON-NLS-1$
+					CVSSSH2Messages.JSchSession_5,  //$NON-NLS-1$
 					str, 
 					new int[] {IUserAuthenticator.YES_ID, IUserAuthenticator.NO_ID}, 
 					0 //yes the default
@@ -273,7 +273,7 @@ class JSchSession {
     			authenticator.prompt(
     					location,
     					IUserAuthenticator.INFORMATION,
-    					Policy.bind("JSchSession.5"), //$NON-NLS-1$
+    					CVSSSH2Messages.JSchSession_5, //$NON-NLS-1$
     					message,
     					new int[] {IUserAuthenticator.OK_ID},
     					IUserAuthenticator.OK_ID
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
index 6ac08bb3a..39283545c 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
@@ -109,7 +109,7 @@ public class PServerSSH2ServerConnection implements IServerConnection {
 			} catch (JSchException ee) {
 				  retry--;
 				  if(retry<0){
-				    throw new CVSAuthenticationException(Policy.bind("CVSSSH2ServerConnection.3"), CVSAuthenticationException.NO_RETRY); //$NON-NLS-1$
+				    throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_3, CVSAuthenticationException.NO_RETRY); //$NON-NLS-1$
 				  }
 				  if(session.isConnected()){
 				    session.disconnect();
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
deleted file mode 100644
index e2e1f1993..000000000
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ccvs.ssh2;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-public class Policy {
-	private static ResourceBundle bundle = null;
-	private static final String bundleName = "org.eclipse.team.internal.ccvs.ssh2.messages"; //$NON-NLS-1$
-
-	/*
-	 * Returns a resource bundle, creating one if it none is available. 
-	 */
-	private static ResourceBundle getResourceBundle() {
-		// thread safety
-		ResourceBundle tmpBundle = bundle;
-		if (tmpBundle != null)
-			return tmpBundle;
-		// always create a new classloader to be passed in 
-		// in order to prevent ResourceBundle caching
-		return bundle = ResourceBundle.getBundle(bundleName);
-	}
-	
-	/**
-	 * Gets a string from the resource bundle. We don't want to crash because of a missing String.
-	 * Returns the key if not found.
-	 */
-	public static String bind(String key) {
-		try {
-			return getResourceBundle().getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!"; //$NON-NLS-1$  //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * Lookup the message with the given ID in this catalog and bind its
-	 * substitution locations with the given string.
-	 */
-	public static String bind(String id, String binding) {
-		return bind(id, new String[] { binding });
-	}
-		
-	/**
-	 * Gets a string from the resource bundle and binds it with the given arguments. If the key is 
-	 * not found, return the key.
-	 */
-	public static String bind(String key, Object[] args) {
-		try {
-			return MessageFormat.format(bind(key), args);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!";  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-	}
-
-	public static void checkCanceled(IProgressMonitor monitor) {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties
index 82768025c..a26d30189 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties
@@ -4,102 +4,102 @@
 # 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
-# 
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-JSchSession.5=SSH2 Client
-CVSSSH2ServerConnection.open=Connecting via SSH to {0}...
-CVSSSH2PreferencePage.18=Configuration options for SSH2:
-CVSSSH2PreferencePage.19=&General
-CVSSSH2PreferencePage.20=&Proxy
-CVSSSH2PreferencePage.21=&Key Management
-CVSSSH2PreferencePage.22=&Enable SSH protocol version 2 support (temporary until version 2 fully tested)
-CVSSSH2PreferencePage.23=SSH2 &Home:
-CVSSSH2PreferencePage.24=&Browse...
-CVSSSH2PreferencePage.25=P&rivate key:
-CVSSSH2PreferencePage.26=Add Pr&ivate Key...
-CVSSSH2PreferencePage.27=SSH Home:
-CVSSSH2PreferencePage.30=&Enable proxy connection
-CVSSSH2PreferencePage.31=Proxy &type:
-CVSSSH2PreferencePage.32=Proxy host add&ress:
-CVSSSH2PreferencePage.33=Proxy host p&ort:
-CVSSSH2PreferencePage.34=E&nable proxy authentication
-CVSSSH2PreferencePage.35=Proxy &user name:
-CVSSSH2PreferencePage.36=Proxy pa&ssword:
-CVSSSH2PreferencePage.37=Key &type:
-CVSSSH2PreferencePage.38=G&enerate
-CVSSSH2PreferencePage.39=&You can paste this public key into the remote authorized_keys file:
-CVSSSH2PreferencePage.41=&Fingerprint:
-CVSSSH2PreferencePage.42=&Comment:
-CVSSSH2PreferencePage.43=Passp&hrase:
-CVSSSH2PreferencePage.44=C&onfirm passphrase:
-CVSSSH2PreferencePage.45=&Save Private Key...
-CVSSSH2PreferencePage.47=The key was not generated.
-CVSSSH2PreferencePage.48=The passphrases entered do not match.
-CVSSSH2PreferencePage.49=Are you sure you want to save this private key without passphrase protection?
-CVSSSH2PreferencePage.50={0} does not exsit.\nAre you sure you want to create it?
-CVSSSH2PreferencePage.53={0} has already existed.\nAre you sure you want to over write it?
-CVSSSH2PreferencePage.55=Successfully saved.
-CVSSSH2PreferencePage.57=Private key: 
-CVSSSH2PreferencePage.59=Public key: 
-CVSSSH2PreferencePage.66=Proxy settings
-CVSSSH2PreferencePage.67=Enable proxy connection
-CVSSSH2PreferencePage.68=Proxy type
-CVSSSH2PreferencePage.69=Proxy host address
-CVSSSH2PreferencePage.70=Proxy host port
-CVSSSH2PreferencePage.71=Enable proxy authentication
-CVSSSH2PreferencePage.72=Proxy user name
-CVSSSH2PreferencePage.73=Proxy password
-CVSSSH2PreferencePage.74=Key Management
-CVSSSH2PreferencePage.75=Key type
-CVSSSH2PreferencePage.76=Generate
-CVSSSH2PreferencePage.77=&You can paste this public key into the remote authorized_keys file:
-CVSSSH2PreferencePage.79=&Fingerprint
-CVSSSH2PreferencePage.80=Comment
-CVSSSH2PreferencePage.81=Passphrase
-CVSSSH2PreferencePage.82=Confirm passphrase
-CVSSSH2PreferencePage.83=Save
-CVSSSH2PreferencePage.86=The passphrases entered do not match.
-CVSSSH2PreferencePage.87=Are you sure you want to save this private key without the passphrase protection?
-CVSSSH2PreferencePage.93=Successfully saved.
-CVSSSH2PreferencePage.95=Private key: 
-CVSSSH2PreferencePage.97=Public key: 
-CVSSSH2PreferencePage.99={0} does not exist.\nAre you sure you want to create it?
-CVSSSH2PreferencePage.100=Failed to create 
-CVSSSH2PreferencePage.101={0} does not exist.\nAre you sure you want to create it?
-CVSSSH2PreferencePage.102=Failed to create 
-CVSSSH2PreferencePage.103=Proxy host port is not a number.
-CVSSSH2PreferencePage.104=Proxy host port must be a number between 0 and 65535.
-CVSSSH2PreferencePage.105=E&xport via sftp...
-CVSSSH2PreferencePage.106=Export ssh key to remote server via sftp.
-CVSSSH2PreferencePage.107=Specify a target site(in user@host[:port] format) where your public key should be installed.\nYour key will be stored in user@host[:port]:~/.ssh/authorized_keys
-CVSSSH2PreferencePage.108={0} is not valid site.
-CVSSSH2PreferencePage.109=Your public key has been successfully installed to 
-CVSSSH2PreferencePage.110=Remote sshd is not from OpenSSH.
-CVSSSH2PreferencePage.111=Failed to export ssh key to remote server.
-CVSSSH2ServerConnection.3=session is down
-CVSSSH2ServerConnection.0=An undetermined authentication failure has occurred
-CVSSSH2ServerConnection.1=No route to host {0} could be found
-CVSSSH2PreferencePage.info=Information
-CVSSSH2PreferencePage.warning=Warning
-CVSSSH2PreferencePage.information=Information
-CVSSSH2PreferencePage.error=Error
-CVSSSH2PreferencePage.confirmation=Confirmation
-CVSSSH2PreferencePage.question=Question
-CVSSSH2PreferencePage.125=Target site:
-CVSSSH2PreferencePage.126=Enter passphrase for {0} 
-CVSSSH2PreferencePage.127=Passphrase:
-CVSSSH2PreferencePage.128=&Load existing key...
-CVSSSH2PreferencePage.129=failed to decrypt {0} 
-CVSSSH2PreferencePage.130=failed to load given file. 
-CVSSSH2PreferencePage.131=G&enerate DSA key...
-CVSSSH2PreferencePage.132=Ge&nerate RSA key...
-CVSSSH2PreferencePage.133=Kno&wnHosts
-CVSSSH2PreferencePage.134=Hostname
-CVSSSH2PreferencePage.135=Type
-CVSSSH2PreferencePage.136=Fingerprint
-CVSSSH2PreferencePage.137=Add...
-CVSSSH2PreferencePage.138=Remove
-CVSSSH2PreferencePage.139=Host Keys included in known_hosts.
-Util.timeout=A timeout occurred connecting to host {0}
+JSchSession_5=SSH2 Client
+CVSSSH2ServerConnection_open=Connecting via SSH to {0}...
+CVSSSH2PreferencePage_18=Configuration options for SSH2:
+CVSSSH2PreferencePage_19=&General
+CVSSSH2PreferencePage_20=&Proxy
+CVSSSH2PreferencePage_21=&Key Management
+CVSSSH2PreferencePage_22=&Enable SSH protocol version 2 support (temporary until version 2 fully tested)
+CVSSSH2PreferencePage_23=SSH2 &Home:
+CVSSSH2PreferencePage_24=&Browse...
+CVSSSH2PreferencePage_25=P&rivate key:
+CVSSSH2PreferencePage_26=Add Pr&ivate Key...
+CVSSSH2PreferencePage_27=SSH Home:
+CVSSSH2PreferencePage_30=&Enable proxy connection
+CVSSSH2PreferencePage_31=Proxy &type:
+CVSSSH2PreferencePage_32=Proxy host add&ress:
+CVSSSH2PreferencePage_33=Proxy host p&ort:
+CVSSSH2PreferencePage_34=E&nable proxy authentication
+CVSSSH2PreferencePage_35=Proxy &user name:
+CVSSSH2PreferencePage_36=Proxy pa&ssword:
+CVSSSH2PreferencePage_37=Key &type:
+CVSSSH2PreferencePage_38=G&enerate
+CVSSSH2PreferencePage_39=&You can paste this public key into the remote authorized_keys file:
+CVSSSH2PreferencePage_41=&Fingerprint:
+CVSSSH2PreferencePage_42=&Comment:
+CVSSSH2PreferencePage_43=Passp&hrase:
+CVSSSH2PreferencePage_44=C&onfirm passphrase:
+CVSSSH2PreferencePage_45=&Save Private Key...
+CVSSSH2PreferencePage_47=The key was not generated.
+CVSSSH2PreferencePage_48=The passphrases entered do not match.
+CVSSSH2PreferencePage_49=Are you sure you want to save this private key without passphrase protection?
+CVSSSH2PreferencePage_50={0} does not exsit.\nAre you sure you want to create it?
+CVSSSH2PreferencePage_53={0} has already existed.\nAre you sure you want to over write it?
+CVSSSH2PreferencePage_55=Successfully saved.
+CVSSSH2PreferencePage_57=Private key:
+CVSSSH2PreferencePage_59=Public key:
+CVSSSH2PreferencePage_66=Proxy settings
+CVSSSH2PreferencePage_67=Enable proxy connection
+CVSSSH2PreferencePage_68=Proxy type
+CVSSSH2PreferencePage_69=Proxy host address
+CVSSSH2PreferencePage_70=Proxy host port
+CVSSSH2PreferencePage_71=Enable proxy authentication
+CVSSSH2PreferencePage_72=Proxy user name
+CVSSSH2PreferencePage_73=Proxy password
+CVSSSH2PreferencePage_74=Key Management
+CVSSSH2PreferencePage_75=Key type
+CVSSSH2PreferencePage_76=Generate
+CVSSSH2PreferencePage_77=&You can paste this public key into the remote authorized_keys file:
+CVSSSH2PreferencePage_79=&Fingerprint
+CVSSSH2PreferencePage_80=Comment
+CVSSSH2PreferencePage_81=Passphrase
+CVSSSH2PreferencePage_82=Confirm passphrase
+CVSSSH2PreferencePage_83=Save
+CVSSSH2PreferencePage_86=The passphrases entered do not match.
+CVSSSH2PreferencePage_87=Are you sure you want to save this private key without the passphrase protection?
+CVSSSH2PreferencePage_93=Successfully saved.
+CVSSSH2PreferencePage_95=Private key:
+CVSSSH2PreferencePage_97=Public key:
+CVSSSH2PreferencePage_99={0} does not exist.\nAre you sure you want to create it?
+CVSSSH2PreferencePage_100=Failed to create
+CVSSSH2PreferencePage_101={0} does not exist.\nAre you sure you want to create it?
+CVSSSH2PreferencePage_102=Failed to create
+CVSSSH2PreferencePage_103=Proxy host port is not a number.
+CVSSSH2PreferencePage_104=Proxy host port must be a number between 0 and 65535.
+CVSSSH2PreferencePage_105=E&xport via sftp...
+CVSSSH2PreferencePage_106=Export ssh key to remote server via sftp.
+CVSSSH2PreferencePage_107=Specify a target site(in user@host[:port] format) where your public key should be installed.\nYour key will be stored in user@host[:port]:~/.ssh/authorized_keys
+CVSSSH2PreferencePage_108={0} is not valid site.
+CVSSSH2PreferencePage_109=Your public key has been successfully installed to
+CVSSSH2PreferencePage_110=Remote sshd is not from OpenSSH.
+CVSSSH2PreferencePage_111=Failed to export ssh key to remote server.
+CVSSSH2ServerConnection_3=session is down
+CVSSSH2ServerConnection_0=An undetermined authentication failure has occurred
+CVSSSH2ServerConnection_1=No route to host {0} could be found
+CVSSSH2PreferencePage_info=Information
+CVSSSH2PreferencePage_warning=Warning
+CVSSSH2PreferencePage_information=Information
+CVSSSH2PreferencePage_error=Error
+CVSSSH2PreferencePage_confirmation=Confirmation
+CVSSSH2PreferencePage_question=Question
+CVSSSH2PreferencePage_125=Target site:
+CVSSSH2PreferencePage_126=Enter passphrase for {0}
+CVSSSH2PreferencePage_127=Passphrase:
+CVSSSH2PreferencePage_128=&Load existing key...
+CVSSSH2PreferencePage_129=failed to decrypt {0}
+CVSSSH2PreferencePage_130=failed to load given file.
+CVSSSH2PreferencePage_131=G&enerate DSA key...
+CVSSSH2PreferencePage_132=Ge&nerate RSA key...
+CVSSSH2PreferencePage_133=Kno&wnHosts
+CVSSSH2PreferencePage_134=Hostname
+CVSSSH2PreferencePage_135=Type
+CVSSSH2PreferencePage_136=Fingerprint
+CVSSSH2PreferencePage_137=Add...
+CVSSSH2PreferencePage_138=Remove
+CVSSSH2PreferencePage_139=Host Keys included in known_hosts.
+Util_timeout=A timeout occurred connecting to host {0}