23 files changed, 1127 insertions, 310 deletions
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 862c6d6..1de4cc0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Прост, мощен SSH клиент с отворен код</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Свържи</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Добави хост</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Генериране</string>
 	<string name="pubkey_import">Импортиране</string>
 	<string name="pubkey_delete">Клавиш Delete</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
 	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
 	<string name="pubkey_generating">Generating key pair...</string>
 	<string name="pubkey_copy_private">Копира частния ключ</string>
 	<string name="pubkey_copy_public">Копира публичния ключ</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
 	<string name="pubkey_unknown_format">Непознат формат</string>
 	<string name="pubkey_change_password">Промени паролата</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Променете пренасочването на портове</string>
 	<string name="portforward_delete">Изтрийте пренасочването на портове</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Запазени права © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal emulation</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 31c5567..5939122 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Client SSH simple, potent i lliure</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Connecta</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Recull Entropia</string>
 
 	<string name="menu_insert">Afegeix servidor</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Genera</string>
 	<string name="pubkey_import">Importa</string>
 	<string name="pubkey_delete">Elimina la clau</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Recull Entropia</string>
 	<string name="pubkey_touch_prompt">Toca aquesta caixa per obtenir aleatorietat: %1$d%% completat</string>
 	<string name="pubkey_touch_hint">Per assegurar l'aleatorietat durant la generació de la clau, mou el dit aleatoriament per sobre la caixa de sota.</string>
 	<string name="pubkey_generating">Generant parell de claus...</string>
 	<string name="pubkey_copy_private">Còpia la clau privada</string>
 	<string name="pubkey_copy_public">Còpia la clau pública</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Pulsa "Menu" per crear\no importar parells de claus.</string>
 	<string name="pubkey_unknown_format">Format desconegut</string>
 	<string name="pubkey_change_password">Canvia la contrasenya</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Confirmar abans d'usar</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Pulsa "Menu" per crear\nredireccions de ports.</string>
 	<string name="portforward_edit">Edita redireccions de ports</string>
 	<string name="portforward_delete">Elimina redireccions de ports</string>
@@ -73,7 +76,7 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Contrasenya per la clau '%1$s'</string>
 
-	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">Permet al servidor remot\nutilitzar la clau '%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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Emulador del terminal</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copiats %1$d bytes al porta-retalls</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. -->
+	<!-- 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">Toca i arrosega\no fes servir les tecles de direcció\nper escollir l'àrea a copiar</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Edita el servidor</string>
 	<string name="list_host_portforwards">Edita el redireccionament de ports</string>
 	<string name="list_host_delete">Elimina servidors</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Utilitza el quadre de connexió ràpida\nde sota per connectar al servidor</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9e580c2..0c9f9a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Simple, powerful, open-source SSH client.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Barvy</string>
 
 	<string name="resolve_connect">Připojit</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Přidat hostitele</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Generate</string>
 	<string name="pubkey_import">Importovat</string>
 	<string name="pubkey_delete">Smazat klíč</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
 	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
 	<string name="pubkey_generating">Generating key pair...</string>
 	<string name="pubkey_copy_private">Kopírovat soukromý klíč</string>
 	<string name="pubkey_copy_public">Kopírovat veřejný klíč</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
 	<string name="pubkey_unknown_format">Neznámý formát</string>
 	<string name="pubkey_change_password">Změnit heslo</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
 	<string name="portforward_delete">Delete port forward</string>
@@ -73,7 +76,7 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Heslo pro klíč '%1$s'</string>
 
-	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminálová emulace</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copied %1$d bytes to clipboard</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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d5acba2..2476564 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Enkel, kraftfuld, open source SSH klient</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Tilslut</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Indsamler entropi</string>
 
 	<string name="menu_insert">Tilføj vært</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Generer</string>
 	<string name="pubkey_import">Importér</string>
 	<string name="pubkey_delete">Slet nøgle</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Indsamler entropi</string>
 	<string name="pubkey_touch_prompt">Berør denne boks for at generere tilfældighed: %1$d%% færdig</string>
 	<string name="pubkey_touch_hint">For at garantere tilfældig data til skabelsen af nøglen, skal du flytte din finger tilfældigt indenfor boksen nedenfor.</string>
 	<string name="pubkey_generating">Generer nøglepar...</string>
 	<string name="pubkey_copy_private">Kopier privat nøgle</string>
 	<string name="pubkey_copy_public">Kopier offentlig nøgle</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tryk "Menu" for at skabe\neller importere nøglepar.</string>
 	<string name="pubkey_unknown_format">Ukendt format</string>
 	<string name="pubkey_change_password">Ændre adgangskode</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tryk "Menu" for at oprette\nport-videresendelser.</string>
 	<string name="portforward_edit">Rediger port-videresendelse</string>
 	<string name="portforward_delete">Slet port-videresendelse</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (arbejdskopi)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Stands emulation</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Kopier %1$d bytes til udklipsholder</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. -->
+	<!-- 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">Berør og flyt\neller brug piletasterne\nfor at vælge område at kopiere</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Redigér vært</string>
 	<string name="list_host_portforwards">Redigér portvideresendelse</string>
 	<string name="list_host_delete">Slet vært</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Anvend hurtig-forbind boksen\nnedenfor for at oprette forbindelse\n til en vært.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ad86482..b187a75 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Einfacher, mächtiger, open-source SSH client.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Farben</string>
 
 	<string name="resolve_connect">Verbinden</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Sammle Entropie</string>
 
 	<string name="menu_insert">Host hinzufügen</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Erzeugen</string>
 	<string name="pubkey_import">Importieren</string>
 	<string name="pubkey_delete">Schlüssel löschen</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Sammle Entropie</string>
 	<string name="pubkey_touch_prompt">Berühren Sie diese Box, um Zufallszahlen zu erzeugen: %1$d%% fertig</string>
 	<string name="pubkey_touch_hint">Um eine gute Zufallsverteilung zu gewährleisten, bewegen Sie Ihren Finger zufällig über die Box unten!</string>
 	<string name="pubkey_generating">Erzeuge Schlüsselpaar...</string>
 	<string name="pubkey_copy_private">Privaten Schlüssel kopieren</string>
 	<string name="pubkey_copy_public">Öffentlichen Schlüssel kopieren</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">"Menu" drücken, um Schlüsselpaare\nzu erzeugen oder importieren.</string>
 	<string name="pubkey_unknown_format">Unbekanntes Format</string>
 	<string name="pubkey_change_password">Passwort ändern</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Bestätigen vor Benutzung</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">"Menu" tippen, um Port-\nWeiterleitungen zu erzeugen.</string>
 	<string name="portforward_edit">Port-Weiterleitung editieren.</string>
 	<string name="portforward_delete">Port-Weiterleitung löschen.</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">Remote Host die Benutzung\ndes Schlüssels '%1$s' erlauben?</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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminalemulation</string>
 
@@ -240,9 +237,9 @@
 	<string name="hostpref_wantsession_summary">Diese Einstellung abwählen, um ausschließlich Port-Weiterleitungen zu verwenden</string>
 
 	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
-	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<string name="hostpref_stayconnected_title">Verbindung halten</string>
 	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
-	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</string>
+	<string name="hostpref_stayconnected_summary">Verbindung bei Verbindungsabbruch wiederherstellen</string>
 
 	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
 	<string name="hostpref_delkey_title">DEL Taste</string>
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d Byte in die Zwischenablage kopiert</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. -->
+	<!-- 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">Berühren und ziehen\noder Trackball verwenden\num zu kopierenden Bereich auszuwählen</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Host editieren</string>
 	<string name="list_host_portforwards">Port-Weiterleitungen editieren</string>
 	<string name="list_host_delete">Host löschen</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Benutzen Sie die quick-connect box\nunten um sich mit einem Host zu verbinden.</string>
 
 	<!-- Default screen rotation preference selection -->
@@ -415,7 +413,7 @@
 	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
 	<string name="no">Nein</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
-	<string name="with_confirmation">With confirmation</string>
+	<string name="with_confirmation">Mit Bestätigung</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
 	<string name="yes">Ja</string>
 
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c8c4d55..27121fe 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Simple, poderoso, cliente SSH de código abierto.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colores</string>
 
 	<string name="resolve_connect">Conectar</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Recolectar entropía</string>
 
 	<string name="menu_insert">Añadir equipo remoto</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Generar</string>
 	<string name="pubkey_import">Importar</string>
 	<string name="pubkey_delete">Eliminar clave</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Haciendo acopio de entropía</string>
 	<string name="pubkey_touch_prompt">Toque esta caja para conseguir aleatoriedad: %1$d%% hecho</string>
 	<string name="pubkey_touch_hint">Para poder conseguir aleatoriedad durante la generacion de la clave, mueva su dedo aleatoriamente sobre la caja a continuación.</string>
 	<string name="pubkey_generating">Generar llavero de claves</string>
 	<string name="pubkey_copy_private">Copiar clave privada</string>
 	<string name="pubkey_copy_public">Copiar clave pública</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Presione "menu" para crear\nó importar un llavero de claves</string>
 	<string name="pubkey_unknown_format">Formato desconocido</string>
 	<string name="pubkey_change_password">Cambiar contraseña</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Confirme antes de usar</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Presione "Menu" para crear\nó importar redireccionamientos.</string>
 	<string name="portforward_edit">Editar redireccionamiento de puerto</string>
 	<string name="portforward_delete">Eliminar redireccionamiento de puerto</string>
