Update translations

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

15 files changed, 830 insertions, 241 deletions

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 60367a8..64d02fe 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Редактиране на хост</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Помощ</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Свържи</string>
 	<string name="resolve_entropy">Gather Entropy</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Зареди в паметта</string>
 	<string name="pubkey_memory_unload">Премахни от паметта</string>
 	<string name="pubkey_load_on_start">Зареди ключа при стартиране</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Променете пренасочването на портове</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Use the format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">username</string>
+	<string name="format_username">username</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">hostname</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">None</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Are you sure you want to delete '%1$s'?</string>
 	<string name="delete_pos">Yes, delete</string>
 	<string name="delete_neg">Cancel</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Trying to authenticate</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Password</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Not right now</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1bd7ccf..914d2e4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Rediger vært</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjælp</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Tilslut</string>
 	<string name="resolve_entropy">Indsamler entropi</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Indlæs i hukommelse</string>
 	<string name="pubkey_memory_unload">Fjern fra hukommelse</string>
 	<string name="pubkey_load_on_start">Indlæs nøgle ved start</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tryk "Menu" for at oprette\nport-videresendelser.</string>
 	<string name="portforward_edit">Rediger port-videresendelse</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Adgangskode for nøglen '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">ADVARSEL: FJERNVÆRTENS IDENTIFIKATION ER ÆNDRET!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Brug offentlig nøgleautorisering</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automatik</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Deaktiver denne præference og brug kun portvideresendelser</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Tekstkodning</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Anvend formatet "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">bruger</string>
+	<string name="format_username">bruger</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">værtsnavn</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Ingen</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Er du sikker på at du vil slette '%1$s'?</string>
 	<string name="delete_pos">Ja slet</string>
 	<string name="delete_neg">Afbryd</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">Ingen forbindelser aktive i øjeblikket</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Verifikation af værtsnøgle mislykkedes.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Forsøger at autorisere</string>
 
 	<string name="terminal_auth_pass">Forsøger "adgangskode"-autorisering</string>
