Removed duplicate strings

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

16 files changed, 5 insertions, 221 deletions

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cbe1cc4..7f8e5c7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Помощ</string>
 
-	<string name="title_password">Въведете парола</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">Редактиране на хост</string>
 	<string name="resolve_connect">Свържи</string>
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Добави хост</string>
 	<string name="menu_delete">Изтрий хост</string>
 	<string name="menu_preferences">Предпочитания</string>
-	<string name="menu_help">Помощ</string>
 
 	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
 	<string name="help_about">Относно ConnectBot</string>
 	<string name="help_keyboard">Клавиатура</string>
-	<string name="help_pubkeys">Публични ключове</string>
-	<string name="help_portforwards">Пренасочване на портове</string>
 
 	<string name="pubkey_generate">Генериране</string>
 	<string name="pubkey_import">Импортиране</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Прекъсване на връзката</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Затваряне</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancel</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sort by name</string>
 	<string name="list_menu_settings">Settings</string>
-	<string name="list_menu_help">Помощ</string>
 
 	<string name="list_host_disconnect">Прекъсване на връзката</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancel</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. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Trying to authenticate</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39eec62..cbdae48 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjælp</string>
 
-	<string name="title_password">Angiv adgangskode</string>
-	<string name="title_entropy">Indsamler entropi</string>
-
-	<string name="resolve_edit">Rediger vært</string>
 	<string name="resolve_connect">Tilslut</string>
 	<string name="resolve_entropy">Indsamler entropi</string>
 
 	<string name="menu_insert">Tilføj vært</string>
 	<string name="menu_delete">Fjern vært</string>
 	<string name="menu_preferences">Foretrukne</string>
-	<string name="menu_help">Hjælp</string>
 
 	<string name="help_intro">Vælg venligst et emne nedenfor, som du ønsker mere information om.</string>
 	<string name="help_about">Om ConnectBot</string>
 	<string name="help_keyboard">Tastatur</string>