@@ -73,7 +76,7 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Contraseña para clave '%1$s'</string>
 
-	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">¿Autorizar maquina remota\nde usar clave '%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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Todos los derechos reservados © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (Copia funcionando)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Emulación del terminal</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d bytes copiados al portapaleles</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. -->
+	<!-- 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">Toque y arrastre\no use la almohadilla direccional\npara seleccionar la zona a copiar</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Editar equipo</string>
 	<string name="list_host_portforwards">Editar redirección de puertos</string>
 	<string name="list_host_delete">Eliminar equipo</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 56808f2..bfc54ba 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Erraza, boteretsua, sftware askeko SSH bezeroa</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Connect</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Gehitu ostalaria</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Sortu</string>
 	<string name="pubkey_import">Inportatu</string>
 	<string name="pubkey_delete">Ezabatu giltza</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
 	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
 	<string name="pubkey_generating">Giltz parea sortzen...</string>
 	<string name="pubkey_copy_private">Kopiatu giltz pribatua</string>
 	<string name="pubkey_copy_public">Kopiatu giltz publikoa</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
 	<string name="pubkey_unknown_format">Formatu ezezaguna</string>
 	<string name="pubkey_change_password">Aldatu pasahitza</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
 	<string name="portforward_delete">Delete port forward</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal emulation</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copied %1$d bytes to clipboard</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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
new file mode 100644
index 0000000..0cf0d09
--- /dev/null
+++ b/res/values-fi/strings.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_desc">Yksinkertainen, tehokas, vapaan koodin ssh asiakas.</string>
+
+	<!-- Window title for the Host List -->
+	<string name="title_hosts_list">Isännät</string>
+	<!-- Window title for the Pubkeys List -->
+	<string name="title_pubkey_list">Pubkeys</string>
+	<!-- Window title for the Port Forwards List -->
+	<string name="title_port_forwards_list">Port forwards</string>
+	<!-- Window title when editing host details -->
+	<string name="title_host_editor">Muokkaa isäntää</string>
+	<!-- Window title for Help index -->
+	<string name="title_help">Ohje</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Värit</string>
+
+	<string name="resolve_connect">Yhdistä</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
+	<string name="resolve_entropy">Gather Entropy</string>
+
+	<string name="menu_insert">Lisää isäntä</string>
+	<string name="menu_delete">Poista isäntä</string>
+	<string name="menu_preferences">Asetukset</string>
+
+	<string name="help_intro">Ole hyvä ja valitse alta aihe, josta haluaisit tietää lisää.</string>
+	<string name="help_about">Tietoja ConnectBotista</string>
+	<string name="help_keyboard">Näppäimistö</string>
+
+	<string name="pubkey_generate">Luo</string>
+	<string name="pubkey_import">Tuo</string>
+	<string name="pubkey_delete">Poista avain</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
+	<string name="pubkey_gather_entropy">Gathering Entropy</string>
+	<string name="pubkey_touch_prompt">Kosketa tätä laatikkoa kerätäksesi satunaisuutta: %1$d%% valmiina</string>
+	<string name="pubkey_touch_hint">Varmistaaksesi avaimen luonnin satunnaisuuden, liikuta sormeasi alla olevan laatikon kohdalla sattumanvaraisesti.</string>
+	<string name="pubkey_generating">Luodaan avain paria...</string>
+	<string name="pubkey_copy_private">Kopio yksityinen avain</string>
+	<string name="pubkey_copy_public">Kopioi julkinen avain</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
+	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
+	<string name="pubkey_unknown_format">Tuntematon tyyppi</string>
+	<string name="pubkey_change_password">Vaihda salasana</string>
+	<string name="pubkey_list_pick">Valitse /sdcard ilta</string>
+	<string name="pubkey_import_parse_problem">Ongelma jäsennettäessä tutua avainparia</string>
+	<string name="pubkey_unlock">Unlock key</string>
+	<string name="pubkey_failed_add">Bad password for key '%1$s'. Authentication failed.</string>
+	<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>
+
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
+	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
+	<string name="portforward_edit">Edit port forward</string>
+	<string name="portforward_delete">Delete port forward</string>
+
+	<string name="prompt_nickname">Nickname:</string>
+	<!-- An example string that could be used as a nickname for a pubkey. -->
+	<string name="prompt_nickname_hint_pubkey">My work key</string>
+	<!-- The source TCP port for port forwards. -->
+	<string name="prompt_source_port">Source port:</string>
+	<!-- The "host:port" combination used for port forward destinations. -->
+	<string name="prompt_destination">Destination:</string>
+	<string name="prompt_old_password">Old password:</string>
+	<string name="prompt_password">Password:</string>
+	<!-- Added after a "Password:" prompt to indicate user needs to confirm entry. -->
+	<string name="prompt_again">(again)</string>
+	<!-- Label for the user to select port forward type. -->
+	<string name="prompt_type">Type:</string>
+	<string name="prompt_password_can_be_blank">Note: password can be blank</string>
+	<!-- Prompt for the size of the private key in bits. -->
+	<string name="prompt_bits">Bits:</string>
+
+	<!-- 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. Note that the '\n' means split the line so it's actually "host to use 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. -->
+	<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>
+
+	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
+	<string name="prompt_host_disconnected">Host has disconnected.\nClose session?</string>
+	<!-- Prompt user must answer yes or no to when the remote host fails verification of encryption fingerprint -->
+	<string name="prompt_continue_connecting">Are you sure you want\nto continue connecting?</string>
+
+	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
+	<string name="host_authenticity_warning">The authenticity of host '%1$s' can't be established.</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="alert_passwords_do_not_match_msg">Passwords do not match!</string>
+	<string name="alert_wrong_password_msg">Wrong password!</string>
+	<string name="alert_key_corrupted_msg">Private key appears corrupt!</string>
+	<string name="alert_sdcard_absent">SD card is not inserted!</string>
+
+	<!-- Add a new item (e.g., host or pubkey) to the list. -->
+	<string name="button_add">Add</string>
+	<!-- Change an existing item's (e.g., host or pubkey) details. -->
+	<string name="button_change">Change</string>
+	<!-- Button that begins the generation of a public key pair. -->
+	<string name="button_generate">Generate Key</string>
+	<!-- Button that resizes the screen to the user-specified dimensions. -->
+	<string name="button_resize">Resize</string>
+
+	<string name="alert_disconnect_msg">Connection Lost</string>
+
+	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
+
+	<!-- The category title for terminal emulation preferences. -->
+	<string name="pref_emulation_category">Terminal emulation</string>
+
+	<!-- Name for the emulation terminal type preference. -->
+	<string name="pref_emulation_title">Emulation mode</string>
+	<!-- Description of the emulation terminal type preference. -->
+	<string name="pref_emulation_summary">Terminal emulation mode to use for PTY connections</string>
+
+	<!-- Name for the scrollback size preference -->
+	<string name="pref_scrollback_title">Scrollback size</string>
+	<!-- Description of the scrollback size preference -->
+	<string name="pref_scrollback_summary">Size of scrollback buffer to keep in memory for each console</string>
+
+	<!-- The category title for user interface preferences -->
+	<string name="pref_ui_category">User interface</string>
+
+	<!-- Name for the rotation mode preference -->
+	<string name="pref_rotation_title">Rotation mode</string>
+	<!-- Summary for the rotation mode preference -->
+	<string name="pref_rotation_summary">How to change rotation when keyboard popped in/out</string>
+
+	<!-- Name for the full screen preference -->
+	<string name="pref_fullscreen_title">Full screen</string>
+	<!-- Summary for the full screen preference -->
+	<string name="pref_fullscreen_summary">Hide status bar while in console</string>
+
+	<!-- Name for the memorize keys preference -->
+	<string name="pref_memkeys_title">Remember keys in memory</string>
+	<!-- Summary for the memorize keys preference -->
+	<string name="pref_memkeys_summary">Keep unlocked keys in memory until backend service is terminated</string>
+
+	<!-- Name for the update check preference -->
+	<string name="pref_update_title">Update check</string>
+	<!-- Summary for the update check preference -->
+	<string name="pref_update_summary">Set the maximum frequency to check for ConnectBot updates</string>
+
+	<!-- Name for the keyboard shortcuts preference -->
+	<string name="pref_keymode_title">Directory shortcuts</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>
+	<!-- Summary for the camera shortcut usage preference -->
+	<string name="pref_camera_summary">Select which shortcut to trigger when the camera button is pushed</string>
+
+	<!-- Name for the keep screen on preference -->
+	<string name="pref_keepalive_title">Keep screen awake</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>
+
+	<!-- Name for the Wi-Fi lock preference -->
+	<string name="pref_wifilock_title">Keep Wi-Fi active</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>
+
+	<!-- 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>
+
+	<!-- Category title for the Terminal Bell preferences -->
+	<string name="pref_bell_category">Terminal bell</string>
+
+	<!-- Checkbox preference title for the audible terminal bell feature -->
+	<string name="pref_bell_title">Audible bell</string>
+
+	<!-- Title for the slider preference to set the volume -->
+	<string name="pref_bell_volume_title">Bell volume</string>
+
+	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
+	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+
+	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
+	<string name="pref_bell_notification_title">Background notifications</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>
+
+	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
+	<string name="list_keymode_right">Use right-side keys</string>
+	<!-- Preference selection to indicate use of left side of keyboard for special shortcuts. -->
+	<string name="list_keymode_left">Use left-side keys</string>
+	<!-- Preference selection to indicate never to use special shortcut keys. -->
+	<string name="list_keymode_none">Disable</string>
+
+	<!-- Preference to not use pubkeys to authenticate to this host. -->
+	<string name="list_pubkeyids_none">Do not use keys</string>
+	<!-- Preference to use any pubkey to authenticate to this host. -->
+	<string name="list_pubkeyids_any">Use any unlocked key</string>
+
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_daily">Daily</string>
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_weekly">Weekly</string>
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_never">Never</string>
+
+	<!-- Host nickname field preference title -->
+	<string name="hostpref_nickname_title">Nickname</string>
+
+	<!-- Host color category preference title -->
+	<string name="hostpref_color_title">Color category</string>
+
+	<!-- 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 -->
+	<string name="hostpref_postlogin_summary">Commands to run on remote server once authenticated</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>
+
+	<!-- 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>
+
+	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
+	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
+	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</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 -->
+	<string name="hostpref_encoding_summary">Character encoding for the host</string>
+
+	<!-- Host preference category title for connection settings -->
+	<string name="hostpref_connection_category">Connection settings</string>
+
+	<!-- Username field title for host editor preference -->
+	<string name="hostpref_username_title">Username</string>
+
+	<!-- Hostname field title for host editor preference -->
+	<string name="hostpref_hostname_title">Host</string>
+
+	<!-- Port field title for host editor preference -->
+	<string name="hostpref_port_title">Port</string>
+
+	<!-- Displayed to indicate a host has never been connected to. -->
+	<string name="bind_never">Never connected</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>
+	<!-- 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>
+
+	<!-- Message given when user copies from the terminal. -->
+	<string name="console_copy_done">Copied %1$d bytes to clipboard</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>
+
+	<!-- Button to close the disconnected terminal window. -->
+	<string name="console_menu_close">Close</string>
+	<!-- Button to begin copying from the terminal to the clipboard. -->
+	<string name="console_menu_copy">Copy</string>
+	<!-- Button to paste from the clipboard to the terminal. -->
+	<string name="console_menu_paste">Paste</string>
+	<!-- Button that brings user to the Port Forwards List. -->
+	<string name="console_menu_portforwards">Port Forwards</string>
+	<!-- Button that brings user to the terminal resizing dialog where they can force a size. -->
+	<string name="console_menu_resize">Force Size</string>
+	<!-- Button that brings up the list of URLs on the current screen -->
+	<string name="console_menu_urlscan">URL Scan</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>
+	<!-- 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>
+	<!-- 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_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_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>
+
+	<!-- 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>
+	<!-- 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 -->
+	<string name="format_port">port</string>
+
+	<string name="list_menu_pubkeys">Manage Pubkeys</string>
+	<!-- Selection choice to sort hosts by color. -->
+	<string name="list_menu_sortcolor">Sort by color</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_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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
+	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</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>
+	<!-- Selection to indicate the rotation should be selected automatically based on the tilt sensor. -->
+	<string name="list_rotation_auto">Automatic</string>
+
+	<!-- Selection to indicate pressing the Camera button should send "Ctrl+A then Space". -->
+	<string name="list_camera_ctrlaspace">Ctrl+A then 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>
+
+	<!-- 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>
+
+	<!-- Button to agree to license terms. -->
+	<string name="wizard_agree">Agree</string>
+	<!-- Button to go to the next page in the first time start-up wizard. -->
+	<string name="wizard_next">Next</string>
+	<!-- Button to go to the previous page in the first time start-up wizard. -->
+	<string name="wizard_back">Back</string>
+
+	<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_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 -->
+	<string name="notification_text">%1$s wants your attention.</string>
+
+	<!-- Dialog title when a new version of ConnectBot is detected. -->
+	<string name="upgrade">New version</string>
+	<!-- Button selection to upgrade to the latest ConnectBot when one is available. -->
+	<string name="upgrade_pos">Yes, upgrade</string>
+	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
+	<string name="upgrade_neg">Not right now</string>
+
+	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
+	<string name="no">No</string>
+	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
+	<string name="with_confirmation">With confirmation</string>
+	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
+	<string name="yes">Yes</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>
+	<string name="color_gray">gray</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 119b60a..1807a51 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Un client SSH simple, open-source et puissant.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Couleurs</string>
 
 	<string name="resolve_connect">Connexion</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Génération d'aléatoire</string>
 
 	<string name="menu_insert">Ajouter un serveur</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Générer</string>
 	<string name="pubkey_import">Importer</string>
 	<string name="pubkey_delete">Supprimer la clé</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Génération d'aléatoire</string>
