aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2009-06-05 18:29:45 +0000
committerKenny Root <kenny@the-b.org>2009-06-05 18:29:45 +0000
commit8f5688cbd6c59bd642d67b3218b43a0de1cf6ee4 (patch)
tree3cb3a16fe00ac9e45e1d05f3b6898a2f9b3564aa /src
parent63663ba73f96dd9f23e3268c6236e55a62285eb5 (diff)
downloadconnectbot-8f5688cbd6c59bd642d67b3218b43a0de1cf6ee4.tar.gz
connectbot-8f5688cbd6c59bd642d67b3218b43a0de1cf6ee4.tar.bz2
connectbot-8f5688cbd6c59bd642d67b3218b43a0de1cf6ee4.zip
Externalize some strings to match the transports branch
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@271 df292f66-193f-0410-a5fc-6d59da041ff2
Diffstat (limited to 'src')
-rw-r--r--src/org/connectbot/service/TerminalBridge.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index 5123158..82d1ce5 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -525,7 +525,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
Log.d(TAG, "Host does not support 'none' authentication.");
}
- outputLine("Trying to authenticate");
+ outputLine(manager.res.getString(R.string.terminal_auth));
try {
long pubkeyId = host.getPubkeyId();
@@ -539,7 +539,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
if (pubkeyId == HostDatabase.PUBKEYID_ANY) {
// try each of the in-memory keys
- outputLine("Attempting 'publickey' authentication with any in-memory SSH keys");
+ outputLine(manager.res.getString(R.string.terminal_auth_pubkey_any));
for(String nickname : manager.loadedPubkeys.keySet()) {
Object trileadKey = manager.loadedPubkeys.get(nickname);
if(this.tryPublicKey(host.getUsername(), nickname, trileadKey)) {
@@ -548,12 +548,12 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
}
}
} else {
- outputLine("Attempting 'publickey' authentication with a specific public key");
+ outputLine(manager.res.getString(R.string.terminal_auth_pubkey_specific));
// use a specific key for this host, as requested
PubkeyBean pubkey = manager.pubkeydb.findPubkeyById(pubkeyId);
if (pubkey == null)
- outputLine("Selected public key is invalid, try reselecting key in host editor");
+ outputLine(manager.res.getString(R.string.terminal_auth_pubkey_invalid));
else
if (tryPublicKey(pubkey))
finishConnection();
@@ -561,28 +561,28 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
pubkeysExhausted = true;
} else if (connection.isAuthMethodAvailable(host.getUsername(), AUTH_PASSWORD)) {
- outputLine("Attempting 'password' authentication");
+ outputLine(manager.res.getString(R.string.terminal_auth_pass));
String password = promptHelper.requestStringPrompt(null,
manager.res.getString(R.string.prompt_password));
if (password != null
&& connection.authenticateWithPassword(host.getUsername(), password)) {
finishConnection();
} else {
- outputLine("Authentication method 'password' failed");
+ outputLine(manager.res.getString(R.string.terminal_auth_pass_fail));
}
} else if(connection.isAuthMethodAvailable(host.getUsername(), AUTH_KEYBOARDINTERACTIVE)) {
// this auth method will talk with us using InteractiveCallback interface
// it blocks until authentication finishes
- outputLine("Attempting 'keyboard-interactive' authentication");
+ outputLine(manager.res.getString(R.string.terminal_auth_ki));
if(connection.authenticateWithKeyboardInteractive(host.getUsername(), TerminalBridge.this)) {
finishConnection();
} else {
- outputLine("Authentication method 'keyboard-interactive' failed");
+ outputLine(manager.res.getString(R.string.terminal_auth_ki_fail));
}
} else {
- outputLine("[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]");
+ outputLine(manager.res.getString(R.string.terminal_auth_fail));
}
} catch(Exception e) {