-	<string name="help_pubkeys">Offentlige nøgler</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Generer</string>
 	<string name="pubkey_import">Importér</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Frakoblet</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Luk</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<string name="portforward_dynamic">Dynamisk (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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Afbryd</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sortér efter navn</string>
 	<string name="list_menu_settings">Indstillinger</string>
-	<string name="list_menu_help">Hjælp</string>
 
 	<string name="list_host_disconnect">Frakoblet</string>
 	<string name="list_host_edit">Redigér vært</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Godkend</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Afbryd</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Næste</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA nøgle fingeraftryk er %1$s</string>
-	<string name="terminal_hostkey_prompt">Er du sikker på at du ønsker\nat skabe forbindelse?</string>
-
 	<string name="terminal_failed">Verifikation af værtsnøgle mislykkedes.</string>
 
 	<string name="terminal_auth">Forsøger at autorisere</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 538c6d2..fd9b027 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Hilfe</string>
 
-	<string name="title_password">Passwort eingeben</string>
-	<string name="title_entropy">Sammle Entropie</string>
-
-	<string name="resolve_edit">Host bearbeiten</string>
 	<string name="resolve_connect">Verbinden</string>
 	<string name="resolve_entropy">Sammle Entropie</string>
 
 	<string name="menu_insert">Host hinzufügen</string>
 	<string name="menu_delete">Host löschen</string>
 	<string name="menu_preferences">Einstellungen</string>
-	<string name="menu_help">Hilfe</string>
 
 	<string name="help_intro">Wählen Sie eine Überschrift aus, um mehr Informationen zu einem bestimmten Thema zu erhalten!</string>
 	<string name="help_about">Über ConnectBot</string>
 	<string name="help_keyboard">Tastatur</string>
-	<string name="help_pubkeys">Pubkeys</string>
-	<string name="help_portforwards">Port-Weiterleitungen</string>
 
 	<string name="pubkey_generate">Erzeugen</string>
 	<string name="pubkey_import">Importieren</string>
@@ -273,8 +266,6 @@
 	<!-- 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 oder Trackball verwenden\num zu kopierenden Bereich auszuwählen</string>
 
-	<!-- Button to disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Verbindung trennen</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Schließen</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<string name="portforward_dynamic">Dynamisch (SOCKS)</string>
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
 	<string name="portforward_pos">Port-Weiterleitung anlegen</string>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Abbrechen</string>
 
 	<string name="portforward_done">Port-Weiterleitung angelegt.</string>
 	<string name="portforward_problem">Konnte Port-Weiterleitung nicht anlegen. Verwenden Sie Ports kleiner als 1024, oder wird der Port bereits verwendet?</string>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Nach Name sortieren</string>
 	<string name="list_menu_settings">Einstellungen</string>
-	<string name="list_menu_help">Hilfe</string>
 
 	<string name="list_host_disconnect">Verbindung trennen</string>
 	<string name="list_host_edit">Host editieren</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Zustimmung</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Abbrechen</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Weiter</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">Die Authentizität von host '%1$s' kann nicht garantiert werden.</string>
-	<string name="terminal_hostkey">RSA Schlüssel Fingerabdruck ist %1$s</string>
-	<string name="terminal_hostkey_prompt">Sind Sie sicher, dass Sie\neine Verbindung herstellen wollen?</string>
-
 	<string name="terminal_failed">Überprüfung des Host-Schlüssels fehlgeschlagen.</string>
 
 	<string name="terminal_auth">Versuche zu authentisieren.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 664cc3e..ed560a4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Ayuda</string>
 
-	<string name="title_password">Entrada para contraseña</string>
-	<string name="title_entropy">Haciendo acopio de entropía</string>
-
-	<string name="resolve_edit">Editar Host</string>
 	<string name="resolve_connect">Conectar</string>
 	<string name="resolve_entropy">Recolectar entropía</string>
 
 	<string name="menu_insert">Agregar Host</string>
 	<string name="menu_delete">Eliminar Host</string>
 	<string name="menu_preferences">Preferencias</string>
-	<string name="menu_help">Ayuda</string>
 
 	<string name="help_intro">Por favor seleccione un tema a continuación para más información sobre una materia en particular.</string>
 	<string name="help_about">Acerca de ConnectBot</string>
 	<string name="help_keyboard">Teclado</string>
-	<string name="help_pubkeys">Claves Publicas</string>
-	<string name="help_portforwards">Traducciones de puerto</string>
 
 	<string name="pubkey_generate">Generar</string>
 	<string name="pubkey_import">Importar</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Desconectar</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Cerrar</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancelar</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Ordenar por nombre</string>
 	<string name="list_menu_settings">Configuración</string>
-	<string name="list_menu_help">Ayuda</string>
 
 	<string name="list_host_disconnect">Desconectar</string>
 	<string name="list_host_edit">Editar equipo</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">De acuerdo</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancelar</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Siguiente</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Intentando autenticar</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5dbe20c..afdedd4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Aide</string>
 
-	<string name="title_password">Input Password</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">Modifier le serveur</string>
 	<string name="resolve_connect">Connexion</string>
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Add Host</string>
 	<string name="menu_delete">Supprimmer le serveur</string>
 	<string name="menu_preferences">Préférences</string>
-	<string name="menu_help">Aide</string>
 
 	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
 	<string name="help_about">À propos de ConnectBot</string>
 	<string name="help_keyboard">Clavier</string>
-	<string name="help_pubkeys">Clés publiques</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Générer</string>
 	<string name="pubkey_import">Importer</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Déconnexion</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Fermer</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancel</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Trier par nom</string>
 	<string name="list_menu_settings">Réglages</string>
-	<string name="list_menu_help">Aide</string>
 
 	<string name="list_host_disconnect">Déconnexion</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancel</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Suivant</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">L'autenthicité du serveur '%1$s' ne peut être établie.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Trying to authenticate</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 64a5da3..5971f80 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Aiuto</string>
 
-	<string name="title_password">Input Password</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">Modifica connessione</string>
 	<string name="resolve_connect">Connect</string>
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Aggiungi connessione</string>
 	<string name="menu_delete">Elimina connessione</string>
 	<string name="menu_preferences">Preferenze</string>
-	<string name="menu_help">Aiuto</string>
 
 	<string name="help_intro">Selezionare un argomento dalla lista per ottenere maggiori informazioni.</string>
 	<string name="help_about">Informazioni su ConnectBot</string>
 	<string name="help_keyboard">Tastiera</string>
-	<string name="help_pubkeys">Chiavi pubbliche</string>
-	<string name="help_portforwards">Inoltro porte</string>
 
 	<string name="pubkey_generate">Genera</string>
 	<string name="pubkey_import">Importa</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Disconnect</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. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancel</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sort by name</string>
 	<string name="list_menu_settings">Settings</string>
-	<string name="list_menu_help">Aiuto</string>
 
 	<string name="list_host_disconnect">Disconnect</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancel</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. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Trying to authenticate</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8c8b5c5..10e2dcb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjelp</string>
 
-	<string name="title_password">Skriv inn passord</string>
-	<string name="title_entropy">Samler entropi</string>
-
-	<string name="resolve_edit">Endre vert</string>
 	<string name="resolve_connect">Koble til</string>
 	<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_help">Hjelp</string>
 
 	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
 	<string name="help_about">Om ConnectBot</string>
 	<string name="help_keyboard">Tastatur</string>
-	<string name="help_pubkeys">Offentlige nøkler</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Generer</string>
 	<string name="pubkey_import">Importer</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Koble fra</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Lukk</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<string name="portforward_dynamic">Dynamisk (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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Avbryt</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sorter etter navn</string>
 	<string name="list_menu_settings">Innstillinger</string>
-	<string name="list_menu_help">Hjelp</string>
 
 	<string name="list_host_disconnect">Koble fra</string>
 	<string name="list_host_edit">Rediger vert</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Godta</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Avbryt</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Neste</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Er du sikker på at\ndu vil koble til?</string>
-
 	<string name="terminal_failed">Verifisering av vertsnøkkelen feilet.</string>
 
 	<string name="terminal_auth">Forsøker å autentisere</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8ab198d..82c4445 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Help</string>
 
-	<string name="title_password">Typ wachtwoord in</string>
-	<string name="title_entropy">Verzamelen van Entropie</string>
-
-	<string name="resolve_edit">Bewerk host</string>
 	<string name="resolve_connect">Verbind</string>
 	<string name="resolve_entropy">Verzamel Entropie</string>
 
 	<string name="menu_insert">Voeg Host Toe</string>
 	<string name="menu_delete">Verwijder Host</string>
 	<string name="menu_preferences">Voorkeuren</string>
-	<string name="menu_help">Help</string>
 
 	<string name="help_intro">Selecteer hieronder een onderwerp voor meer informatie over een onderwerp.</string>
 	<string name="help_about">Over ConnectBot</string>
 	<string name="help_keyboard">Toetsenbord</string>
-	<string name="help_pubkeys">Pubkeys</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Genereer</string>
 	<string name="pubkey_import">Importeer</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Verbreek verbinding</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Sluit</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<string name="portforward_dynamic">Dynamisch (SOCKS)</string>
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
 	<string name="portforward_pos">Maak port forward</string>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Annuleren</string>
 
 	<string name="portforward_done">Succesvol port forward gemaakt</string>
 	<string name="portforward_problem">Probleem met het maken van een port forward, misschien gebruik je poort onder 1024 of is de poort al gebruikt?</string>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sorteer op naam</string>
 	<string name="list_menu_settings">Instellingen</string>
-	<string name="list_menu_help">Help</string>
 
 	<string name="list_host_disconnect">Verbreek verbinding</string>
 	<string name="list_host_edit">Bewerk host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Ga akkoord</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Annuleren</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Volgende</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">De authenticatie van host '%1$s' kan niet worden vastgesteld.</string>
-	<string name="terminal_hostkey">RSA sleutel vingerafdruk is %1$s</string>
-	<string name="terminal_hostkey_prompt">Weet je zeker dat je\nwilt doorgaan met verbinden?</string>
-
 	<string name="terminal_failed">Host sleutel verificatie mislukt</string>
 
 	<string name="terminal_auth">Probeert te authenticeren</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 26ef0e5..5e36bf9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Помощь</string>
 
-	<string name="title_password">Input Password</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">Редактировать хост</string>
 	<string name="resolve_connect">Соединение</string>
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">Добавить хост</string>
 	<string name="menu_delete">Удалить хост</string>
 	<string name="menu_preferences">Настройки</string>
-	<string name="menu_help">Помощь</string>
 
 	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
 	<string name="help_about">О ConnectBot</string>
 	<string name="help_keyboard">Клавиатура</string>
-	<string name="help_pubkeys">Pubkeys</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Генерировать</string>
 	<string name="pubkey_import">Импорт</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Разорвать соединение</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Закрыть</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Отменить</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Сортировать по имени</string>
 	<string name="list_menu_settings">Настройки</string>
-	<string name="list_menu_help">Помощь</string>
 
 	<string name="list_host_disconnect">Разорвать соединение</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Соглашаюсь</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Отменить</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Далее</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Пытаюсь аутентифицироваться</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f6a192d..4463469 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Hjälp</string>
 
-	<string name="title_password">Lösenordsinmatning</string>
-	<string name="title_entropy">Samlar in entropi</string>
-
-	<string name="resolve_edit">Redigera värd</string>
 	<string name="resolve_connect">Anslut</string>
 	<string name="resolve_entropy">Samla in Entropi</string>
 
 	<string name="menu_insert">Lägg till värd</string>
 	<string name="menu_delete">Ta bort värd</string>
 	<string name="menu_preferences">Egenskaper</string>
-	<string name="menu_help">Hjälp</string>
 
 	<string name="help_intro">Var god välj ett ämne nedan som du skulle vilja ha mer information om.</string>
 	<string name="help_about">Om ConnectBot</string>
 	<string name="help_keyboard">Tangentbord</string>
-	<string name="help_pubkeys">Publika nycklar</string>
-	<string name="help_portforwards">Port vidarebefodringar</string>
 
 	<string name="pubkey_generate">Generera</string>
 	<string name="pubkey_import">Importera</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Koppla ner</string>
 	<!-- Button to close the disconnected terminal window. -->
 	<string name="console_menu_close">Stäng</string>
 	<!-- Button to begin copying from the terminal to the clipboard. -->
@@ -294,8 +285,6 @@
 	<string name="portforward_dynamic">Dynamisk (SOCKS)</string>
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
 	<string name="portforward_pos">Skapa vidarebefodring av port</string>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Avbryt</string>
 
 	<string name="portforward_done">Vidarebefodring av port skapad.</string>
 	<string name="portforward_problem">Lyckades inte att skapa en vidarebefodring av port, är den under 1024 eller används den kanske?</string>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sortera efter namn</string>
 	<string name="list_menu_settings">Inställningar</string>
-	<string name="list_menu_help">Hjälp</string>
 
 	<string name="list_host_disconnect">Koppla ner</string>
 	<string name="list_host_edit">Inställningar för värd</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Godkänn</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Avbryt</string>
 	<!-- Button to go to the next page in the first time start-up wizard. -->
 	<string name="wizard_next">Nästa</string>
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">Identiteten av värden '%1$s' går ej att fastställa.</string>
-	<string name="terminal_hostkey">RSA-nyckel fingeravtrycket är %1$s</string>
-	<string name="terminal_hostkey_prompt">Är du säker att du vill\nfortsätta att ansluta?</string>
-
 	<string name="terminal_failed">Verifikation av värd-nyckeln misslyckades.</string>
 
 	<string name="terminal_auth">Försöker att autentisera</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a6409b2..c1c8623 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">帮助</string>
 
-	<string name="title_password">输入密码</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">编辑主机</string>
 	<string name="resolve_connect">连接</string>
 	<string name="resolve_entropy">Gather Entropy</string>
 
 	<string name="menu_insert">添加主机</string>
 	<string name="menu_delete">删除主机</string>
 	<string name="menu_preferences">设置</string>
-	<string name="menu_help">帮助</string>
 
 	<string name="help_intro">Please select a topic below for more information on a particular subject.</string>
 	<string name="help_about">关于。。。</string>
 	<string name="help_keyboard">键盘</string>
-	<string name="help_pubkeys">公钥</string>
-	<string name="help_portforwards">端口映射</string>
 
 	<string name="pubkey_generate">产生</string>
 	<string name="pubkey_import">导入</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Disconnect</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. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancel</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sort by name</string>
 	<string name="list_menu_settings">Settings</string>
-	<string name="list_menu_help">帮助</string>
 
 	<string name="list_host_disconnect">Disconnect</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancel</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. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Trying to authenticate</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2969d35..5cd5c65 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,23 +14,16 @@
 	<!-- Window title for Help index -->
 	<string name="title_help">Help</string>
 
-	<string name="title_password">Input Password</string>
-	<string name="title_entropy">Gathering Entropy</string>
-
-	<string name="resolve_edit">Edit Host</string>
 	<string name="resolve_connect">Connect</string>
 	<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="menu_help">Help</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="help_pubkeys">Pubkeys</string>
-	<string name="help_portforwards">Port Forwards</string>
 
 	<string name="pubkey_generate">Generate</string>
 	<string name="pubkey_import">Import</string>
@@ -273,8 +266,6 @@
 	<!-- 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 disconnect from the current host in a terminal. -->
-	<string name="console_menu_disconnect">Disconnect</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. -->
@@ -294,8 +285,6 @@
 	<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>
-	<!-- Button that cancels the creation of a port forward from the Port Forward Creation dialog. -->
-	<string name="portforward_neg">Cancel</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>
@@ -313,7 +302,6 @@
 	<!-- Selection choice to sort hosts by nickname. -->
 	<string name="list_menu_sortname">Sort by name</string>
 	<string name="list_menu_settings">Settings</string>
-	<string name="list_menu_help">Help</string>
 
 	<string name="list_host_disconnect">Disconnect</string>
 	<string name="list_host_edit">Edit host</string>
@@ -343,8 +331,6 @@
 
 	<!-- Button to agree to license terms. -->
 	<string name="wizard_agree">Agree</string>
-	<!-- Button to cancel out of (i.e., not accept) the license terms. -->
-	<string name="wizard_cancel">Cancel</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. -->
@@ -352,10 +338,6 @@
 
 	<string name="terminal_no_hosts_connected">No hosts currently connected</string>
 
-	<string name="terminal_hostkey_warn">The authenticity of host '%1$s' can't be established.</string>
-	<string name="terminal_hostkey">RSA key fingerprint is %1$s</string>
-	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
-
 	<string name="terminal_failed">Host key verification failed.</string>
 
 	<string name="terminal_auth">Trying to authenticate</string>
diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 9ac1c3f..7e43424 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -572,7 +572,7 @@ public class ConsoleActivity extends Activity {
 		}
 
 
-		disconnect = menu.add(R.string.console_menu_disconnect);
+		disconnect = menu.add(R.string.list_host_disconnect);
 		if (!sessionOpen && disconnected)
 			disconnect.setTitle(R.string.console_menu_close);
 		disconnect.setEnabled(activeTerminal);
@@ -681,7 +681,7 @@ public class ConsoleActivity extends Activity {
 
 		disconnect.setEnabled(activeTerminal);
 		if (sessionOpen || !disconnected)
-			disconnect.setTitle(R.string.console_menu_disconnect);
+			disconnect.setTitle(R.string.list_host_disconnect);
 		else
 			disconnect.setTitle(R.string.console_menu_close);
 		copy.setEnabled(activeTerminal);
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index 3b14caf..3f5f1f0 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -331,7 +331,7 @@ public class HostListActivity extends ListActivity {
 		settings.setIcon(android.R.drawable.ic_menu_preferences);
 		settings.setIntent(new Intent(HostListActivity.this, SettingsActivity.class));
 
-		MenuItem help = menu.add(R.string.list_menu_help);
+		MenuItem help = menu.add(R.string.title_help);
 		help.setIcon(android.R.drawable.ic_menu_help);
 		help.setIntent(new Intent(HostListActivity.this, HelpActivity.class));
 
diff --git a/src/org/connectbot/PortForwardListActivity.java b/src/org/connectbot/PortForwardListActivity.java
index 2cd6a57..ee26e11 100644
--- a/src/org/connectbot/PortForwardListActivity.java
+++ b/src/org/connectbot/PortForwardListActivity.java
@@ -224,7 +224,7 @@ public class PortForwardListActivity extends ListActivity {
 							}
 						}
 					})
-					.setNegativeButton(R.string.portforward_neg, null).create().show();
+					.setNegativeButton(R.string.delete_neg, null).create().show();
 
 				return true;
 			}
diff --git a/src/org/connectbot/WizardActivity.java b/src/org/connectbot/WizardActivity.java
index 9e76ba0..68a51fc 100644
--- a/src/org/connectbot/WizardActivity.java
+++ b/src/org/connectbot/WizardActivity.java
@@ -101,6 +101,6 @@ public class WizardActivity extends Activity {
 		boolean eula = (flipper.getDisplayedChild() == 0);
 
 		next.setText(eula ? getString(R.string.wizard_agree) : getString(R.string.wizard_next));
-		prev.setText(eula ? getString(R.string.wizard_cancel) : getString(R.string.wizard_back));
+		prev.setText(eula ? getString(R.string.delete_neg) : getString(R.string.wizard_back));
 	}
 }