-	<string name="pubkey_touch_prompt">Touchez cette boîte pour récupérer un nombre aléatoire: %1$d%% fait</string>
+	<string name="pubkey_touch_prompt">Touchez cette boîte pour récupérer un nombre aléatoire : %1$d%% fait</string>
 	<string name="pubkey_touch_hint">Afin d'assurer la qualité des nombres aléatoires utilisés pendant la génération de la clé, merci de bouger votre doigt de façon aléatoire sur la boîte ci-dessous.</string>
 	<string name="pubkey_generating">Génération de la paire de clés en cours...</string>
 	<string name="pubkey_copy_private">Copier la clé privée</string>
 	<string name="pubkey_copy_public">Copier la clé publique</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Cliquer sur le "Menu" pour créer\nou importer des paires de clés.</string>
 	<string name="pubkey_unknown_format">Format inconnu</string>
 	<string name="pubkey_change_password">Changer le mot de passe</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Confirmer avant utilisation</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<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>
 	<string name="portforward_delete">Effacez la redirection de port</string>
@@ -59,25 +62,25 @@
 	<!-- The source TCP port for port forwards. -->
 	<string name="prompt_source_port">Port source:</string>
 	<!-- The "host:port" combination used for port forward destinations. -->
-	<string name="prompt_destination">Destination:</string>
+	<string name="prompt_destination">Destination :</string>
 	<string name="prompt_old_password">Ancien mot de passe:</string>
 	<string name="prompt_password">Mot de passe:</string>
 	<!-- Added after a "Password:" prompt to indicate user needs to confirm entry. -->
 	<string name="prompt_again">(encore)</string>
 	<!-- Label for the user to select port forward type. -->
-	<string name="prompt_type">Type:</string>
+	<string name="prompt_type">Type :</string>
 	<string name="prompt_password_can_be_blank">Note: le mot de passe peux être vide</string>
 	<!-- Prompt for the size of the private key in bits. -->
