Externalized some strings that should be translated.

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@232 df292f66-193f-0410-a5fc-6d59da041ff2

2 files changed, 22 insertions, 14 deletions

diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index 04b0c99..5477dd4 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -31,6 +31,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.spec.InvalidKeySpecException;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -353,10 +354,10 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 
 			case KnownHosts.HOSTKEY_IS_NEW:
 				// prompt user
-				outputLine(String.format("The authenticity of host '%s' can't be established.", hostname));
-				outputLine(String.format("Host %s key fingerprint is %s", algorithmName, fingerprint));
+				outputLine(String.format(manager.res.getString(R.string.host_authenticity_warning), hostname));
+				outputLine(String.format(manager.res.getString(R.string.host_fingerprint), algorithmName, fingerprint));
 
-				result = promptHelper.requestBooleanPrompt("Are you sure you want\nto continue connecting?");
+				result = promptHelper.requestBooleanPrompt(manager.res.getString(R.string.prompt_continue_connecting));
 				if(result == null) return false;
 				if(result.booleanValue()) {
 					// save this key in known database
@@ -365,17 +366,22 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 				return result.booleanValue();
 
 			case KnownHosts.HOSTKEY_HAS_CHANGED:
-				outputLine("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-				outputLine("@	WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!	 @");
-				outputLine("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-				outputLine("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!");
-				outputLine("Someone could be eavesdropping on you right now (man-in-the-middle attack)!");
-				outputLine("It is also possible that the host key has just been changed.");
-				outputLine(String.format("Host %s key fingerprint is %s",
+				String header = String.format("@   %s   @",
+						manager.res.getString(R.string.host_verification_failure_warning_header));
+
+				char[] atsigns = new char[header.length()];
+				Arrays.fill(atsigns, '@');
+				String border = new String(atsigns);
+
+				outputLine(border);
+				outputLine(manager.res.getString(R.string.host_verification_failure_warning));
+				outputLine(border);
+
+				outputLine(String.format(manager.res.getString(R.string.host_fingerprint),
 						algorithmName, fingerprint));
 
 				// Users have no way to delete keys, so we'll prompt them for now.
-				result = promptHelper.requestBooleanPrompt("Are you sure you want\nto continue connecting?");
+				result = promptHelper.requestBooleanPrompt(manager.res.getString(R.string.prompt_continue_connecting));
 				if(result == null) return false;
 				if(result.booleanValue()) {
 					// save this key in known database
@@ -811,7 +817,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 		} else {
 			new Thread(new Runnable() {
 				public void run() {
-					Boolean result = promptHelper.requestBooleanPrompt("Host has disconnected.\nClose session?", true);
+					Boolean result = promptHelper.requestBooleanPrompt(
+							manager.res.getString(R.string.prompt_host_disconnected), true);
 					if (result == null || result.booleanValue()) {
 						awaitingClose = true;
 
diff --git a/src/org/connectbot/util/EntropyView.java b/src/org/connectbot/util/EntropyView.java
index 778a89a..55bebce 100644
--- a/src/org/connectbot/util/EntropyView.java
+++ b/src/org/connectbot/util/EntropyView.java
@@ -80,9 +80,10 @@ public class EntropyView extends View {
 		listeners.remove(listener);
 	}
 
+	@Override
 	public void onDraw(Canvas c) {
-		String prompt = getResources().getString(R.string.pubkey_touch_prompt)
-			+ " " + (int)(100.0 * (mEntropyIdx / 20.0)) + "% done";
+		String prompt = String.format(getResources().getString(R.string.pubkey_touch_prompt),
+			(int)(100.0 * (mEntropyIdx / 20.0)));
 		if (splitText > 0 ||
 				mPaint.measureText(prompt) > (getWidth() * 0.8)) {
 			if (splitText == 0)