-	<string name="terminal_auth_pass_hint">Adgangskode</string>
 	<string name="terminal_auth_pass_fail">Autoriseringsmetoden "adgangskode" mislykkedes</string>
 
 	<string name="terminal_auth_pubkey_any">Forsøger 'publickey'-autorisering med enhver offentlig nøgle i hukommelsen</string>
 	<string name="terminal_auth_pubkey_invalid">Valgte offentlige nøgle er ugyldig, prøv at vælge nøglen igen</string>
 	<string name="terminal_auth_pubkey_specific">Forsøger 'publickey'-autorisering med valgte offentlige nøgle</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Forsøger 'keyboard-interactive' autorisering</string>
 	<string name="terminal_auth_ki_fail">'keyboard-interactive'-autorisering fejlede</string>
 
 	<string name="terminal_auth_fail">[Din vært understøtter ikke 'password' eller 'keyboard-interactive' autorisering.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Fejl! Lokal shell er ikke tilgængelig på denne telefon.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Ikke lige nu</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">rød</string>
 	<string name="color_green">grøn</string>
 	<string name="color_blue">blå</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ae394b7..3af6491 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Host bearbeiten</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Hilfe</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Verbinden</string>
 	<string name="resolve_entropy">Sammle Entropie</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">In Speicher laden.</string>
 	<string name="pubkey_memory_unload">Aus Speicher entfernen.</string>
 	<string name="pubkey_load_on_start">Schlüssel beim Start laden</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">"Menu" tippen, um Port-\nWeiterleitungen zu erzeugen.</string>
 	<string name="portforward_edit">Port-Weiterleitung editieren.</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Passwort für Schlüssel '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNUNG: IDENTIFIKATION DES ENTFERNTEN HOSTS HAT SICH GEÄNDERT!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -170,21 +177,21 @@
 	<string name="pref_bumpyarrows_summary">Vibirieren, wenn Pfeiltasten vom Trackball gesendet werden; nützlich bei laggenden Verbindungen</string>
 
 	<!-- Category title for the Terminal Bell preferences -->
-	<string name="pref_bell_category">Terminal bell</string>
+	<string name="pref_bell_category">Terminalglocke</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">Hörbare Glocke</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">Glockenlautstärke</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
-	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+	<string name="pref_bell_vibrate_title">Bei Glocke vibrieren</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
-	<string name="pref_bell_notification_title">Background notifications</string>
+	<string name="pref_bell_notification_title">Hintergrundnotiz</string>
 	<!-- Brief summary of the feature that is enabled when the checkbox preference for the receive notifications on terminal bell feature is checked -->
-	<string name="pref_bell_notification_summary">Send notification when a terminal running in the background sounds a bell.</string>
+	<string name="pref_bell_notification_summary">Benachrichtigen, wenn ein im Hintergrund laufendendes Terminal eine Glocke erklingen lässt.</string>
 
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
 	<string name="list_keymode_right">Tasten rechts verwenden</string>
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Verwende "pubkey" Authentisierung</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-Login Automatisierung</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Diese Einstellung abwählen, um ausschließlich Port-Weiterleitungen zu verwenden</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -286,13 +301,13 @@
 	<string name="portforward_menu_add">Port-Weiterleitung hinzufügen</string>
 
 	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">user@hostname</string>
+	<string name="hint_userhost">benutzername@hostname</string>
 
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
 	<string name="list_format_error">Verwenden Sie das Format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">benutzername</string>
+	<string name="format_username">benutzername</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">hostname</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Nichts</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Soll '%1$s' wirklich gelöscht werden?</string>
 	<string name="delete_pos">Ja, löschen</string>
 	<string name="delete_neg">Abbrechen</string>
@@ -340,27 +360,43 @@
 
 	<string name="terminal_no_hosts_connected">Zur Zeit keine Hosts verbunden</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Überprüfung des Host-Schlüssels fehlgeschlagen.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Versuche zu authentisieren.</string>
 
 	<string name="terminal_auth_pass">Versuche Authentisierung mit Passwort.</string>
-	<string name="terminal_auth_pass_hint">Passwort</string>
 	<string name="terminal_auth_pass_fail">Authentisierungsmethode 'Passwort' fehlgeschlagen.</string>
 
 	<string name="terminal_auth_pubkey_any">Versuche "Public Key" Authentisierung mit allen öffentlichen Schlüsseln im Speicher</string>
 	<string name="terminal_auth_pubkey_invalid">Der ausgewählte öffentliche Schlüssel ist ungültig, versuchen Sie den Schlüssel im Host-Editor neu auszuwählen</string>
 	<string name="terminal_auth_pubkey_specific">Versuche "Public Key" Authentisierung mit einem bestimmten öffentlichen Schlüssel</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Versuche 'keyboard-interactive' Authentisierung.</string>
 	<string name="terminal_auth_ki_fail">Authentisierungsmethode 'keyboard-interactive' fehlgeschlagen</string>
 
 	<string name="terminal_auth_fail">[Ihr Host unterstützt weder 'password' noch 'keyboard-interactive' Authentisierung.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Fehler! Lokale Kommandozeile ist auf diesem Telefon nicht verfügbar.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
-	<string name="notification_text">%1$s wants your attention.</string>
+	<string name="notification_text">%1$s will ihre Aufmerksamkeit.</string>
 
 	<!-- Dialog title when a new version of ConnectBot is detected. -->
 	<string name="upgrade">Neue Version</string>
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Nicht jetzt</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">rot</string>
 	<string name="color_green">grün</string>
 	<string name="color_blue">blau</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cea3557..719d6e4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Editar Host</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Ayuda</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Conectar</string>
 	<string name="resolve_entropy">Recolectar entropía</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Cargado en memoria</string>
 	<string name="pubkey_memory_unload">Descargar de memoria</string>
 	<string name="pubkey_load_on_start">Cargar clave al inicio</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Use el formato "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">usuario</string>
+	<string name="format_username">usuario</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">equipo</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Ninguno</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">¿Está seguro de que quiere eliminar '%1$s'?</string>
 	<string name="delete_pos">Sí, eliminar</string>
 	<string name="delete_neg">Cancelar</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Intentando autenticar</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Contraseña</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">No en este momento</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6344117..345219a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Ostalaria</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Laguntza</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Connect</string>
 	<string name="resolve_entropy">Gather Entropy</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Load into memory</string>
 	<string name="pubkey_memory_unload">Unload from memory</string>
 	<string name="pubkey_load_on_start">Load key on start</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Use the format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">username</string>
+	<string name="format_username">user</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">hostname</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">None</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Are you sure you want to delete '%1$s'?</string>
 	<string name="delete_pos">Yes, delete</string>
 	<string name="delete_neg">Cancel</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Trying to authenticate</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Password</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Not right now</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9d080c0..8188da4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Modifier le serveur</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Aide</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Connexion</string>
 	<string name="resolve_entropy">Génération d'aléatoire</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Chargée en mémoire</string>
 	<string name="pubkey_memory_unload">Effacée de la mémoire</string>
 	<string name="pubkey_load_on_start">Charger la clé au démarrage</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Appuyez sur "Menu" pour créer\ndes redirections de port.</string>
 	<string name="portforward_edit">Editez la redirection de port</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Mot de passe pour la clé '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">ATTENTION : L'IDENTIFICATION DE L'HOTE DISTANT A CHANGEE !</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -173,28 +180,28 @@
 	<string name="pref_bell_category">Cloche du terminal</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">Alerte sonore</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">Volume de l'alerte</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
-	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+	<string name="pref_bell_vibrate_title">Vibrer en cas d'alerte</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
-	<string name="pref_bell_notification_title">Background notifications</string>
+	<string name="pref_bell_notification_title">Notification en arrière plan</string>
 	<!-- Brief summary of the feature that is enabled when the checkbox preference for the receive notifications on terminal bell feature is checked -->
-	<string name="pref_bell_notification_summary">Send notification when a terminal running in the background sounds a bell.</string>
+	<string name="pref_bell_notification_summary">Envoyer une notification lorsqu'un terminal génère une alerte</string>
 
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
-	<string name="list_keymode_right">Use right-side keys</string>
+	<string name="list_keymode_right">Utiliser les touches du coté droit du clavier</string>
 	<!-- Preference selection to indicate use of left side of keyboard for special shortcuts. -->
-	<string name="list_keymode_left">Use left-side keys</string>
+	<string name="list_keymode_left">Utiliser les touches du coté gauche du clavier</string>
 	<!-- Preference selection to indicate never to use special shortcut keys. -->
 	<string name="list_keymode_none">Désactiver</string>
 
 	<!-- Preference to not use pubkeys to authenticate to this host. -->
-	<string name="list_pubkeyids_none">Do not use keys</string>
+	<string name="list_pubkeyids_none">Ne pas utiliser les clefs de cryptage publiques</string>
 	<!-- Preference to use any pubkey to authenticate to this host. -->
 	<string name="list_pubkeyids_any">Use any unlocked key</string>
 
@@ -206,33 +213,41 @@
 	<string name="list_update_never">Jamais</string>
 
 	<!-- Host nickname field preference title -->
-	<string name="hostpref_nickname_title">Nickname</string>
+	<string name="hostpref_nickname_title">Surnom</string>
 
 	<!-- Host color category preference title -->
-	<string name="hostpref_color_title">Color category</string>
+	<string name="hostpref_color_title">Catégorie de couleur</string>
 
 	<!-- Host pubkey usage preference title -->
-	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
+	<string name="hostpref_pubkeyid_title">Utiliser l'autentification par clef de cryptage publique</string>
+
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
 
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
-	<string name="hostpref_postlogin_summary">Commands to run on remote server once authenticated</string>
+	<string name="hostpref_postlogin_summary">Commandes a éffectuer sur le serveur distant après s'êtres autentifier</string>
 
 	<!-- Host compression preference title -->
 	<string name="hostpref_compression_title">Compression</string>
 	<!-- Summary for compression preference -->
-	<string name="hostpref_compression_summary">This may help with slower networks</string>
+	<string name="hostpref_compression_summary">Cela peut aider pour des reseaux lent</string>
 
 	<!-- Setting for whether we want a session to start up when we connect to a host -->
 	<string name="hostpref_wantsession_title">Start shell session</string>
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
-	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
+	<string name="hostpref_wantsession_summary">Décochez cette préférence pour n'utiliser que le mode "port forwards"</string>
+
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
 
 	<!-- Host character encoding preference title -->
-	<string name="hostpref_encoding_title">Encoding</string>
+	<string name="hostpref_encoding_title">cryptage</string>
 	<!-- Host character encoding preference summary -->
-	<string name="hostpref_encoding_summary">Character encoding for the host</string>
+	<string name="hostpref_encoding_summary">codage de charactère a utiliser pour le serveur</string>
 
 	<!-- Host preference category title for connection settings -->
 	<string name="hostpref_connection_category">Paramètre de connexion</string>
@@ -247,7 +262,7 @@
 	<string name="hostpref_port_title">Port</string>
 
 	<!-- Displayed to indicate a host has never been connected to. -->
-	<string name="bind_never">Never connected</string>
+	<string name="bind_never">jamais connecté</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than an hour. -->
 	<string name="bind_minutes">Il ya %1$s minutes</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than a day. -->
@@ -258,7 +273,7 @@
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d octets copié dans le presse-papier</string>
 	<!-- Instructions for how to copy from the terminal. The \n entries are to split lines to improve readability and prevent wrapping off the screen. -->
-	<string name="console_copy_start">Touch and drag\nor use directional pad\nto select area to copy</string>
+	<string name="console_copy_start">Toucher et tirer\nou utiliser les touches directionelles\npour selectioner la region à copier</string>
 
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Fermer</string>
@@ -286,7 +301,7 @@
 	<string name="portforward_menu_add">Add port forward</string>
 
 	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">user@hostname</string>
+	<string name="hint_userhost">utilisateur@serveur</string>
 
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
 	<string name="list_format_error">Utilisez le format "%1$s"</string>
@@ -306,13 +321,13 @@
 	<string name="list_menu_settings">Réglages</string>
 
 	<string name="list_host_disconnect">Déconnexion</string>
-	<string name="list_host_edit">Edit host</string>
+	<string name="list_host_edit">Editer le serveur</string>
 	<string name="list_host_portforwards">Edit port forwards</string>
-	<string name="list_host_delete">Delete host</string>
-	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
+	<string name="list_host_delete">Effacer le serveur</string>
+	<string name="list_host_empty">Utilisez la boite de connection rapide en bas pour vous connecter a un serveur</string>
 
 	<!-- Default screen rotation preference selection -->
-	<string name="list_rotation_default">Default</string>
+	<string name="list_rotation_default">Par défaut</string>
 	<string name="list_rotation_land">Forcer le mode paysage</string>
 	<string name="list_rotation_port">Forcer le mode portrait</string>
 	<!-- Selection to indicate the rotation should be selected automatically based on the tilt sensor. -->
@@ -325,11 +340,16 @@
 	<!-- Selection to indicate pressing the Camera button should send the "Esc" key. -->
 	<string name="list_camera_esc">Echap</string>
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
-	<string name="list_camera_none">None</string>
+	<string name="list_camera_none">aucun</string>
+
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
 
 	<string name="delete_message">Êtes-vous sûr de vouloir supprimer '%1$s' ?</string>
 	<string name="delete_pos">Oui, supprimer</string>
-	<string name="delete_neg">Cancel</string>
+	<string name="delete_neg">Annuler</string>
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Trying to authenticate</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Mot de passe</string>
 	<string name="terminal_auth_pass_fail">L'authentification par mot de passe a échoué</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Pas maintenant</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">rouge</string>
 	<string name="color_green">vert</string>
 	<string name="color_blue">bleu</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 7a1bfcf..75aab2c 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Ubah Host</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Bantuan</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Hubungi</string>
 	<string name="resolve_entropy">Kumpulkan entropy</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Muat ke memori</string>
 	<string name="pubkey_memory_unload">Hapus dari memori</string>
 	<string name="pubkey_load_on_start">Muat kunci pada waktu memulai</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Sentu "Menu" untuk membuat\nport forwards.</string>
 	<string name="portforward_edit">Ubah port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Kata sandi untuk kunci '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">PERINGATAN: IDENTIFIKASI REMOTE HOST TELAH BERUBAH!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Gunakan otentifikasi pubkey</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">otomasi setelah login</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Non-aktifkan kesukaan ini hanya untuk port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Pengkodean</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Gunakan format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">namapengguna</string>
+	<string name="format_username">pengguna</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">namahost</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Kosong</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Apakah anda yakin ingin menghapus %1$s?</string>
 	<string name="delete_pos">Ya, hapus</string>
 	<string name="delete_neg">Batal</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">Tidak ada host yang saat ini terhubung</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Verifikasi kunci host gagal.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Mencoba untuk mengotentifikasi</string>
 
 	<string name="terminal_auth_pass">Mencoba otentifikasi 'kata sandi'</string>
-	<string name="terminal_auth_pass_hint">Kata sandi</string>
 	<string name="terminal_auth_pass_fail">Metoda otentifikasi 'kata sandi' gagal</string>
 
 	<string name="terminal_auth_pubkey_any">Mencoba otentifikasi 'kunci publik' dengan kunci publik apapun dalam memori</string>
 	<string name="terminal_auth_pubkey_invalid">Kunci publik yang dipilih tidak valid, coba pilih kembali tombol dalam pengubah host</string>
 	<string name="terminal_auth_pubkey_specific">Mencoba otentifikasi 'kunci publik' dengan kunci publik spesifik</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Mencoba otentifikasi 'papan ketik interaktif'</string>
 	<string name="terminal_auth_ki_fail">Metode otentifikasi 'papan ketik interaktif' gagal</string>
 
 	<string name="terminal_auth_fail">[Host anda tidak mendukung otentifikasi 'kata sandi' atau 'papan ketik interaktif'.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Gagal! Shell lokal tidak tersedia di telepon ini.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Jangan sekarang</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">merah</string>
 	<string name="color_green">hijau</string>
 	<string name="color_blue">biru</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0d0a068..6cd753e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Modifica connessione</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Aiuto</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Connetti</string>
 	<string name="resolve_entropy">Creazione entropia</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Carica in memoria</string>
 	<string name="pubkey_memory_unload">Elimina dalla memoria</string>
 	<string name="pubkey_load_on_start">Carica la chiave all'avvio</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Selezione "Menu" per creare\ninoltri delle porte.</string>
 	<string name="portforward_edit">Modifica inoltro porte</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password per la chiave '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">ATTENZIONE: L'IDENTIFICAZIONE DELL?HOST REMOTO E' CAMBIATA!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Usare autenticazione a chiave pubblica</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Automazione post-accesso</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disabilita questa preferenza per usare solo port forward</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Codifica</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Usare il formato "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">utente</string>
+	<string name="format_username">utente</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">host</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Niente</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Sei sicuro di voler cancellare '%1$s'?</string>
 	<string name="delete_pos">Si, cancella</string>
 	<string name="delete_neg">Annulla</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Verifica della chiave dell'host fallita.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Tentativo di autenticazione</string>
 
 	<string name="terminal_auth_pass">Provando l'autenticazione 'password'</string>
-	<string name="terminal_auth_pass_hint">Password</string>
 	<string name="terminal_auth_pass_fail">Metodo di autenticazione 'password' fallito</string>
 
 	<string name="terminal_auth_pubkey_any">Tentativo di utilizzare autenticazione a 'chiave pubblica' con una delle chiavi pubbliche in memoria</string>
 	<string name="terminal_auth_pubkey_invalid">La chiave pubblica selezionata non è valida, provare a riselezionare la chiave nell'host editor</string>
 	<string name="terminal_auth_pubkey_specific">Tentativo di autenticazione a 'chiave pubblica' con una chiave pubblica specifica</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Provando l'autenticazione 'keyboard-interactive'</string>
 	<string name="terminal_auth_ki_fail">Metodo di autenticazione 'keyboard-interactive' fallito</string>
 
 	<string name="terminal_auth_fail">[Il tuo host non supporta l'autenticazione 'password' o 'keyboard-interactive'</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Fallimento! La shell locale non è disponibile su questo telefono.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Non adesso</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">rosso</string>
 	<string name="color_green">verde</string>
 	<string name="color_blue">blu</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c8a3e4b..33e5d31 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Endre vert</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjelp</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Koble til</string>
 	<string name="resolve_entropy">Samle entropi</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Last inn i minne</string>
 	<string name="pubkey_memory_unload">Last ut av minne</string>
 	<string name="pubkey_load_on_start">Last nøkkel ved start</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Bruk formatet "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">bruker</string>
+	<string name="format_username">bruker</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">vert</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Ingen</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Er du sikker på at du vil slette '%1$s'?</string>
 	<string name="delete_pos">Ja, slett</string>
 	<string name="delete_neg">Avbryt</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Verifisering av vertsnøkkelen feilet.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Forsøker å autentisere</string>
 
 	<string name="terminal_auth_pass">Forsøker 'passord'-autentisering</string>
-	<string name="terminal_auth_pass_hint">Passord</string>
 	<string name="terminal_auth_pass_fail">Autentiseringsmetode 'passord' feilet</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Ikke akkurat nå</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8795acd..f89f368 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Bewerk host</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Help</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Verbind</string>
 	<string name="resolve_entropy">Verzamel Entropie</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Laad in geheugen</string>
 	<string name="pubkey_memory_unload">Ontlaad uit geheugen</string>
 	<string name="pubkey_load_on_start">Laad sleutel op start</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tik "Menu" om poort\nforwards te maken.</string>
 	<string name="portforward_edit">Bewerk port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Wachtwoord voor sleutel '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WAARSCHUWING: REMOTE HOST IDENTIFICATIE IS VERANDERD!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -170,21 +177,21 @@
 	<string name="pref_bumpyarrows_summary">Tril als pijl knoppen worden gestuurd van trackball; handig voor langzame verbindingen</string>
 
 	<!-- Category title for the Terminal Bell preferences -->
-	<string name="pref_bell_category">Terminal bell</string>
+	<string name="pref_bell_category">Terminal bel</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">Hoorbare bel</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">Bel volume</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
-	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+	<string name="pref_bell_vibrate_title">Tril bij bel</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
-	<string name="pref_bell_notification_title">Background notifications</string>
+	<string name="pref_bell_notification_title">Achtergrond notificaties</string>
 	<!-- Brief summary of the feature that is enabled when the checkbox preference for the receive notifications on terminal bell feature is checked -->
-	<string name="pref_bell_notification_summary">Send notification when a terminal running in the background sounds a bell.</string>
+	<string name="pref_bell_notification_summary">Stuur notificatie als terminal in de achtergrond een bel laat klinken.</string>
 
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
 	<string name="list_keymode_right">Gebruik rechter kant sleutels</string>
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Gebruik pubkey authenticatie</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Na-login automatie</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Schakel dit uit om alleen port forwards te gebruiken</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Codering</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Gebruik het formaat "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">gebruikersnaam</string>
+	<string name="format_username">gebruiker</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">hostnaam</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Geen</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Weet je zeker dat je '%1$s' wilt verwijderen?</string>
 	<string name="delete_pos">Ja, verwijder</string>
 	<string name="delete_neg">Annuleren</string>
@@ -340,27 +360,43 @@
 
 	<string name="terminal_no_hosts_connected">Momenteel geen hosts verbonden</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host sleutel verificatie mislukt</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Probeert te authenticeren</string>
 
 	<string name="terminal_auth_pass">Probeert 'wachtwoord' authenticatie</string>
-	<string name="terminal_auth_pass_hint">Wachtwoord</string>
 	<string name="terminal_auth_pass_fail">Authenticatie methode 'wachtwoord' mislukt</string>
 
 	<string name="terminal_auth_pubkey_any">Probeert 'publieke sleutel' authenticatie met een willekeurige in-geheugen publieke sleutel</string>
 	<string name="terminal_auth_pubkey_invalid">Geselecteerde publieke sleutel is ongeldig, probeer herselecteren van de sleutel in de host bewerker</string>
 	<string name="terminal_auth_pubkey_specific">Probeert 'publickey' authenticatie met een specifieke publieke sleutel</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Probeert 'keyboard-interactive' authenticatie</string>
 	<string name="terminal_auth_ki_fail">Authenticatie methode 'keyboard-interactive' mislukt</string>
 
 	<string name="terminal_auth_fail">[Uw host ondersteund 'wachtwoord' of 'keyboard-interactive' authenticatie niet.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Mislukking! Lokale shell is niet beschikbaar op deze telefoon.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
-	<string name="notification_text">%1$s wants your attention.</string>
+	<string name="notification_text">%1$s wil je aandacht.</string>
 
 	<!-- Dialog title when a new version of ConnectBot is detected. -->
 	<string name="upgrade">Nieuwe versie</string>
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Nog niet</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">rood</string>
 	<string name="color_green">groen</string>
 	<string name="color_blue">blauw</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e3d4638..d4285e0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -13,9 +13,11 @@
 	<string name="title_host_editor">Edytuj hosta</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Pomoc</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Połącz</string>
-	<string name="resolve_entropy">Gather Entropy</string>
+	<string name="resolve_entropy">Uruchom generatora liczb losowych</string>
 
 	<string name="menu_insert">Dodaj hosta</string>
 	<string name="menu_delete">Usuń hosta</string>
@@ -28,7 +30,7 @@
 	<string name="pubkey_generate">Generuj</string>
 	<string name="pubkey_import">Importuj</string>
 	<string name="pubkey_delete">Usuń klucz</string>
-	<string name="pubkey_gather_entropy">Gathering Entropy</string>
+	<string name="pubkey_gather_entropy">Generowanie losowego klucza</string>
 	<string name="pubkey_touch_prompt">Dotknij to pole, żeby losowo wygenerować dane. Ukończono: %1$d%%</string>
 	<string name="pubkey_touch_hint">Dla niepowtarzalności klucza, poruszaj losowo palcem po polu poniżej.</string>
 	<string name="pubkey_generating">Generowanie pary kluczy...</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Załaduj do pamięci</string>
 	<string name="pubkey_memory_unload">Usuń z pamięci</string>
 	<string name="pubkey_load_on_start">Załaduj klucz przy uruchamianiu</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Naciśnij "Menu",\nżeby stworzyć przekierowanie portu.</string>
 	<string name="portforward_edit">Edytuj przekierowanie portu</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Proszę podać hasło dla klucza '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">OSTRZEŻENIE: ZDALNA IDENTYFIKACJA HOSTA ZMIENIŁA SIĘ!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -82,7 +89,7 @@
 	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
 	<string name="host_authenticity_warning">Autentyczność hosta '%1$s' nie może zostać ustalona.</string>
 	<!-- First field is encryption algorithm. Second is the actual fingerprint in hex digits -->
-	<string name="host_fingerprint">Host %1$s key fingerprint is %2$s</string>
+	<string name="host_fingerprint">Fingerprint hosta %1$s to %2$s</string>
 
 	<string name="alert_passwords_do_not_match_msg">Hasła nie zgadzają się!</string>
 	<string name="alert_wrong_password_msg">Nieprawidłowe hasło!</string>
@@ -170,21 +177,21 @@
 	<string name="pref_bumpyarrows_summary">Wibruj kiedy emulowane są klawisze strzałek; Użyteczne dla wolnych połączeń</string>
 
 	<!-- Category title for the Terminal Bell preferences -->
-	<string name="pref_bell_category">Terminal bell</string>
+	<string name="pref_bell_category">Brzęczyk terminala</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">Brzęczyk słyszalny</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">Głośność brzęczyka</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
-	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+	<string name="pref_bell_vibrate_title">Włącz wibracje</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
-	<string name="pref_bell_notification_title">Background notifications</string>
+	<string name="pref_bell_notification_title">Powiadomienia</string>
 	<!-- Brief summary of the feature that is enabled when the checkbox preference for the receive notifications on terminal bell feature is checked -->
-	<string name="pref_bell_notification_summary">Send notification when a terminal running in the background sounds a bell.</string>
+	<string name="pref_bell_notification_summary">Uruchom powiadomienie podczas akcji w zminimalizowanej aplikacji.</string>
 
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
 	<string name="list_keymode_right">Używaj klawiszy z prawej strony</string>
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Używaj kluczy publicznych do autoryzacji</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Wykonaj po zalogowaniu</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Wyłącz jeśli chcesz tylko przekierować porty</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Kodowanie</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Użyj formatu "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">użytkownik</string>
+	<string name="format_username">użytkownik</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">nazwa_hosta</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Żadny</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Jesteś pewien, że chcesz usunąć '%1$s'?</string>
 	<string name="delete_pos">Tak, usuń</string>
 	<string name="delete_neg">Anuluj</string>
@@ -340,27 +360,43 @@
 
 	<string name="terminal_no_hosts_connected">Żaden host nie jest obecnie połączony</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Weryfikacja klucza hosta nie powiodła się.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Próba autoryzacji</string>
 
 	<string name="terminal_auth_pass">Próba autoryzacji za pomocą hasła</string>
-	<string name="terminal_auth_pass_hint">Hasło</string>
 	<string name="terminal_auth_pass_fail">Autoryzacja za pomocą klucza nie powiodła się</string>
 
 	<string name="terminal_auth_pubkey_any">Próba autentykacji za pomocą dowolnego zapamiętanego klucza publicznego</string>
 	<string name="terminal_auth_pubkey_invalid">Wybrany klucz publiczny jest nieprawidłowy, spróbuj wybrać inny klucz w edycji hosta</string>
 	<string name="terminal_auth_pubkey_specific">Próba autentykacji za pomocą wybranego klucza publicznego</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Próba autentykacji za pomocą klawiatury</string>
 	<string name="terminal_auth_ki_fail">Autoryzacja za pomocą klawiatury nie powiodła się</string>
 
 	<string name="terminal_auth_fail">[Twój host nie obsługuje autentykacji za pomocą klawiatury lub hasła.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Niepowodzenie! Lokalna powłoka nie jest obsługiwana na tym telefonie.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
-	<string name="notification_text">%1$s wants your attention.</string>
+	<string name="notification_text">%1$s wymaga twojej akcji</string>
 
 	<!-- Dialog title when a new version of ConnectBot is detected. -->
 	<string name="upgrade">Nowa wersja</string>
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Nie, nie teraz</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">czerwony</string>
 	<string name="color_green">zielony</string>
 	<string name="color_blue">niebieski</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 875c0ef..81cd49f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Редактировать хост</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Помощь</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Соединение</string>
 	<string name="resolve_entropy">Gather Entropy</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Загрузка в память</string>
 	<string name="pubkey_memory_unload">Выгрузка из памяти</string>
 	<string name="pubkey_load_on_start">Загружать ключ при старте</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -253,7 +268,7 @@
 	<!-- The time that has elapsed since a host was connected to when it has been less than a day. -->
 	<string name="bind_hours">%1$s hours ago</string>
 	<!-- The time that has elapsed since a host was connected to when it has been a day or more. -->
-	<string name="bind_days">%1$s days ago</string>
+	<string name="bind_days">%1$s дней назад</string>
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copied %1$d bytes to clipboard</string>
@@ -267,7 +282,7 @@
 	<!-- Button to paste from the clipboard to the terminal. -->
 	<string name="console_menu_paste">Вставить</string>
 	<!-- Button that brings user to the Port Forwards List. -->
-	<string name="console_menu_portforwards">Port Forwards</string>
+	<string name="console_menu_portforwards">Перенаправления портов</string>
 	<!-- Button that brings user to the terminal resizing dialog where they can force a size. -->
 	<string name="console_menu_resize">Force Size</string>
 
@@ -278,23 +293,23 @@
 	<!-- Selection for a "dynamic" port forward. E.g., connections to a port listening locally is forwarded based on the SOCKS protocol to an arbitrary remote host and port. -->
 	<string name="portforward_dynamic">Dynamic (SOCKS)</string>
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
-	<string name="portforward_pos">Create port forward</string>
+	<string name="portforward_pos">Создать перенаправление порта</string>
 
-	<string name="portforward_done">Successfully created port forward</string>
-	<string name="portforward_problem">Problem creating port forward, maybe you're using ports under 1024 or port is already used?</string>
+	<string name="portforward_done">Перенаправление порта успешно завершено</string>
+	<string name="portforward_problem">Не удалось создать перенаправление порта. Может быть вы используете порты меньше чем 1024 или пор уже используется?</string>
 
-	<string name="portforward_menu_add">Add port forward</string>
+	<string name="portforward_menu_add">Добавить перенаправление порта</string>
 
 	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">user@hostname</string>
+	<string name="hint_userhost">пользователь@имяхоста</string>
 
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
 	<string name="list_format_error">Use the format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">username</string>
+	<string name="format_username">пользователь</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-	<string name="format_hostname">hostname</string>
+	<string name="format_hostname">имяхоста</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_port">port</string>
 
@@ -306,8 +321,8 @@
 	<string name="list_menu_settings">Настройки</string>
 
 	<string name="list_host_disconnect">Разорвать соединение</string>
-	<string name="list_host_edit">Edit host</string>
-	<string name="list_host_portforwards">Edit port forwards</string>
+	<string name="list_host_edit">Редактировать хост</string>
+	<string name="list_host_portforwards">Редактировать перенаправление портов</string>
 	<string name="list_host_delete">Удалить хост</string>
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">None</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Вы уверены, что хотите удалить '%1$s'?</string>
 	<string name="delete_pos">Да, удалить</string>
 	<string name="delete_neg">Отменить</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Пытаюсь аутентифицироваться</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Пароль</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Не сейчас</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 97cfd28..687a831 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">Redigera värd</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjälp</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Anslut</string>
 	<string name="resolve_entropy">Samla in Entropi</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">Ladda in i minnet</string>
 	<string name="pubkey_memory_unload">Ladda ur minnet</string>
 	<string name="pubkey_load_on_start">Ladda nyckel från start</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">Rör vid "Menu" för att skapa\nvidarebefodringar av portar.</string>
 	<string name="portforward_edit">Ändra viderabefodring av port</string>
@@ -53,7 +57,7 @@
 	<!-- An example string that could be used as a nickname for a pubkey. -->
 	<string name="prompt_nickname_hint_pubkey">Min jobbenyckel</string>
 	<!-- The source TCP port for port forwards. -->
-	<string name="prompt_source_port">Källport:</string>
+	<string name="prompt_source_port">Inkommande portnummer:</string>
 	<!-- The "host:port" combination used for port forward destinations. -->
 	<string name="prompt_destination">Destination:</string>
 	<string name="prompt_old_password">Gammalt lösenord:</string>
@@ -69,10 +73,13 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
-	<string name="host_verification_failure_warning_header">WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!</string>
+	<string name="host_verification_failure_warning_header">VARNING: IDENTIFIERING AV FJÄRRVÄRD HAR ÄNDRATS!</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
-	<string name="host_verification_failure_warning">IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\nSomeone could be eavesdropping on you right now (man-in-the-middle attack)!\nIt is also possible that the host key has just been changed.</string>
+	<string name="host_verification_failure_warning">MÖJLIGT INTRÅNGSFÖRSÖK!\nNågon skulle kunna avlyssna dig nu ("man-in-the-middle attack")!\nDet är även möjligt att värdnyckeln just har ändrats.</string>
 
 	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
 	<string name="prompt_host_disconnected">Host has disconnected.\nClose session?</string>
@@ -87,7 +94,7 @@
 	<string name="alert_passwords_do_not_match_msg">Lösenorden överenstämmer inte med varandra!</string>
 	<string name="alert_wrong_password_msg">Felaktigt lösenord!</string>
 	<string name="alert_key_corrupted_msg">Privata nyckeln ser ut att vara korrupt!</string>
-	<string name="alert_sdcard_absent">SD-kortet är inte instoppat!</string>
+	<string name="alert_sdcard_absent">SD-kort ej isatt!</string>
 
 	<!-- Add a new item (e.g., host or pubkey) to the list. -->
 	<string name="button_add">Lägg till</string>
@@ -109,74 +116,74 @@
 	<string name="msg_version">ConnectBot (working copy)</string>
 
 	<!-- The category title for terminal emulation preferences. -->
-	<string name="pref_emulation_category">Terminal emulation</string>
+	<string name="pref_emulation_category">Terminalemulering</string>
 
 	<!-- Name for the emulation terminal type preference. -->
-	<string name="pref_emulation_title">Emulation mode</string>
+	<string name="pref_emulation_title">Emuleringsläge</string>
 	<!-- Description of the emulation terminal type preference. -->
-	<string name="pref_emulation_summary">Terminal emulation mode to use for PTY connections</string>
+	<string name="pref_emulation_summary">Emuleringsläge för PTY-anslutningar</string>
 
 	<!-- Name for the scrollback size preference -->
-	<string name="pref_scrollback_title">Scrollback size</string>
+	<string name="pref_scrollback_title">Antal rader att rulla tillbaka</string>
 	<!-- Description of the scrollback size preference -->
-	<string name="pref_scrollback_summary">Size of scrollback buffer to keep in memory for each console</string>
+	<string name="pref_scrollback_summary">Storlek på tillbakarullningsbuffert för varje konsol</string>
 
 	<!-- The category title for user interface preferences -->
-	<string name="pref_ui_category">User interface</string>
+	<string name="pref_ui_category">Användargränssnitt</string>
 
 	<!-- Name for the rotation mode preference -->
-	<string name="pref_rotation_title">Rotation mode</string>
+	<string name="pref_rotation_title">Rotationsläge</string>
 	<!-- Summary for the rotation mode preference -->
-	<string name="pref_rotation_summary">How to change rotation when keyboard popped in/out</string>
+	<string name="pref_rotation_summary">Hur rotation skall ändras när tangentbord aktiveras/avaktiveras</string>
 
 	<!-- Name for the full screen preference -->
-	<string name="pref_fullscreen_title">Full screen</string>
+	<string name="pref_fullscreen_title">Fullskärm</string>
 	<!-- Summary for the full screen preference -->
-	<string name="pref_fullscreen_summary">Hide status bar while in console</string>
+	<string name="pref_fullscreen_summary">Göm status medan konsol visas</string>
 
 	<!-- Name for the memorize keys preference -->
-	<string name="pref_memkeys_title">Remember keys in memory</string>
+	<string name="pref_memkeys_title">Kom ihåg nycklar</string>
 	<!-- Summary for the memorize keys preference -->
-	<string name="pref_memkeys_summary">Keep unlocked keys in memory until backend service is terminated</string>
+	<string name="pref_memkeys_summary">Behåll olåsta nycklar i minnet tills bakände-tjänst avslutas</string>
 
 	<!-- Name for the update check preference -->
-	<string name="pref_update_title">Update check</string>
+	<string name="pref_update_title">Uppdateringskontroll</string>
 	<!-- Summary for the update check preference -->
-	<string name="pref_update_summary">Set the maximum frequency to check for ConnectBot updates</string>
+	<string name="pref_update_summary">Intervall för att söka efter ConnectBot-uppdateringar</string>
 
 	<!-- Name for the keyboard shortcuts preference -->
-	<string name="pref_keymode_title">Directory shortcuts</string>
+	<string name="pref_keymode_title">Genvägar för katalog</string>
 	<!-- Summary for the keyboard shortcuts preference -->
-	<string name="pref_keymode_summary">Select how to use Alt for '/' and Shift for Tab</string>
+	<string name="pref_keymode_summary">Välj hur Alt används för '/' och Shift för Tab</string>
 
 	<!-- Name for the camera shortcut usage preference -->
-	<string name="pref_camera_title">Camera shortcut</string>
+	<string name="pref_camera_title">Genväg för kamera</string>
 	<!-- Summary for the camera shortcut usage preference -->
-	<string name="pref_camera_summary">Select which shortcut to trigger when the camera button is pushed</string>
+	<string name="pref_camera_summary">Välj genväg för kamera-knappen</string>
 
 	<!-- Name for the keep screen on preference -->
-	<string name="pref_keepalive_title">Keep screen awake</string>
+	<string name="pref_keepalive_title">Håll skärmen aktiv</string>
 	<!-- Summary for the camera shortcut usage preference -->
-	<string name="pref_keepalive_summary">Prevent the screen from turning off when working in a console</string>
+	<string name="pref_keepalive_summary">Håll skärmen aktiv medan konsolen används</string>
 
 	<!-- Name for the Wi-Fi lock preference -->
-	<string name="pref_wifilock_title">Keep Wi-Fi active</string>
+	<string name="pref_wifilock_title">Håll trådlöst nätverk aktivt</string>
 	<!-- Summary for the Wi-Fi lock preference -->
-	<string name="pref_wifilock_summary">Prevent Wi-Fi from turning off when a session is active</string>
+	<string name="pref_wifilock_summary">Hindra att trådlöst nätverk slås av under en aktiv session</string>
 
 	<!-- Name for the haptic feedback (bumpy arrow) preference -->
 	<string name="pref_bumpyarrows_title">Bumpy arrows</string>
 	<!-- Summary for the haptic feedback (bumpy arrow) preference -->
-	<string name="pref_bumpyarrows_summary">Vibrate when sending arrow keys from trackball; useful for laggy connections</string>
+	<string name="pref_bumpyarrows_summary">Vibrera när piltangenter sänds från pekdon; bra för långsamma anslutningar</string>
 
 	<!-- Category title for the Terminal Bell preferences -->
-	<string name="pref_bell_category">Terminal bell</string>
+	<string name="pref_bell_category">Terminal-ljud</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">Aktivt</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">Ljudvolym</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
 	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -292,7 +307,7 @@
 	<string name="list_format_error">Använd formatet "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">användarnamn</string>
+	<string name="format_username">användarnamn</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<string name="format_hostname">värdnamn</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">Ingen</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">Är du säker att du vill ta bort '%1$s'?</string>
 	<string name="delete_pos">Ja, ta bort</string>
 	<string name="delete_neg">Avbryt</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Verifikation av värd-nyckeln misslyckades.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Försöker att autentisera</string>
 
 	<string name="terminal_auth_pass">Försöker med 'password' autentisering</string>
-	<string name="terminal_auth_pass_hint">Lösenord</string>
 	<string name="terminal_auth_pass_fail">Autentiseringsmetoden 'password' misslyckades</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Försöker med 'keyboard-interactive' autentisering</string>
 	<string name="terminal_auth_ki_fail">Autentiseringsmetoden 'keyboard-interactive' misslyckades</string>
 
 	<string name="terminal_auth_fail">[Din värd stödjer inte 'password' eller 'keyboard-interactive' autentiseringsmetoderna]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Inte just nu</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">red</string>
 	<string name="color_green">green</string>
 	<string name="color_blue">blue</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 05c09fd..d27f4bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -13,22 +13,24 @@
 	<string name="title_host_editor">编辑主机</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">帮助</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">连接</string>
-	<string name="resolve_entropy">Gather Entropy</string>
+	<string name="resolve_entropy">收集用户熵</string>
 
 	<string name="menu_insert">添加主机</string>
 	<string name="menu_delete">删除主机</string>
 	<string name="menu_preferences">设置</string>
 
-	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
+	<string name="help_intro">请在下面主题中选择一个以查看更多内容</string>
 	<string name="help_about">关于ConnectBot</string>
 	<string name="help_keyboard">键盘</string>
 
 	<string name="pubkey_generate">产生</string>
 	<string name="pubkey_import">导入</string>
 	<string name="pubkey_delete">删除密钥</string>
-	<string name="pubkey_gather_entropy">Gathering Entropy</string>
+	<string name="pubkey_gather_entropy">正在收集用户熵</string>
 	<string name="pubkey_touch_prompt">触摸方框来收集随机数：%1$d％完成</string>
 	<string name="pubkey_touch_hint">由于密钥产生的时候需要随机数据，请在下面的方框中随便移动你的手指</string>
 	<string name="pubkey_generating">正在产生密钥配对</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">载入内存中</string>
 	<string name="pubkey_memory_unload">从内存中移除</string>
 	<string name="pubkey_load_on_start">在启动的时候载入密钥</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">点击「菜单」来创建端口转发</string>
 	<string name="portforward_edit">编辑端口转发</string>
@@ -69,10 +73,15 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">密钥「%1$s」的密码</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">警告：远程主机的标志已经改变</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
-	<string name="host_verification_failure_warning">IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\nSomeone could be eavesdropping on you right now (man-in-the-middle attack)!\nIt is also possible that the host key has just been changed.</string>
+	<string name="host_verification_failure_warning">可能某人正在做非善意的事情\n
+可能有人正在偷听你的会话(中间人攻击)\n
+但也许仅仅是主密匙(host key)已被更改，你确信如此?</string>
 
 	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
 	<string name="prompt_host_disconnected">主机已经断开。\n是否关闭本次对话？</string>
@@ -82,7 +91,7 @@
 	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
 	<string name="host_authenticity_warning">主机「%1$s」的验证无法建立</string>
 	<!-- First field is encryption algorithm. Second is the actual fingerprint in hex digits -->
-	<string name="host_fingerprint">Host %1$s key fingerprint is %2$s</string>
+	<string name="host_fingerprint">主机 %1$s 密钥指纹是 %2$s</string>
 
 	<string name="alert_passwords_do_not_match_msg">密码不匹配！</string>
 	<string name="alert_wrong_password_msg">错误的密码！</string>
@@ -106,271 +115,305 @@
 	  Updating is update by the ant task "update-version" in build.xml
 	  Do not translate.
 	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
+	<string name="msg_version">ConnectBot(工作拷贝)</string>
 
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">模拟终端</string>
 
 	<!-- Name for the emulation terminal type preference. -->
-	<string name="pref_emulation_title">Emulation mode</string>
+	<string name="pref_emulation_title">仿真模式</string>
 	<!-- Description of the emulation terminal type preference. -->
-	<string name="pref_emulation_summary">Terminal emulation mode to use for PTY connections</string>
+	<string name="pref_emulation_summary">设置使用PTY连接时的终端模式</string>
 
 	<!-- Name for the scrollback size preference -->
-	<string name="pref_scrollback_title">Scrollback size</string>
+	<string name="pref_scrollback_title">回滚长度</string>
 	<!-- Description of the scrollback size preference -->
-	<string name="pref_scrollback_summary">Size of scrollback buffer to keep in memory for each console</string>
+	<string name="pref_scrollback_summary">在内存中为每个控制台保留的回滚缓存长度</string>
 
 	<!-- The category title for user interface preferences -->
-	<string name="pref_ui_category">User interface</string>
+	<string name="pref_ui_category">用户界面</string>
 
 	<!-- Name for the rotation mode preference -->
-	<string name="pref_rotation_title">Rotation mode</string>
+	<string name="pref_rotation_title">循环模式</string>
 	<!-- Summary for the rotation mode preference -->
-	<string name="pref_rotation_summary">How to change rotation when keyboard popped in/out</string>
+	<string name="pref_rotation_summary">当滑开或关闭键盘时如何调整屏幕朝向(水平或竖直)</string>
 
 	<!-- Name for the full screen preference -->
-	<string name="pref_fullscreen_title">Full screen</string>
+	<string name="pref_fullscreen_title">全屏</string>
 	<!-- Summary for the full screen preference -->
-	<string name="pref_fullscreen_summary">Hide status bar while in console</string>
+	<string name="pref_fullscreen_summary">处于控制台时隐藏状态栏</string>
 
 	<!-- Name for the memorize keys preference -->
-	<string name="pref_memkeys_title">Remember keys in memory</string>
+	<string name="pref_memkeys_title">在内存中记录密钥</string>
 	<!-- Summary for the memorize keys preference -->
-	<string name="pref_memkeys_summary">Keep unlocked keys in memory until backend service is terminated</string>
+	<string name="pref_memkeys_summary">保存解锁密匙在内存中，直到后端服务停止为止</string>
 
 	<!-- Name for the update check preference -->
-	<string name="pref_update_title">Update check</string>
+	<string name="pref_update_title">升级检查</string>
 	<!-- Summary for the update check preference -->
-	<string name="pref_update_summary">Set the maximum frequency to check for ConnectBot updates</string>
+	<string name="pref_update_summary">设置检查ConnectBot最新版本的最大频率</string>
 
 	<!-- Name for the keyboard shortcuts preference -->
-	<string name="pref_keymode_title">Directory shortcuts</string>
+	<string name="pref_keymode_title">目录快捷键</string>
 	<!-- Summary for the keyboard shortcuts preference -->
 	<string name="pref_keymode_summary">Select how to use Alt for '/' and Shift for Tab</string>
 
 	<!-- Name for the camera shortcut usage preference -->
-	<string name="pref_camera_title">Camera shortcut</string>
+	<string name="pref_camera_title">摄像快捷键</string>
 	<!-- Summary for the camera shortcut usage preference -->
-	<string name="pref_camera_summary">Select which shortcut to trigger when the camera button is pushed</string>
+	<string name="pref_camera_summary">选择当照相键按下时将要触发的快捷键</string>
 
 	<!-- Name for the keep screen on preference -->
-	<string name="pref_keepalive_title">Keep screen awake</string>
+	<string name="pref_keepalive_title">保持屏幕唤醒</string>
 	<!-- Summary for the camera shortcut usage preference -->
-	<string name="pref_keepalive_summary">Prevent the screen from turning off when working in a console</string>
+	<string name="pref_keepalive_summary">禁止屏幕睡眠当终端正在工作时</string>
 
 	<!-- Name for the Wi-Fi lock preference -->
-	<string name="pref_wifilock_title">Keep Wi-Fi active</string>
+	<string name="pref_wifilock_title">保持WI-FI激活</string>
 	<!-- Summary for the Wi-Fi lock preference -->
-	<string name="pref_wifilock_summary">Prevent Wi-Fi from turning off when a session is active</string>
+	<string name="pref_wifilock_summary">禁止WiFi自动关闭当会话激活时</string>
 
 	<!-- Name for the haptic feedback (bumpy arrow) preference -->
 	<string name="pref_bumpyarrows_title">Bumpy arrows</string>
 	<!-- Summary for the haptic feedback (bumpy arrow) preference -->
-	<string name="pref_bumpyarrows_summary">Vibrate when sending arrow keys from trackball; useful for laggy connections</string>
+	<string name="pref_bumpyarrows_summary">振动当用轨迹球发出模拟方向键时; (对滞后连接特别有用)</string>
 
 	<!-- Category title for the Terminal Bell preferences -->
-	<string name="pref_bell_category">Terminal bell</string>
+	<string name="pref_bell_category">终端铃声</string>
 
 	<!-- Checkbox preference title for the audible terminal bell feature -->
-	<string name="pref_bell_title">Audible bell</string>
+	<string name="pref_bell_title">响铃</string>
 
 	<!-- Title for the slider preference to set the volume -->
-	<string name="pref_bell_volume_title">Bell volume</string>
+	<string name="pref_bell_volume_title">铃声音量</string>
 
 	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
-	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+	<string name="pref_bell_vibrate_title">振动同时响铃</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
-	<string name="pref_bell_notification_title">Background notifications</string>
+	<string name="pref_bell_notification_title">背景通知</string>
 	<!-- Brief summary of the feature that is enabled when the checkbox preference for the receive notifications on terminal bell feature is checked -->
-	<string name="pref_bell_notification_summary">Send notification when a terminal running in the background sounds a bell.</string>
+	<string name="pref_bell_notification_summary">当后台终端响铃时发出通知</string>
 
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
-	<string name="list_keymode_right">Use right-side keys</string>
+	<string name="list_keymode_right">使用右边键盘</string>
 	<!-- Preference selection to indicate use of left side of keyboard for special shortcuts. -->
-	<string name="list_keymode_left">Use left-side keys</string>
+	<string name="list_keymode_left">使用左边键盘</string>
 	<!-- Preference selection to indicate never to use special shortcut keys. -->
-	<string name="list_keymode_none">Disable</string>
+	<string name="list_keymode_none">禁用</string>
 
 	<!-- Preference to not use pubkeys to authenticate to this host. -->
-	<string name="list_pubkeyids_none">Do not use keys</string>
+	<string name="list_pubkeyids_none">不使用密匙</string>
 	<!-- Preference to use any pubkey to authenticate to this host. -->
-	<string name="list_pubkeyids_any">Use any unlocked key</string>
+	<string name="list_pubkeyids_any">使用解锁密匙</string>
 
 	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_daily">Daily</string>
+	<string name="list_update_daily">每日</string>
 	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_weekly">Weekly</string>
+	<string name="list_update_weekly">每周</string>
 	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_never">Never</string>
+	<string name="list_update_never">从不</string>
 
 	<!-- Host nickname field preference title -->
-	<string name="hostpref_nickname_title">Nickname</string>
+	<string name="hostpref_nickname_title">昵称</string>
 
 	<!-- Host color category preference title -->
-	<string name="hostpref_color_title">Color category</string>
+	<string name="hostpref_color_title">颜色类型</string>
 
 	<!-- Host pubkey usage preference title -->
-	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
+	<string name="hostpref_pubkeyid_title">使用公钥验证</string>
+
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
 
 	<!-- Host post-login automation preference title -->
-	<string name="hostpref_postlogin_title">Post-login automation</string>
+	<string name="hostpref_postlogin_title">登入后动作</string>
 	<!-- Host post-login automation preference summary -->
-	<string name="hostpref_postlogin_summary">Commands to run on remote server once authenticated</string>
+	<string name="hostpref_postlogin_summary">每次验证后在远端服务器上运行的命令</string>
 
 	<!-- Host compression preference title -->
-	<string name="hostpref_compression_title">Compression</string>
+	<string name="hostpref_compression_title">压缩</string>
 	<!-- Summary for compression preference -->
-	<string name="hostpref_compression_summary">This may help with slower networks</string>
+	<string name="hostpref_compression_summary">此选项对低速网络会有帮助</string>
 
 	<!-- Setting for whether we want a session to start up when we connect to a host -->
-	<string name="hostpref_wantsession_title">Start shell session</string>
+	<string name="hostpref_wantsession_title">开始Shell会话</string>
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
-	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
+	<string name="hostpref_wantsession_summary">仅仅对端口转发禁用偏好设置</string>
+
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL键</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">当DEL按下时触发的按键</string>
 
 	<!-- Host character encoding preference title -->
-	<string name="hostpref_encoding_title">Encoding</string>
+	<string name="hostpref_encoding_title">编码</string>
 	<!-- Host character encoding preference summary -->
-	<string name="hostpref_encoding_summary">Character encoding for the host</string>
+	<string name="hostpref_encoding_summary">主机的字符编码</string>
 
 	<!-- Host preference category title for connection settings -->
-	<string name="hostpref_connection_category">Connection settings</string>
+	<string name="hostpref_connection_category">连接设置</string>
 
 	<!-- Username field title for host editor preference -->
-	<string name="hostpref_username_title">Username</string>
+	<string name="hostpref_username_title">用户名</string>
 
 	<!-- Hostname field title for host editor preference -->
-	<string name="hostpref_hostname_title">Host</string>
+	<string name="hostpref_hostname_title">主机</string>
 
 	<!-- Port field title for host editor preference -->
-	<string name="hostpref_port_title">Port</string>
+	<string name="hostpref_port_title">端口</string>
 
 	<!-- Displayed to indicate a host has never been connected to. -->
-	<string name="bind_never">Never connected</string>
+	<string name="bind_never">从未连接</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than an hour. -->
-	<string name="bind_minutes">%1$s minutes ago</string>
+	<string name="bind_minutes">已连接 %1$s 分钟</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than a day. -->
-	<string name="bind_hours">%1$s hours ago</string>
+	<string name="bind_hours">已连接 %1$s 小时</string>
 	<!-- The time that has elapsed since a host was connected to when it has been a day or more. -->
-	<string name="bind_days">%1$s days ago</string>
+	<string name="bind_days">已连接 %1$s 天</string>
 
 	<!-- Message given when user copies from the terminal. -->
-	<string name="console_copy_done">Copied %1$d bytes to clipboard</string>
+	<string name="console_copy_done">复制 %1$d 字节到剪贴板</string>
 	<!-- Instructions for how to copy from the terminal. The \n entries are to split lines to improve readability and prevent wrapping off the screen. -->
-	<string name="console_copy_start">Touch and drag\nor use directional pad\nto select area to copy</string>
+	<string name="console_copy_start">滑动手指\n
+或使用轨迹球\n
+选择要复制的区域</string>
 
 	<!-- Button to close the disconnected terminal window. -->
-	<string name="console_menu_close">Close</string>
+	<string name="console_menu_close">关闭</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
-	<string name="console_menu_copy">Copy</string>
+	<string name="console_menu_copy">复制</string>
 	<!-- Button to paste from the clipboard to the terminal. -->
-	<string name="console_menu_paste">Paste</string>
+	<string name="console_menu_paste">粘贴</string>
 	<!-- Button that brings user to the Port Forwards List. -->
-	<string name="console_menu_portforwards">端口映射</string>
+	<string name="console_menu_portforwards">端口转发</string>
 	<!-- Button that brings user to the terminal resizing dialog where they can force a size. -->
-	<string name="console_menu_resize">Force Size</string>
+	<string name="console_menu_resize">字体大小</string>
 
 	<!-- Selection for a "local" port forward. E.g., connections to a port listening locally is forwarded to the remote end's listening port. -->
-	<string name="portforward_local">Local</string>
+	<string name="portforward_local">本地</string>
 	<!-- Selection for a "remote" port forward. E.g., connections to a port listening remotely is forwarded to the local end's listening port. -->
-	<string name="portforward_remote">Remote</string>
+	<string name="portforward_remote">远端</string>
 	<!-- Selection for a "dynamic" port forward. E.g., connections to a port listening locally is forwarded based on the SOCKS protocol to an arbitrary remote host and port. -->
-	<string name="portforward_dynamic">Dynamic (SOCKS)</string>
+	<string name="portforward_dynamic">动态套接字(SOCKS)</string>
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
-	<string name="portforward_pos">Create port forward</string>
+	<string name="portforward_pos">创建端口转发</string>
 
-	<string name="portforward_done">Successfully created port forward</string>
-	<string name="portforward_problem">Problem creating port forward, maybe you're using ports under 1024 or port is already used?</string>
+	<string name="portforward_done">成功创建端口转发</string>
+	<string name="portforward_problem">创建端口转发发生故障，可能你选择的端口小于1024或该端口已经被使用?</string>
 
-	<string name="portforward_menu_add">Add port forward</string>
+	<string name="portforward_menu_add">添加端口转发</string>
 
 	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">user@hostname</string>
+	<string name="hint_userhost">用户名@主机名</string>
 
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
-	<string name="list_format_error">Use the format "%1$s"</string>
+	<string name="list_format_error">使用"%1$s"格式</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">username</string>
+	<string name="format_username">用户名</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-	<string name="format_hostname">hostname</string>
+	<string name="format_hostname">主机名</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-	<string name="format_port">port</string>
+	<string name="format_port">端口</string>
 
-	<string name="list_menu_pubkeys">Manage Pubkeys</string>
+	<string name="list_menu_pubkeys">管理公钥</string>
 	<!-- Selection choice to sort hosts by color. -->
-	<string name="list_menu_sortcolor">Sort by color</string>
+	<string name="list_menu_sortcolor">使用颜色排序</string>
 	<!-- Selection choice to sort hosts by nickname. -->
-	<string name="list_menu_sortname">Sort by name</string>
-	<string name="list_menu_settings">Settings</string>
+	<string name="list_menu_sortname">使用名字排序</string>
+	<string name="list_menu_settings">设置</string>
 
-	<string name="list_host_disconnect">Disconnect</string>
-	<string name="list_host_edit">Edit host</string>
-	<string name="list_host_portforwards">Edit port forwards</string>
-	<string name="list_host_delete">Delete host</string>
-	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
+	<string name="list_host_disconnect">断开连接</string>
+	<string name="list_host_edit">编辑主机</string>
+	<string name="list_host_portforwards">编辑端口转发</string>
+	<string name="list_host_delete">删除主机</string>
+	<string name="list_host_empty">使用下面的快速连接框连接主机</string>
 
 	<!-- Default screen rotation preference selection -->
-	<string name="list_rotation_default">Default</string>
-	<string name="list_rotation_land">Force landscape</string>
-	<string name="list_rotation_port">Force portrait</string>
+	<string name="list_rotation_default">默认</string>
+	<string name="list_rotation_land">强制横屏显示</string>
+	<string name="list_rotation_port">强制竖屏显示</string>
 	<!-- Selection to indicate the rotation should be selected automatically based on the tilt sensor. -->
-	<string name="list_rotation_auto">Automatic</string>
+	<string name="list_rotation_auto">自动</string>
 
 	<!-- Selection to indicate pressing the Camera button should send "Ctrl+A then Space". -->
-	<string name="list_camera_ctrlaspace">Ctrl+A then Space</string>
+	<string name="list_camera_ctrlaspace">Ctrl+A 然后 Space</string>
 	<!-- Selection to indicate pressing the Camera button should send "Ctrl+A". -->
 	<string name="list_camera_ctrla">Ctrl+A</string>
 	<!-- Selection to indicate pressing the Camera button should send the "Esc" key. -->
 	<string name="list_camera_esc">Esc</string>
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
-	<string name="list_camera_none">None</string>
+	<string name="list_camera_none">无</string>
+
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">删除</string>
 
-	<string name="delete_message">Are you sure you want to delete '%1$s'?</string>
-	<string name="delete_pos">Yes, delete</string>
-	<string name="delete_neg">Cancel</string>
+	<string name="delete_message">确定要删除'%1$s'吗？</string>
+	<string name="delete_pos">是，删除</string>
+	<string name="delete_neg">取消</string>
 
 	<!-- Button to agree to license terms. -->
-	<string name="wizard_agree">Agree</string>
+	<string name="wizard_agree">同意</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
-	<string name="wizard_next">Next</string>
+	<string name="wizard_next">下一页</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
-	<string name="wizard_back">Back</string>
+	<string name="wizard_back">返回</string>
 
-	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
+	<string name="terminal_no_hosts_connected">当前没有已连接主机</string>
 
-	<string name="terminal_failed">Host key verification failed.</string>
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
 
-	<string name="terminal_auth">Trying to authenticate</string>
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
+	<string name="terminal_failed">主机验证失败</string>
 
-	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">Password</string>
-	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
 
-	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
-	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
-	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth">尝试验证</string>
 
-	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
-	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
+	<string name="terminal_auth_pass">尝试进行用户口令认证</string>
+	<string name="terminal_auth_pass_fail">密码验证失败</string>
 
-	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
+	<string name="terminal_auth_pubkey_any">尝试使用保存在内存中的公匙进行用户认证</string>
+	<string name="terminal_auth_pubkey_invalid">所选择的公钥无法使用，请在主机编辑中尝试重新选择</string>
+	<string name="terminal_auth_pubkey_specific">尝试进行与某个公匙相关的公匙用户认证</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
-	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
+	<string name="terminal_auth_ki">尝试键盘交互式认证</string>
+	<string name="terminal_auth_ki_fail">键盘交互式认证失败</string>
+
+	<string name="terminal_auth_fail">[你的主机不支持用户口令认证或键盘交互式认证]</string>
+
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
+	<string name="local_shell_unavailable">失败! 本地Shell在该手机上不可用</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
-	<string name="notification_text">%1$s wants your attention.</string>
+	<string name="notification_text">%1$s 需要你的注意</string>
 
 	<!-- Dialog title when a new version of ConnectBot is detected. -->
-	<string name="upgrade">New version</string>
+	<string name="upgrade">新版本</string>
 	<!-- Button selection to upgrade to the latest ConnectBot when one is available. -->
-	<string name="upgrade_pos">Yes, upgrade</string>
+	<string name="upgrade_pos">是，升级</string>
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
-	<string name="upgrade_neg">Not right now</string>
+	<string name="upgrade_neg">暂时不</string>
+
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">似乎ConnectBot在最后运行时出现异常. 请回报给ConnectBot开发者</string>
 
-	<string name="color_red">red</string>
-	<string name="color_green">green</string>
-	<string name="color_blue">blue</string>
-	<string name="color_gray">gray</string>
+	<string name="color_red">红</string>
+	<string name="color_green">绿</string>
+	<string name="color_blue">蓝</string>
+	<string name="color_gray">灰</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 09bd915..dbd4a09 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -13,6 +13,8 @@
 	<string name="title_host_editor">編輯主機</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">幫助</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">連接</string>
 	<string name="resolve_entropy">Gather Entropy</string>
@@ -44,6 +46,8 @@
 	<string name="pubkey_memory_load">載入內存中</string>
 	<string name="pubkey_memory_unload">從內存中移除</string>
 	<string name="pubkey_load_on_start">在啟動的時候載入密鑰</string>
+	<!-- Pubkey preference asking user whether the key use should be confirmed via prompt before it can be used for authentication -->
+	<string name="pubkey_confirm_use">Confirm before use</string>
 
 	<string name="portforward_list_empty">按「菜單」鍵建端口轉發</string>
 	<string name="portforward_edit">編輯端口轉發</string>
@@ -69,6 +73,9 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">密鑰「%1$s」的密碼</string>
 
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<string name="prompt_allow_agent_to_use_key">Allow remote host to\nuse key '%1$s'?</string>
+
 	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
 	<string name="host_verification_failure_warning_header">警告：遠程主機的標誌已經改變</string>
 	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
@@ -214,6 +221,9 @@
 	<!-- Host pubkey usage preference title -->
 	<string name="hostpref_pubkeyid_title">Use pubkey authentication</string>
 
+	<!-- Preference title for the SSH Authentication Agent Forwarding for a host connection -->
+	<string name="hostpref_authagent_title">Use SSH auth agent</string>
+
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-login automation</string>
 	<!-- Host post-login automation preference summary -->
@@ -229,6 +239,11 @@
 	<!-- Summary for field asking whether a shell session should be started up upon connection or not -->
 	<string name="hostpref_wantsession_summary">Disable this preference to only use port forwards</string>
 
+	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_title">DEL Key</string>
+	<!-- Summary for field asking what key code is sent to the server when DEL key is pressed. -->
+	<string name="hostpref_delkey_summary">The key code sent when DEL key is pressed</string>
+
 	<!-- Host character encoding preference title -->
 	<string name="hostpref_encoding_title">Encoding</string>
 	<!-- Host character encoding preference summary -->
@@ -286,17 +301,17 @@
 	<string name="portforward_menu_add">Add port forward</string>
 
 	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">user@hostname</string>
+	<string name="hint_userhost">用戶名@主機名</string>
 
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
 	<string name="list_format_error">Use the format "%1$s"</string>
 
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-        <string name="format_username">username</string>
+	<string name="format_username">用戶名</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-	<string name="format_hostname">hostname</string>
+	<string name="format_hostname">主機名</string>
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
-	<string name="format_port">port</string>
+	<string name="format_port">端口</string>
 
 	<string name="list_menu_pubkeys">Manage Pubkeys</string>
 	<!-- Selection choice to sort hosts by color. -->
@@ -327,6 +342,11 @@
 	<!-- Selection to indicate pressing the Camera button should send nothing at all. -->
 	<string name="list_camera_none">None</string>
 
+	<!-- Name for the backspace character -->
+	<string name="list_delkey_backspace">Backspace</string>
+	<!-- Name for the ASCII DEL character -->
+	<string name="list_delkey_del">Delete</string>
+
 	<string name="delete_message">您是否確實要刪除「%1$s」？</string>
 	<string name="delete_pos">是的，刪除</string>
 	<string name="delete_neg">Cancel</string>
@@ -340,23 +360,39 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
+	<!-- Displayed in terminal when attempting to connect to a host. The first two
+	     variables are host:port and the third is the protocol (e.g., SSH) -->
+	<string name="terminal_connecting">Connecting to %1$s:%2$d via %3$s</string>
+
+	<!-- Displays the host key to the user in the terminal -->
+	<string name="terminal_sucess">Verified host '%1$s' key: %2$s</string>
 	<string name="terminal_failed">Host key verification failed.</string>
 
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_s2c_algorithm">Server-to-client algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_c2s_algorithm">Client-to-server algorithm: %1$s %2$s</string>
+	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
+	<string name="terminal_using_algorithm">Using algorithm: %1$s %2$s</string>
+
 	<string name="terminal_auth">Trying to authenticate</string>
 
 	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
-	<string name="terminal_auth_pass_hint">密碼</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
 	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
 	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
 	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+	<string name="terminal_auth_pubkey_fail">Authentication method 'publickey' with key '%1$s' failed</string>
 
 	<string name="terminal_auth_ki">Attempting 'keyboard-interactive' authentication</string>
 	<string name="terminal_auth_ki_fail">Authentication method 'keyboard-interactive' failed</string>
 
 	<string name="terminal_auth_fail">[Your host doesn't support 'password' or 'keyboard-interactive' authentication.]</string>
 
+	<string name="terminal_no_session">Session will not be started due to host preference.</string>
+	<string name="terminal_enable_portfoward">Enable port forward: %1$s</string>
+
 	<string name="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</string>
 
 	<!-- Text sent to the user to alert them that a Terminal Bell is received in a background session -->
@@ -369,6 +405,9 @@
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Not right now</string>
 
+	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
+	<string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?</string>
+
 	<string name="color_red">紅色</string>
 	<string name="color_green">綠色</string>
 	<string name="color_blue">藍色</string>