-	<string name="prompt_bits">Bits:</string>
+	<string name="prompt_bits">Bits :</string>
 
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">Autoriser l'hôte distant à\nutiliser la clé '%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>
+	<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. -->
 	<string name="host_verification_failure_warning">IL EST POSSIBLE QUE QUELQU'UN FASSE QUELQUE CHOSE DE NUISIBLE !\nQuelqu'un pourrait vous écouter en ce moment (attaque de l'homme du milieu) !\nIl est aussi possible que la clé du serveur ait juste changée.</string>
 
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (copie de travail)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Emulation du mode terminal</string>
 
@@ -277,7 +274,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. -->
+	<!-- 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">Toucher et tirer\nou utiliser les touches directionelles\npour selectioner la region à copier</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Editer le serveur</string>
 	<string name="list_host_portforwards">Editer les redirections de port</string>
 	<string name="list_host_delete">Effacer le serveur</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<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 -->
@@ -376,9 +374,9 @@
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
-	<string name="terminal_using_s2c_algorithm">Algorithme serveur vers client: %1$s %2$s</string>
+	<string name="terminal_using_s2c_algorithm">Algorithme serveur vers client : %1$s %2$s</string>
 	<!-- Displayed on the terminal describing the cryptographic algorithm names -->
-	<string name="terminal_using_c2s_algorithm">Algorithme client vers serveur: %1$s %2$s</string>
+	<string name="terminal_using_c2s_algorithm">Algorithme client vers serveur : %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>
 
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index d68b85c..3c88cf6 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Sederhana, kuat, klien kode terbuka SSH</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Hubungi</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Kumpulkan entropy</string>
 
 	<string name="menu_insert">Tambahkan host</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Buat</string>
 	<string name="pubkey_import">Impor</string>
 	<string name="pubkey_delete">Tombol Hapus</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Kumpulkan Entropy</string>
 	<string name="pubkey_touch_prompt">Sentuh  boks ini untuk mengumpulkan ke tidak tentuan: %1$d%% selesai</string>
 	<string name="pubkey_touch_hint">Untuk menyakinkan ketidak tentuan selama pembuatan kunci, gerakan tangan anda secara tidak menentu diatas kotak dibawah.</string>
 	<string name="pubkey_generating">Membuat pasangan kunci</string>
 	<string name="pubkey_copy_private">Menyalin kunci pribadi</string>
 	<string name="pubkey_copy_public">Salin kunci publik</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Sentuh "Menu" untuk membuat/atau mengimpor pasangan kunci</string>
 	<string name="pubkey_unknown_format">Format tidak diketahui</string>
 	<string name="pubkey_change_password">Ubah kata sandi</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Sentu "Menu" untuk membuat\nport forwards.</string>
 	<string name="portforward_edit">Ubah port forward</string>
 	<string name="portforward_delete">Hapus port forward</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Hak Cipta © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (salinan yang bekerja)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal Emulasi</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Tersalin %1$d bytes ke papan klip</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. -->
+	<!-- 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">Sentuh dan tarik\natau gunakan tombol panah\nuntuk memilih daerah untuk disalin</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Ubah host</string>
 	<string name="list_host_portforwards">Ubah port forwards</string>
 	<string name="list_host_delete">Hapus host</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Gunakan kotak cepat-hubungi\ndibawah untuk menghubungi sebuah host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ca932c9..8b82c2c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Un client SSH semplice, potente ed open-source.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colori</string>
 
 	<string name="resolve_connect">Connetti</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Creazione entropia</string>
 
 	<string name="menu_insert">Aggiungi connessione</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Genera</string>
 	<string name="pubkey_import">Importa</string>
 	<string name="pubkey_delete">Cancella chiave</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Creazione entropia</string>
 	<string name="pubkey_touch_prompt">Toccare il riquadro per ottenere la randomicità: %1$d%% fatto</string>
 	<string name="pubkey_touch_hint">Per poter assicurare la randomicità durante la generazione della chiave, muovere le dita casualmente sul riquadro sottostante.</string>
 	<string name="pubkey_generating">La coppia di chiavi viene generata...</string>
 	<string name="pubkey_copy_private">Copia chiave privata</string>
 	<string name="pubkey_copy_public">Copia chiave pubblica</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Seleziona "Menu" per creare\no importare chiavi.</string>
 	<string name="pubkey_unknown_format">Formato non riconosciuto</string>
 	<string name="pubkey_change_password">Cambia password</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Conferma prima di usare</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Selezione "Menu" per creare\ninoltri delle porte.</string>
 	<string name="portforward_edit">Modifica inoltro porte</string>
 	<string name="portforward_delete">Elimina inoltro porta</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">Permetti all'host remoto di\n usare la chiave '%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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (copia di lavoro)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Emulazione terminale</string>
 
@@ -240,9 +237,9 @@
 	<string name="hostpref_wantsession_summary">Disabilita questa preferenza per usare solo port forward</string>
 
 	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
-	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<string name="hostpref_stayconnected_title">Mantieni le connessioni</string>
 	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
-	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</string>
+	<string name="hostpref_stayconnected_summary">Tenta di riconnettersi in caso di disconnessione</string>
 
 	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
 	<string name="hostpref_delkey_title">Tasto DEL</string>
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d byte copiati</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. -->
+	<!-- 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">Tocca e trascina\noppure usa il pad direzionale\nper selezionare un area da copiare</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Modifica connessione</string>
 	<string name="list_host_portforwards">Modifica inoltri porta</string>
 	<string name="list_host_delete">Elimina connessione</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Usa la casella connessione rapida\nqui sotto per connetterti ad un host.</string>
 
 	<!-- Default screen rotation preference selection -->
@@ -415,7 +413,7 @@
 	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
 	<string name="no">No</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
-	<string name="with_confirmation">With confirmation</string>
+	<string name="with_confirmation">Richiedi conferma</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
 	<string name="yes">Sì</string>
 
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 66a2f6c..2a26523 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">シンプルでパワフルなオープンソースのSSHクライアント</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">配色</string>
 
 	<string name="resolve_connect">接続</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">エントロピー収集</string>
 
 	<string name="menu_insert">ホストを追加</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">生成</string>
 	<string name="pubkey_import">インポート</string>
 	<string name="pubkey_delete">鍵を削除</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<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>
 	<string name="pubkey_copy_private">秘密鍵をコピー</string>
 	<string name="pubkey_copy_public">公開鍵をコピー</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">"Menu"ボタンを押して鍵の作成またはインポートを行ってください。</string>
 	<string name="pubkey_unknown_format">不明なフォーマット</string>
 	<string name="pubkey_change_password">パスワードを変更</string>
@@ -49,6 +51,7 @@
 	<!-- 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">使用時に確認する</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">MENUをタップして\nポート転送を作成します．</string>
 	<string name="portforward_edit">ポート転送を編集</string>
 	<string name="portforward_delete">ポート転送を削除</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">端末エミュレート</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<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. -->
+	<!-- 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">タッチしてドラッグ\nまたは方向パッドで\nコピー領域を選択</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">接続ホストの編集</string>
 	<string name="list_host_portforwards">ポート転送の編集</string>
 	<string name="list_host_delete">接続ホストの削除</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">下のquick-connect box\nを使ってホストに接続できます.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3385d4d..575e89c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Enkel, kraftig open-source SSH-klient</string>
 
 	<!-- Window title for the Host List -->
@@ -8,38 +7,41 @@
 	<!-- Window title for the Pubkeys List -->
 	<string name="title_pubkey_list">Offentlige nøkler</string>
 	<!-- Window title for the Port Forwards List -->
-	<string name="title_port_forwards_list">Port forwards</string>
+	<string name="title_port_forwards_list">Videresendte porter</string>
 	<!-- Window title when editing host details -->
-	<string name="title_host_editor">Endre vert</string>
+	<string name="title_host_editor">Rediger vert</string>
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjelp</string>
 	<!-- Window title for color list editing screen -->
 	<string name="title_colors">Farger</string>
 
 	<string name="resolve_connect">Koble til</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Samle entropi</string>
 
 	<string name="menu_insert">Legg til vert</string>
 	<string name="menu_delete">Slett vert</string>
-	<string name="menu_preferences">Preferanser</string>
+	<string name="menu_preferences">Innstillinger</string>
 
-	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
+	<string name="help_intro">Velg et emne nedenfor for mer informasjon om et bestemt emne.</string>
 	<string name="help_about">Om ConnectBot</string>
 	<string name="help_keyboard">Tastatur</string>
 
-	<string name="pubkey_generate">Generer</string>
+	<string name="pubkey_generate">Lag</string>
 	<string name="pubkey_import">Importer</string>
 	<string name="pubkey_delete">Slett nøkkel</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Samler entropi</string>
-	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
-	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
+	<string name="pubkey_touch_prompt">Ta i denne boksen for å samle tilfeldigheter: %1$d%% ferdig</string>
+	<string name="pubkey_touch_hint">For å forsikre tilfeldighet under nøkkel generasjon, flytt fingeren tilfeldig over boksen nedenfor.</string>
 	<string name="pubkey_generating">Genererer nøkkelpar...</string>
 	<string name="pubkey_copy_private">Kopier privat nøkkel</string>
 	<string name="pubkey_copy_public">Kopier offentlig nøkkel</string>
-	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
+	<string name="pubkey_list_empty">Trykk "Meny" for å lage/eller importere nøkkel par</string>
 	<string name="pubkey_unknown_format">Ukjent format</string>
-	<string name="pubkey_change_password">Bytt passord</string>
-	<string name="pubkey_list_pick">Pick from /sdcard</string>
+	<string name="pubkey_change_password">Endre passord</string>
+	<string name="pubkey_list_pick">Velg fra /sdcard</string>
 	<string name="pubkey_import_parse_problem">Feil ved innlesing av privat nøkkel</string>
 	<string name="pubkey_unlock">Frigjør nøkkel</string>
 	<string name="pubkey_failed_add">Feil passord for nøkkel '%1$s'. Autentisering feilet.</string>
@@ -47,15 +49,16 @@
 	<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="pubkey_confirm_use">Godkjenn før bruk</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
-	<string name="portforward_edit">Edit port forward</string>
-	<string name="portforward_delete">Delete port forward</string>
+	<string name="portforward_edit">Rediger videresendte porter</string>
+	<string name="portforward_delete">Slett videresendte porter</string>
 
 	<string name="prompt_nickname">Kallenavn:</string>
 	<!-- An example string that could be used as a nickname for a pubkey. -->
-	<string name="prompt_nickname_hint_pubkey">My work key</string>
+	<string name="prompt_nickname_hint_pubkey">Min arbeids nøkkel</string>
 	<!-- The source TCP port for port forwards. -->
 	<string name="prompt_source_port">Source port:</string>
 	<!-- The "host:port" combination used for port forward destinations. -->
@@ -71,13 +74,13 @@
 	<string name="prompt_bits">Bits:</string>
 
 	<!-- Prompt for the password to unlock a certain pubkey. -->
-	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
+	<string name="prompt_pubkey_password">Passord for nøkkel '%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>
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
+	<string name="prompt_allow_agent_to_use_key">Godta ekstern vert til\nå bruke nøkkel '%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">ADVARSEL: EKSTERN VERT IDENTIFIKASJON HAR BLITT ENDRET!</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>
 
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminalemulering</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copied %1$d bytes to clipboard</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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Rediger vert</string>
 	<string name="list_host_portforwards">Edit port forwards</string>
 	<string name="list_host_delete">Slett vert</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 102786c..afd51e8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Simpele, krachtige, open-source SSH client.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Colors</string>
 
 	<string name="resolve_connect">Verbind</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Verzamel Entropie</string>
 
 	<string name="menu_insert">Voeg Host Toe</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Genereer</string>
 	<string name="pubkey_import">Importeer</string>
 	<string name="pubkey_delete">Verwijder knop</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Verzamelen van Entropie</string>
 	<string name="pubkey_touch_prompt">Raak dit vierkant aan om willekeurigheid te verzamelen: %1$d%% gedaan</string>
 	<string name="pubkey_touch_hint">Beweeg je vinger in willekeurige volgorde over het vak beneden om er voor te zorgen dat de invoer willekeurig blijft.</string>
 	<string name="pubkey_generating">Genereren van een sleutel paar...</string>
 	<string name="pubkey_copy_private">Kopieer privé sleutel</string>
 	<string name="pubkey_copy_public">Kopieer publieke sleutel</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tik op "Menu" om te maken\nof importeer sleutel paren.</string>
 	<string name="pubkey_unknown_format">Onbekend formaat</string>
 	<string name="pubkey_change_password">Verander wachtwoord</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tik "Menu" om poort\nforwards te maken.</string>
 	<string name="portforward_edit">Bewerk port forward</string>
 	<string name="portforward_delete">Verwijder port forward</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal emulatie</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d bytes gekopieerd naar het klembord</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. -->
+	<!-- 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">Tik en sleep\nof gebruik directioneel pad\nom velden te selecteren omte kopiëren</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Bewerk host</string>
 	<string name="list_host_portforwards">Bewerk port forwards</string>
 	<string name="list_host_delete">Verwijder hosts</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Gebruik het snel-verbindings vierkant\nonder om een host te verbinden.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 734b3e2..70085dc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Prosty, wszechstronny, darmowy klient SSH.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Kolory</string>
 
 	<string name="resolve_connect">Połącz</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Uruchom Generator Liczb Losowych</string>
 
 	<string name="menu_insert">Dodaj hosta</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Generuj</string>
 	<string name="pubkey_import">Importuj</string>
 	<string name="pubkey_delete">Usuń klucz</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<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>
 	<string name="pubkey_copy_private">Kopiuj klucz prywatny</string>
 	<string name="pubkey_copy_public">Kopiuj klucz publiczny</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Naciśnij "Menu", żeby stworzyć\nlub wygenerować parę kluczy.</string>
 	<string name="pubkey_unknown_format">Nieznany format</string>
 	<string name="pubkey_change_password">Zmień hasło</string>
@@ -49,6 +51,7 @@
 	<!-- 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">Potwierdź przed użyciem</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Naciśnij "Menu",\nżeby stworzyć przekierowanie portu.</string>
 	<string name="portforward_edit">Edytuj przekierowanie portu</string>
 	<string name="portforward_delete">Usuń przekierowanie portu</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
 	<string name="prompt_allow_agent_to_use_key">Zezwolić zdalnemu hostowi na\nużycie klucza '%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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (działająca wersja)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Emulacja terminalu</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Skopiowano %1$d bajtów do schowka</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. -->
+	<!-- 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">Dotknij i przeciągnij\nlub użyj trackball'a\naby zaznaczyć obszar do skopiowania</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Edytuj hosta</string>
 	<string name="list_host_portforwards">Edytuj przekierowania portów</string>
 	<string name="list_host_delete">Usuń hosta</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Użyj pola szybkiego połączenia\nponiżej, żeby połączyć się z hostem.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a266c88..74daee4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Simple, powerful, open-source SSH client.</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">Cores</string>
 
 	<string name="resolve_connect">Conectar</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Adicionar Máquina</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Gerar</string>
 	<string name="pubkey_import">Import</string>
 	<string name="pubkey_delete">Delete key</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
 	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
 	<string name="pubkey_generating">Generating key pair...</string>
 	<string name="pubkey_copy_private">Copy private key</string>
 	<string name="pubkey_copy_public">Copy public key</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
 	<string name="pubkey_unknown_format">Unknown format</string>
 	<string name="pubkey_change_password">Change password</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
 	<string name="portforward_edit">Edit port forward</string>
 	<string name="portforward_delete">Delete port forward</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal emulation</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Copied %1$d bytes to clipboard</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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3daa1ec..9dfe901 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,95 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Простой и мощный SSH клиент с открытым исходным кодом</string>
 
 	<!-- Window title for the Host List -->
 	<string name="title_hosts_list">Хосты</string>
 	<!-- Window title for the Pubkeys List -->
-	<string name="title_pubkey_list">Pubkeys</string>
+	<string name="title_pubkey_list">Публичные ключи</string>
 	<!-- Window title for the Port Forwards List -->
-	<string name="title_port_forwards_list">Port forwards</string>
+	<string name="title_port_forwards_list">Переадресация портов</string>
 	<!-- Window title when editing host details -->
-	<string name="title_host_editor">Редактировать хост</string>
+	<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">Цвета</string>
 
 	<string name="resolve_connect">Соединение</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather 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>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
-	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
+	<string name="pubkey_touch_hint">Для использования случайной выборки во время генерации ключа - перемещайте палец в области экрана ниже.</string>
 	<string name="pubkey_generating">Генерирование пары ключей</string>
 	<string name="pubkey_copy_private">Копировать приватный ключ</string>
 	<string name="pubkey_copy_public">Копировать публичный ключ</string>
-	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
+	<string name="pubkey_list_empty">Выберите Меню для создания или импорта пары ключей</string>
 	<string name="pubkey_unknown_format">Неизвестный формат</string>
 	<string name="pubkey_change_password">Сменить пароль</string>
-	<string name="pubkey_list_pick">Pick from /sdcard</string>
+	<string name="pubkey_list_pick">Загрузить с SD карты</string>
 	<string name="pubkey_import_parse_problem">Проблема при распозновании импортированного частного ключа</string>
 	<string name="pubkey_unlock">Разблокировать ключ</string>
 	<string name="pubkey_failed_add">Неверный пароль для ключа '%1$s'. Аутентификация не удалась</string>
-	<string name="pubkey_memory_load">Загрузка в память</string>
-	<string name="pubkey_memory_unload">Выгрузка из памяти</string>
+	<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="pubkey_confirm_use">Подтверждение перед использованием</string>
 
-	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
-	<string name="portforward_edit">Edit port forward</string>
-	<string name="portforward_delete">Delete port forward</string>
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
+	<string name="portforward_list_empty">Выберите Меню для переадресации порта</string>
+	<string name="portforward_edit">Правка переадресации порта</string>
+	<string name="portforward_delete">Удалить переадресацию порта</string>
 
 	<string name="prompt_nickname">Псевдоним:</string>
 	<!-- An example string that could be used as a nickname for a pubkey. -->
 	<string name="prompt_nickname_hint_pubkey">Мой рабочий ключ</string>
 	<!-- The source TCP port for port forwards. -->
-	<string name="prompt_source_port">Source port:</string>
+	<string name="prompt_source_port">С порта</string>
 	<!-- The "host:port" combination used for port forward destinations. -->
-	<string name="prompt_destination">Получатель:</string>
+	<string name="prompt_destination">На порт</string>
 	<string name="prompt_old_password">Старый пароль:</string>
 	<string name="prompt_password">Пароль:</string>
 	<!-- Added after a "Password:" prompt to indicate user needs to confirm entry. -->
-	<string name="prompt_again">(снова)</string>
+	<string name="prompt_again">(повторить)</string>
 	<!-- Label for the user to select port forward type. -->
-	<string name="prompt_type">Тип:</string>
-	<string name="prompt_password_can_be_blank">Note: password can be blank</string>
+	<string name="prompt_type">Тип переадресации</string>
+	<string name="prompt_password_can_be_blank">Поле для ввода пароля не может быть пустым</string>
 	<!-- Prompt for the size of the private key in bits. -->
-	<string name="prompt_bits">Bits:</string>
+	<string name="prompt_bits">Размер в битах</string>
 
 	<!-- 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>
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
+	<string name="prompt_allow_agent_to_use_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">ВНИМАНИЕ! ИДЕНТИФИКАЦИЯ УДАЛЕННОГО ХОСТА ЗАМЕНЕНА</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">Похоже есть возможность что вас ломают. Или кто то изменил ключ на удаленном хосте.</string>
 
 	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
-	<string name="prompt_host_disconnected">Host has disconnected.\nClose session?</string>
+	<string name="prompt_host_disconnected">Хост отвалился.\nЗакрыть сессию ?</string>
 	<!-- Prompt user must answer yes or no to when the remote host fails verification of encryption fingerprint -->
-	<string name="prompt_continue_connecting">Are you sure you want\nto continue connecting?</string>
+	<string name="prompt_continue_connecting">Хотите продолжить\nпопытки соединения?</string>
 
 	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
-	<string name="host_authenticity_warning">The authenticity of host '%1$s' can't be established.</string>
+	<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">Подпись (fingerprint) host-ключа  для сервера %1$s  - %2$s</string>
 
 	<string name="alert_passwords_do_not_match_msg">Пароли не совпадают!</string>
 	<string name="alert_wrong_password_msg">Неверный пароль!</string>
@@ -109,72 +112,66 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<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">Эмулятор терминала</string>
 
 	<!-- Name for the emulation terminal type preference. -->
 	<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">Пользовательский интерфейс</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">Полный экран</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">Запомнить ключи в памяти</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">Проверка обновления</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>
 
 	<!-- 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">Препятствовать отключению Wi-Fi при активном сеансе</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>
@@ -183,7 +180,7 @@
 	<string name="pref_bell_title">Audible bell</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>
@@ -196,14 +193,14 @@
 	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
 	<string name="list_keymode_right">Use right-side keys</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">Отключить</string>
 
 	<!-- Preference to not use pubkeys to authenticate to this host. -->
 	<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">Ежедневно</string>
@@ -219,7 +216,7 @@
 	<string name="hostpref_color_title">Color category</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>
@@ -227,32 +224,32 @@
 	<!-- 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">Комманды, выполняемые на удаленной машине после подключения</string>
 
 	<!-- Host compression preference title -->
 	<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">Начать сеанс оболочки</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>
 
 	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
-	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<string name="hostpref_stayconnected_title">Держать подключение</string>
 	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
-	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</string>
+	<string name="hostpref_stayconnected_summary">Пытаться переподключиться при отключении узла</string>
 
 	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
-	<string name="hostpref_delkey_title">DEL Key</string>
+	<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">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">Кодировка</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">Настройки соединения</string>
@@ -261,13 +258,13 @@
 	<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">Порт</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 минут назад</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than a day. -->
@@ -276,8 +273,8 @@
 	<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>
-	<!-- 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_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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -294,11 +291,11 @@
 	<string name="console_menu_urlscan">URL Scan</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">Создать перенаправление порта</string>
 
@@ -320,7 +317,7 @@
 	<!-- Part of the formatting hints that will be used like: username@hostname:port -->
 	<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">Сортировать по цвету</string>
 	<!-- Selection choice to sort hosts by nickname. -->
@@ -331,12 +328,13 @@
 	<string name="list_host_edit">Редактировать хост</string>
 	<string name="list_host_portforwards">Редактировать перенаправление портов</string>
 	<string name="list_host_delete">Удалить хост</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
 	<string name="list_rotation_default">По умолчанию</string>
-	<string name="list_rotation_land">Force landscape</string>
-	<string name="list_rotation_port">Force portrait</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">Автоматически</string>
 
@@ -347,7 +345,7 @@
 	<!-- 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>
@@ -365,22 +363,22 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Назад</string>
 
-	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
+	<string name="terminal_no_hosts_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>
+	<string name="terminal_connecting">Подключение к %1$s:%2$d через %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>
+	<string name="terminal_sucess">Проверенный узел '%1$s' ключ: %2$s</string>
+	<string name="terminal_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>
+	<string name="terminal_using_s2c_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>
+	<string name="terminal_using_c2s_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_using_algorithm">Используемый алгоритм: %1$s %2$s</string>
 
 	<string name="terminal_auth">Пытаюсь аутентифицироваться</string>
 
@@ -388,7 +386,7 @@
 	<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_invalid">Выбранный открытый ключ неверен, выберите другой в редакторе узлов</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>
 
@@ -400,7 +398,7 @@
 	<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>
+	<string name="local_shell_unavailable">Ошибка! На этом телефоне отсутствует локальная оболочка.</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>
@@ -413,14 +411,14 @@
 	<string name="upgrade_neg">Не сейчас</string>
 
 	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
-	<string name="no">No</string>
+	<string name="no">Нет</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
-	<string name="with_confirmation">With confirmation</string>
+	<string name="with_confirmation">С подтверждением</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
-	<string name="yes">Yes</string>
+	<string name="yes">Да</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="exceptions_submit_message">Возможно, при последнем запуске программы возникла проблема. Отправить разработчикам отчет об ошибке?</string>
 
 	<string name="color_red">красный</string>
 	<string name="color_green">зелёный</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 85f0e75..a5296ac 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Enkel, kraftfull, open-source SSH-klient.</string>
 
 	<!-- Window title for the Host List -->
@@ -8,15 +7,16 @@
 	<!-- Window title for the Pubkeys List -->
 	<string name="title_pubkey_list">Publika nycklar</string>
 	<!-- Window title for the Port Forwards List -->
-	<string name="title_port_forwards_list">Vidarebefodring av portar</string>
+	<string name="title_port_forwards_list">Vidarebefordring av portar</string>
 	<!-- Window title when editing host details -->
 	<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="title_colors">Färger</string>
 
 	<string name="resolve_connect">Anslut</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Samla in Entropi</string>
 
 	<string name="menu_insert">Lägg till värd</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">Generera</string>
 	<string name="pubkey_import">Importera</string>
 	<string name="pubkey_delete">Ta bort nyckel</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Samlar in entropi</string>
 	<string name="pubkey_touch_prompt">Rör vid rutan för att samla in slumpdata: %1$d%% klart</string>
-	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
+	<string name="pubkey_touch_hint">För att försäkra dig om att nyckeln som skapas är slumpmässig, rör fingret slumpmässigt över skärmen.</string>
 	<string name="pubkey_generating">Genererar nyckelpar...</string>
 	<string name="pubkey_copy_private">Kopiera privata nyckeln</string>
 	<string name="pubkey_copy_public">Kopiera publika nyckeln</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">Tryck på "Meny" för att\nskapa eller importera nyckelpar</string>
 	<string name="pubkey_unknown_format">Okänt format</string>
 	<string name="pubkey_change_password">Ändra lösenord</string>
@@ -47,8 +49,9 @@
 	<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="pubkey_confirm_use">Bekräfta innan användning</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<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>
 	<string name="portforward_delete">Ta bort vidarebefodring av port</string>
@@ -71,10 +74,10 @@
 	<string name="prompt_bits">Bitar:</string>
 
 	<!-- Prompt for the password to unlock a certain pubkey. -->
-	<string name="prompt_pubkey_password">Password for key '%1$s'</string>
+	<string name="prompt_pubkey_password">Lösenord för nyckel '%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>
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
+	<string name="prompt_allow_agent_to_use_key">Tillåt fjärrvärd att\nanvända nyckel '%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">VARNING: IDENTIFIERING AV FJÄRRVÄRD HAR ÄNDRATS!</string>
@@ -82,7 +85,7 @@
 	<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>
+	<string name="prompt_host_disconnected">Värden har kopplat ner anslutningen.\nStäng?</string>
 	<!-- Prompt user must answer yes or no to when the remote host fails verification of encryption fingerprint -->
 	<string name="prompt_continue_connecting">Är du säker att du vill\nfortsätta att ansluta?</string>
 
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminalemulering</string>
 
@@ -186,7 +183,7 @@
 	<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>
+	<string name="pref_bell_vibrate_title">Vibrera</string>
 
 	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
 	<string name="pref_bell_notification_title">Background notifications</string>
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">Kopierade %1$d bytes till urklippshanteraren.</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. -->
+	<!-- 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">Tryck och drag\neller använd bollen\nför att markera en yta för kopiering</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Inställningar för värd</string>
 	<string name="list_host_portforwards">Ändra vidarebefodringar av portar</string>
 	<string name="list_host_delete">Ta bort värd</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Använd snabbanslutningen\nnedan för att ansluta till en värd.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
new file mode 100644
index 0000000..70d02e7
--- /dev/null
+++ b/res/values-vi/strings.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_desc">Simple, powerful, open-source SSH client.</string>
+
+	<!-- Window title for the Host List -->
+	<string name="title_hosts_list">Máy chủ</string>
+	<!-- Window title for the Pubkeys List -->
+	<string name="title_pubkey_list">Pubkeys</string>
+	<!-- Window title for the Port Forwards List -->
+	<string name="title_port_forwards_list">Port forwards</string>
+	<!-- Window title when editing host details -->
+	<string name="title_host_editor">Edit Host</string>
+	<!-- Window title for Help index -->
+	<string name="title_help">Trợ giúp</string>
+	<!-- Window title for color list editing screen -->
+	<string name="title_colors">Màu sắc</string>
+
+	<string name="resolve_connect">Kết nối</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
+	<string name="resolve_entropy">Gather Entropy</string>
+
+	<string name="menu_insert">Add Host</string>
+	<string name="menu_delete">Delete Host</string>
+	<string name="menu_preferences">Preferences</string>
+
+	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
+	<string name="help_about">About ConnectBot</string>
+	<string name="help_keyboard">Keyboard</string>
+
+	<string name="pubkey_generate">Generate</string>
+	<string name="pubkey_import">Import</string>
+	<string name="pubkey_delete">Delete key</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
+	<string name="pubkey_gather_entropy">Gathering Entropy</string>
+	<string name="pubkey_touch_prompt">Touch this box to gather randomness: %1$d%% done</string>
+	<string name="pubkey_touch_hint">In order to assure randomness during the key generation, move your finger randomly over the box below.</string>
+	<string name="pubkey_generating">Generating key pair...</string>
+	<string name="pubkey_copy_private">Copy private key</string>
+	<string name="pubkey_copy_public">Copy public key</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
+	<string name="pubkey_list_empty">Tap "Menu" to create\nor import key pairs.</string>
+	<string name="pubkey_unknown_format">Unknown format</string>
+	<string name="pubkey_change_password">Change password</string>
+	<string name="pubkey_list_pick">Pick from /sdcard</string>
+	<string name="pubkey_import_parse_problem">Problem parsing imported private key</string>
+	<string name="pubkey_unlock">Unlock key</string>
+	<string name="pubkey_failed_add">Bad password for key '%1$s'. Authentication failed.</string>
+	<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>
+
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
+	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
+	<string name="portforward_edit">Edit port forward</string>
+	<string name="portforward_delete">Delete port forward</string>
+
+	<string name="prompt_nickname">Nickname:</string>
+	<!-- An example string that could be used as a nickname for a pubkey. -->
+	<string name="prompt_nickname_hint_pubkey">My work key</string>
+	<!-- The source TCP port for port forwards. -->
+	<string name="prompt_source_port">Source port:</string>
+	<!-- The "host:port" combination used for port forward destinations. -->
+	<string name="prompt_destination">Destination:</string>
+	<string name="prompt_old_password">Old password:</string>
+	<string name="prompt_password">Password:</string>
+	<!-- Added after a "Password:" prompt to indicate user needs to confirm entry. -->
+	<string name="prompt_again">(again)</string>
+	<!-- Label for the user to select port forward type. -->
+	<string name="prompt_type">Type:</string>
+	<string name="prompt_password_can_be_blank">Note: password can be blank</string>
+	<!-- Prompt for the size of the private key in bits. -->
+	<string name="prompt_bits">Bits:</string>
+
+	<!-- 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. Note that the '\n' means split the line so it's actually "host to use 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. -->
+	<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>
+
+	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
+	<string name="prompt_host_disconnected">Host has disconnected.\nClose session?</string>
+	<!-- Prompt user must answer yes or no to when the remote host fails verification of encryption fingerprint -->
+	<string name="prompt_continue_connecting">Are you sure you want\nto continue connecting?</string>
+
+	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
+	<string name="host_authenticity_warning">The authenticity of host '%1$s' can't be established.</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="alert_passwords_do_not_match_msg">Passwords do not match!</string>
+	<string name="alert_wrong_password_msg">Wrong password!</string>
+	<string name="alert_key_corrupted_msg">Private key appears corrupt!</string>
+	<string name="alert_sdcard_absent">SD card is not inserted!</string>
+
+	<!-- Add a new item (e.g., host or pubkey) to the list. -->
+	<string name="button_add">Add</string>
+	<!-- Change an existing item's (e.g., host or pubkey) details. -->
+	<string name="button_change">Change</string>
+	<!-- Button that begins the generation of a public key pair. -->
+	<string name="button_generate">Generate Key</string>
+	<!-- Button that resizes the screen to the user-specified dimensions. -->
+	<string name="button_resize">Resize</string>
+
+	<string name="alert_disconnect_msg">Connection Lost</string>
+
+	<string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
+
+	<!-- The category title for terminal emulation preferences. -->
+	<string name="pref_emulation_category">Terminal emulation</string>
+
+	<!-- Name for the emulation terminal type preference. -->
+	<string name="pref_emulation_title">Emulation mode</string>
+	<!-- Description of the emulation terminal type preference. -->
+	<string name="pref_emulation_summary">Terminal emulation mode to use for PTY connections</string>
+
+	<!-- Name for the scrollback size preference -->
+	<string name="pref_scrollback_title">Scrollback size</string>
+	<!-- Description of the scrollback size preference -->
+	<string name="pref_scrollback_summary">Size of scrollback buffer to keep in memory for each console</string>
+
+	<!-- The category title for user interface preferences -->
+	<string name="pref_ui_category">User interface</string>
+
+	<!-- Name for the rotation mode preference -->
+	<string name="pref_rotation_title">Rotation mode</string>
+	<!-- Summary for the rotation mode preference -->
+	<string name="pref_rotation_summary">How to change rotation when keyboard popped in/out</string>
+
+	<!-- Name for the full screen preference -->
+	<string name="pref_fullscreen_title">Full screen</string>
+	<!-- Summary for the full screen preference -->
+	<string name="pref_fullscreen_summary">Hide status bar while in console</string>
+
+	<!-- Name for the memorize keys preference -->
+	<string name="pref_memkeys_title">Remember keys in memory</string>
+	<!-- Summary for the memorize keys preference -->
+	<string name="pref_memkeys_summary">Keep unlocked keys in memory until backend service is terminated</string>
+
+	<!-- Name for the update check preference -->
+	<string name="pref_update_title">Update check</string>
+	<!-- Summary for the update check preference -->
+	<string name="pref_update_summary">Set the maximum frequency to check for ConnectBot updates</string>
+
+	<!-- Name for the keyboard shortcuts preference -->
+	<string name="pref_keymode_title">Directory shortcuts</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>
+	<!-- Summary for the camera shortcut usage preference -->
+	<string name="pref_camera_summary">Select which shortcut to trigger when the camera button is pushed</string>
+
+	<!-- Name for the keep screen on preference -->
+	<string name="pref_keepalive_title">Keep screen awake</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>
+
+	<!-- Name for the Wi-Fi lock preference -->
+	<string name="pref_wifilock_title">Keep Wi-Fi active</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>
+
+	<!-- 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>
+
+	<!-- Category title for the Terminal Bell preferences -->
+	<string name="pref_bell_category">Terminal bell</string>
+
+	<!-- Checkbox preference title for the audible terminal bell feature -->
+	<string name="pref_bell_title">Audible bell</string>
+
+	<!-- Title for the slider preference to set the volume -->
+	<string name="pref_bell_volume_title">Bell volume</string>
+
+	<!-- Checkbox preference title for the vibrate on terminal bell feature -->
+	<string name="pref_bell_vibrate_title">Vibrate on bell</string>
+
+	<!-- Checkbox preference title for the receive notifications on terminal bell feature -->
+	<string name="pref_bell_notification_title">Background notifications</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>
+
+	<!-- Preference selection to indicate use of right side of keyboard for special shortcuts. -->
+	<string name="list_keymode_right">Use right-side keys</string>
+	<!-- Preference selection to indicate use of left side of keyboard for special shortcuts. -->
+	<string name="list_keymode_left">Use left-side keys</string>
+	<!-- Preference selection to indicate never to use special shortcut keys. -->
+	<string name="list_keymode_none">Disable</string>
+
+	<!-- Preference to not use pubkeys to authenticate to this host. -->
+	<string name="list_pubkeyids_none">Do not use keys</string>
+	<!-- Preference to use any pubkey to authenticate to this host. -->
+	<string name="list_pubkeyids_any">Use any unlocked key</string>
+
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_daily">Daily</string>
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_weekly">Weekly</string>
+	<!-- Frequency for which to check for program updates. -->
+	<string name="list_update_never">Never</string>
+
+	<!-- Host nickname field preference title -->
+	<string name="hostpref_nickname_title">Nickname</string>
+
+	<!-- Host color category preference title -->
+	<string name="hostpref_color_title">Color category</string>
+
+	<!-- 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 -->
+	<string name="hostpref_postlogin_summary">Commands to run on remote server once authenticated</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>
+
+	<!-- 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>
+
+	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
+	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
+	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</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 -->
+	<string name="hostpref_encoding_summary">Character encoding for the host</string>
+
+	<!-- Host preference category title for connection settings -->
+	<string name="hostpref_connection_category">Connection settings</string>
+
+	<!-- Username field title for host editor preference -->
+	<string name="hostpref_username_title">Username</string>
+
+	<!-- Hostname field title for host editor preference -->
+	<string name="hostpref_hostname_title">Host</string>
+
+	<!-- Port field title for host editor preference -->
+	<string name="hostpref_port_title">Port</string>
+
+	<!-- Displayed to indicate a host has never been connected to. -->
+	<string name="bind_never">Never connected</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>
+	<!-- 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>
+
+	<!-- Message given when user copies from the terminal. -->
+	<string name="console_copy_done">Copied %1$d bytes to clipboard</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>
+
+	<!-- Button to close the disconnected terminal window. -->
+	<string name="console_menu_close">Close</string>
+	<!-- Button to begin copying from the terminal to the clipboard. -->
+	<string name="console_menu_copy">Copy</string>
+	<!-- Button to paste from the clipboard to the terminal. -->
+	<string name="console_menu_paste">Paste</string>
+	<!-- Button that brings user to the Port Forwards List. -->
+	<string name="console_menu_portforwards">Port Forwards</string>
+	<!-- Button that brings user to the terminal resizing dialog where they can force a size. -->
+	<string name="console_menu_resize">Force Size</string>
+	<!-- Button that brings up the list of URLs on the current screen -->
+	<string name="console_menu_urlscan">URL Scan</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>
+	<!-- 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>
+	<!-- 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_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_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>
+
+	<!-- 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>
+	<!-- 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 -->
+	<string name="format_port">port</string>
+
+	<string name="list_menu_pubkeys">Manage Pubkeys</string>
+	<!-- Selection choice to sort hosts by color. -->
+	<string name="list_menu_sortcolor">Sort by color</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_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>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
+	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</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>
+	<!-- Selection to indicate the rotation should be selected automatically based on the tilt sensor. -->
+	<string name="list_rotation_auto">Automatic</string>
+
+	<!-- Selection to indicate pressing the Camera button should send "Ctrl+A then Space". -->
+	<string name="list_camera_ctrlaspace">Ctrl+A then 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>
+
+	<!-- 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>
+
+	<!-- Button to agree to license terms. -->
+	<string name="wizard_agree">Agree</string>
+	<!-- Button to go to the next page in the first time start-up wizard. -->
+	<string name="wizard_next">Next</string>
+	<!-- Button to go to the previous page in the first time start-up wizard. -->
+	<string name="wizard_back">Back</string>
+
+	<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_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 -->
+	<string name="notification_text">%1$s wants your attention.</string>
+
+	<!-- Dialog title when a new version of ConnectBot is detected. -->
+	<string name="upgrade">New version</string>
+	<!-- Button selection to upgrade to the latest ConnectBot when one is available. -->
+	<string name="upgrade_pos">Yes, upgrade</string>
+	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
+	<string name="upgrade_neg">Not right now</string>
+
+	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
+	<string name="no">No</string>
+	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
+	<string name="with_confirmation">With confirmation</string>
+	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
+	<string name="yes">Yes</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>
+	<string name="color_gray">gray</string>
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4894084..ba79a7d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">简单,强大,开源的ssh客户端</string>
 
 	<!-- Window title for the Host List -->
@@ -14,9 +13,10 @@
 	<!-- 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="title_colors">颜色</string>
 
 	<string name="resolve_connect">连接</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">收集用户熵</string>
 
 	<string name="menu_insert">添加主机</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">产生</string>
 	<string name="pubkey_import">导入</string>
 	<string name="pubkey_delete">删除密钥</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<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>
 	<string name="pubkey_copy_private">复制私钥</string>
 	<string name="pubkey_copy_public">复制公钥</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">点击菜单来创建\不是导入密钥对</string>
 	<string name="pubkey_unknown_format">未知格式</string>
 	<string name="pubkey_change_password">改变密码</string>
@@ -47,8 +49,9 @@
 	<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="pubkey_confirm_use">使用前确认</string>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">点击「菜单」来创建端口转发</string>
 	<string name="portforward_edit">编辑端口转发</string>
 	<string name="portforward_delete">删除端口转发</string>
@@ -73,8 +76,8 @@
 	<!-- 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>
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use key" -->
+	<string name="prompt_allow_agent_to_use_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>
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">版权所有2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot(工作拷贝)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">模拟终端</string>
 
@@ -154,7 +151,7 @@
 	<!-- Name for the keyboard shortcuts preference -->
 	<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>
+	<string name="pref_keymode_summary">选择如何使用 Alt 代表 "/"，Shift 代表 Tab</string>
 
 	<!-- Name for the camera shortcut usage preference -->
 	<string name="pref_camera_title">摄像快捷键</string>
@@ -222,7 +219,7 @@
 	<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>
+	<string name="hostpref_authagent_title">使用 SSH 认证</string>
 
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">登入后动作</string>
@@ -240,9 +237,9 @@
 	<string name="hostpref_wantsession_summary">仅仅对端口转发禁用偏好设置</string>
 
 	<!-- Setting for whether the host should be reconnected to automatically upon disconnect -->
-	<string name="hostpref_stayconnected_title">Stay connected</string>
+	<string name="hostpref_stayconnected_title">保持连接</string>
 	<!-- Summary for preference asking whether the host should be reconnected to when it disconnects -->
-	<string name="hostpref_stayconnected_summary">Try to reconnect to host if disconnected</string>
+	<string name="hostpref_stayconnected_summary">断线后自动重新连接到主机</string>
 
 	<!-- Setting for what key code is sent to the server when DEL key is pressed. -->
 	<string name="hostpref_delkey_title">DEL键</string>
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<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. -->
+	<!-- 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">滑动手指\n或使用轨迹球\n选择要复制的区域</string>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -291,7 +288,7 @@
 	<!-- Button that brings user to the terminal resizing dialog where they can force a size. -->
 	<string name="console_menu_resize">字体大小</string>
 	<!-- Button that brings up the list of URLs on the current screen -->
-	<string name="console_menu_urlscan">URL Scan</string>
+	<string name="console_menu_urlscan">URL 地址扫描</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">本地</string>
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">编辑主机</string>
 	<string name="list_host_portforwards">编辑端口转发</string>
 	<string name="list_host_delete">删除主机</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">使用下面的快速连接框连接主机</string>
 
 	<!-- Default screen rotation preference selection -->
@@ -369,18 +367,18 @@
 
 	<!-- 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_connecting">连接到 %1$s:%2$d，通过 %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_sucess">验证主机 %1$s 键值： %2$s</string>
 	<string name="terminal_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>
+	<string name="terminal_using_s2c_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>
+	<string name="terminal_using_c2s_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_using_algorithm">使用算法：%1$s %2$s</string>
 
 	<string name="terminal_auth">尝试验证</string>
 
@@ -390,15 +388,15 @@
 	<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="terminal_auth_pubkey_fail">认证方法 publickey， 键值 %1$s 失败</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="terminal_no_session">因为主机的相关设置，不会启动会话。</string>
+	<string name="terminal_enable_portfoward">启用端口转发：%1$s</string>
 
 	<string name="local_shell_unavailable">失败! 本地Shell在该手机上不可用</string>
 
@@ -415,7 +413,7 @@
 	<!-- Preference selection for SSH Authentication Agent to never use pubkeys -->
 	<string name="no">不</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys "with confirmation" only -->
-	<string name="with_confirmation">With confirmation</string>
+	<string name="with_confirmation">已确认过</string>
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
 	<string name="yes">是</string>
 
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c7f0802..c1642df 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">簡單,強大,開源的SSH客戶端</string>
 
 	<!-- Window title for the Host List -->
@@ -17,6 +16,7 @@
 	<string name="title_colors">顏色</string>
 
 	<string name="resolve_connect">連接</string>
+	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">添加主機</string>
@@ -30,12 +30,14 @@
 	<string name="pubkey_generate">產生</string>
 	<string name="pubkey_import">導入</string>
 	<string name="pubkey_delete">刪除密鑰</string>
+	<!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) -->
 	<string name="pubkey_gather_entropy">Gathering Entropy</string>
 	<string name="pubkey_touch_prompt">觸摸方框來收集隨機數：%1$d％完成</string>
 	<string name="pubkey_touch_hint">由於密鑰產生的時候需要隨機數據，請在下面的方框中隨便移動你的手指</string>
 	<string name="pubkey_generating">正在產生密鑰配對</string>
 	<string name="pubkey_copy_private">複製私鑰</string>
 	<string name="pubkey_copy_public">複製公鑰</string>
