Messages should be parameterized.

2 files changed, 15 insertions, 20 deletions

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 3dae9b43c..0dcd320dc 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
@@ -617,17 +617,17 @@ 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(Policy.bind("CVSSSH2PreferencePage.126", pkey));   //$NON-NLS-1$
 	      }
 	      Display.getDefault().syncExec(prompt);
 	      String passphrase=prompt.getPassphrase();
 	      if(passphrase==null) break;
 	      if(_kpair.decrypt(passphrase)){
-		break;
+	      	break;
 	      }
 	      MessageDialog.openError(getShell(),
 				      Policy.bind("CVSSSH2PreferencePage.error"),  //$NON-NLS-1$
-				      Policy.bind("CVSSSH2PreferencePage.129")+pkey);  //$NON-NLS-1$
+				      Policy.bind("CVSSSH2PreferencePage.129", pkey));  //$NON-NLS-1$
 	    }
 	    if(_kpair.isEncrypted()){
 	      return;
@@ -699,7 +699,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  if(user.length()==0 || 
 	     host.length()==0 ||
 	     port==-1){
-	    setErrorMessage(target[0]+Policy.bind("CVSSSH2PreferencePage.108")); //$NON-NLS-1$
+	    setErrorMessage(Policy.bind("CVSSSH2PreferencePage.108", target[0])); //$NON-NLS-1$
 	    return;
 	  }
 
@@ -753,7 +753,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  if(!_home.exists()){
 	    if(!MessageDialog.openConfirm(getShell(),
 					  Policy.bind("CVSSSH2PreferencePage.confirmation"), //$NON-NLS-1$
-					  home+Policy.bind("CVSSSH2PreferencePage.50") //$NON-NLS-1$
+					  Policy.bind("CVSSSH2PreferencePage.50",home) //$NON-NLS-1$
 					  )){
 	      return ;
 	    }
@@ -775,7 +775,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
 	  if(new File(file).exists()){
 	    if(!MessageDialog.openConfirm(getShell(),
 					  Policy.bind("CVSSSH2PreferencePage.confirmation"), //$NON-NLS-1$ 
-					  file+Policy.bind("CVSSSH2PreferencePage.53") //$NON-NLS-1$
+					  Policy.bind("CVSSSH2PreferencePage.53", file) //$NON-NLS-1$
 					  )){
 	      return;
 	    }
@@ -978,7 +978,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
       if(!_home.exists()){
 	if(MessageDialog.openQuestion(getShell(),
 				      Policy.bind("CVSSSH2PreferencePage.question"), //$NON-NLS-1$
-				      home+Policy.bind("CVSSSH2PreferencePage.99") //$NON-NLS-1$
+				      Policy.bind("CVSSSH2PreferencePage.99", home) //$NON-NLS-1$
 				      )){
 	  if(!(_home.mkdirs())){
 	    setErrorMessage(Policy.bind("CVSSSH2PreferencePage.100")+home); //$NON-NLS-1$
@@ -1036,7 +1036,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
     if(!_home.exists()){
       if(MessageDialog.openQuestion(getShell(),
 				    Policy.bind("CVSSSH2PreferencePage.question"), //$NON-NLS-1$
-				    home+Policy.bind("CVSSSH2PreferencePage.101") //$NON-NLS-1$
+				    Policy.bind("CVSSSH2PreferencePage.101", home) //$NON-NLS-1$
 				      )){
 	if(!(_home.mkdirs())){
 	  setErrorMessage(Policy.bind("CVSSSH2PreferencePage.102")+home); //$NON-NLS-1$
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 65c16f2df..d01da9292 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
@@ -1,6 +1,5 @@
 JSchSession.5=SSH2 Client
 CVSSSH2ServerConnection.open=Connecting via SSH to {0}...
-CVSSSH2PreferencePage.0=CVSSSH2PreferencePage.PROXY
 CVSSSH2PreferencePage.18=Configuration options for SSH2:
 CVSSSH2PreferencePage.19=&General
 CVSSSH2PreferencePage.20=&Proxy
@@ -29,8 +28,8 @@ 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=\ does not exsit.\nAre you sure you want to create it?
-CVSSSH2PreferencePage.53=\ has already existed.\nAre you sure you want to over write it?
+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: 
@@ -51,24 +50,21 @@ CVSSSH2PreferencePage.80=Comment
 CVSSSH2PreferencePage.81=Passphrase
 CVSSSH2PreferencePage.82=Confirm passphrase
 CVSSSH2PreferencePage.83=Save
-CVSSSH2PreferencePage.85=\ 1024bits key is successfully generated.
 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.88=\ does not exist.\nAre you sure you want to create it?
-CVSSSH2PreferencePage.91=\ has already existed.\nAre you sure you want to overwrite it?
 CVSSSH2PreferencePage.93=Successfully saved.
 CVSSSH2PreferencePage.95=Private key: 
 CVSSSH2PreferencePage.97=Public key: 
-CVSSSH2PreferencePage.99=\ does not exist.\nAre you sure you want to create it?
+CVSSSH2PreferencePage.99={0} does not exist.\nAre you sure you want to create it?
 CVSSSH2PreferencePage.100=Failed to create 
-CVSSSH2PreferencePage.101=\ does not exist.\nAre you sure you want to create it?
+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=\ is not valid site.
+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.
@@ -80,12 +76,11 @@ CVSSSH2PreferencePage.error=Error
 CVSSSH2PreferencePage.confirmation=Confirmation
 CVSSSH2PreferencePage.question=Question
 CVSSSH2PreferencePage.125=Target site:
-CVSSSH2PreferencePage.126=Enter passphrase for\ 
+CVSSSH2PreferencePage.126=Enter passphrase for {0} 
 CVSSSH2PreferencePage.127=Passphrase:
 CVSSSH2PreferencePage.128=&Load existing key...
-CVSSSH2PreferencePage.129=failed to decrypt\ 
+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...
-
 Util.timeout=A timeout occurred connecting to host {0}