+	<!-- Note that the '\n' just splits lines, so it's actually "create or import" -->
 	<string name="pubkey_list_empty">按「菜單」鍵創建或導入密鑰。</string>
 	<string name="pubkey_unknown_format">未知格式</string>
 	<string name="pubkey_change_password">更改密碼</string>
@@ -49,6 +51,7 @@
 	<!-- 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>
 
+	<!-- Note that the '\n' splits lines, so it's actually "create port forwards" -->
 	<string name="portforward_list_empty">按「菜單」鍵建端口轉發</string>
 	<string name="portforward_edit">編輯端口轉發</string>
 	<string name="portforward_delete">刪除端口轉發</string>
@@ -73,7 +76,7 @@
 	<!-- 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 -->
+	<!-- Prompt for whether to allow SSH Authentication Agent to use the specified key. Note that the '\n' means split the line so it's actually "host to use 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. -->
@@ -109,12 +112,6 @@
 
 	<string name="msg_copyright">版權所有2007-2008 Kenny Root http://the-b.org/ , Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">模擬終端</string>
 
@@ -277,7 +274,7 @@
 
 	<!-- Message given when user copies from the terminal. -->
 	<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. -->
+	<!-- 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>
 
 	<!-- Button to close the disconnected terminal window. -->
@@ -331,6 +328,7 @@
 	<string name="list_host_edit">Edit host</string>
 	<string name="list_host_portforwards">Edit port forwards</string>
 	<string name="list_host_delete">刪除主機</string>
+	<!-- Note that the '\n' splits the lines so it's actually "quick-connect box below to connect" -->
 	<string name="list_host_empty">Use the quick-connect box\nbelow to connect to a host.</string>
 
 	<!-- Default screen rotation preference selection -->
diff --git a/res/values/notrans.xml b/res/values/notrans.xml
new file mode 100644
index 0000000..b047388
--- /dev/null
+++ b/res/values/notrans.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">ConnectBot</string>
+	<!-- DO NOT MANUALLY UPDATE VERSION!!!
+	  Updating is update by the ant task "update-version" in build.xml
+	-->
+	<string name="msg_version">ConnectBot (working copy)</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 227885f..a3e210f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">ConnectBot</string>
 	<string name="app_desc">Simple, powerful, open-source SSH client.</string>
 
 	<!-- Window title for the Host List -->
@@ -113,12 +112,6 @@
 
 	<string name="msg_copyright">Copyright &#169; 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
 
-	<!-- DO NOT MANUALLY UPDATE VERSION!!!
-	  Updating is update by the ant task "update-version" in build.xml
-	  Do not translate.
-	-->
-	<string name="msg_version">ConnectBot (working copy)</string>
-
 	<!-- The category title for terminal emulation preferences. -->
 	<string name="pref_emulation_category">Terminal emulation</string>