From 2b87de98fc5507db76ef71e4ea1af70ad8240b5d Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Thu, 14 May 2009 17:50:52 +0000
Subject: * Fixed some buggy strings * Externalized "No hosts connected" string

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@235 df292f66-193f-0410-a5fc-6d59da041ff2
---
 res/layout/act_console.xml    |  2 +-
 res/values-bg/strings.xml     |  2 ++
 res/values-da/strings.xml     |  2 ++
 res/values-de/strings.xml     | 29 +++++++++++++++++++++--------
 res/values-es/strings.xml     |  2 ++
 res/values-fr/strings.xml     | 15 ++++++++-------
 res/values-it/strings.xml     |  2 ++
 res/values-nb/strings.xml     |  2 ++
 res/values-nl/strings.xml     |  2 ++
 res/values-ru/strings.xml     |  5 +++--
 res/values-sv/strings.xml     |  2 ++
 res/values-zh-rCN/strings.xml |  2 ++
 res/values/strings.xml        |  5 +++--
 13 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index da58b8c..336dddc 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -26,7 +26,7 @@
 		android:id="@android:id/empty"
 		android:layout_width="fill_parent"  
 		android:layout_height="fill_parent"  
-		android:text="No hosts currently connected"
+		android:text="@string/terminal_no_hosts_connected"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="center" 
 		/>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3a68d22..cbe1cc4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -350,6 +350,8 @@
 	<!-- 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>
+
 	<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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1b4fa61..39eec62 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -350,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Tilbage</string>
 
+	<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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2d1a9a9..538c6d2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -37,6 +37,7 @@
 	<string name="pubkey_delete">Schlüssel löschen</string>
 	<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>
@@ -75,6 +76,21 @@
 	<!-- Prompt for the password to unlock a certain pubkey. -->
 	<string name="prompt_pubkey_password">Passwort für Schlüssel '%1$s'</string>
 
+	<!-- The header of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
+	<string name="host_verification_failure_warning_header">WARNUNG: IDENTIFIKATION DES ENTFERNTEN HOSTS HAT SICH GEÄNDERT!</string>
+	<!-- The body of the warning a user gets when the host key has changed. Note that this can be a very serious attack, so we try to be as "loud" to the user as possible. -->
+	<string name="host_verification_failure_warning">MÖGLICHERWEISE TUT JEMAND ETWAS BÖSES!\nJemand könnte Sie jetzt gerade belauschen (man-in-the-middle attack)!\nEs ist auch möglich, dass nur der Host-Key geändert wurde.</string>
+
+	<!-- Prompt user gets when the remote host has disconnected unexpectedly. -->
+	<string name="prompt_host_disconnected">Der Host hat die Verbindung beendet.\nSitzung schließen?</string>
+	<!-- Prompt user must answer yes or no to when the remote host fails verification of encryption fingerprint -->
+	<string name="prompt_continue_connecting">Sind Sie sicher, dass Sie sich verbinden wollen?</string>
+
+	<!-- Sent to user when the remote public encryption key fingerprint doesn't match the local database -->
+	<string name="host_authenticity_warning">Die Authentizität von Host '%1$s' kann nicht bestätigt werden.</string>
+	<!-- First field is encryption algorithm. Second is the actual fingerprint in hex digits -->
+	<string name="host_fingerprint">Fingerabdruck von Host %1$s Schlüssel ist %2$s</string>
+
 	<string name="alert_passwords_do_not_match_msg">Passwörter stimmen nicht überein!</string>
 	<string name="alert_wrong_password_msg">Falsches Passwort!</string>
 	<string name="alert_key_corrupted_msg">Geheimer Schlüssel scheint korrupt!</string>
@@ -215,6 +231,8 @@
 
 	<!-- Host post-login automation preference title -->
 	<string name="hostpref_postlogin_title">Post-Login Automatisierung</string>
+	<!-- Host post-login automation preference summary -->
+	<string name="hostpref_postlogin_summary">Befehle, die auf dem entfernten Host nach der Anmeldung gestartet werden sollen.</string>
 
 	<!-- Host compression preference title -->
 	<string name="hostpref_compression_title">Kompression</string>
@@ -332,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Zurück</string>
 
+	<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>
@@ -361,14 +381,7 @@
 	<string name="upgrade_pos">Ja, aktualisieren</string>
 	<!-- Button selection to skip upgrading to the latest ConnectBot when one is available. -->
 	<string name="upgrade_neg">Nicht jetzt</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="host_verification_failure_warning_header">WARNUNG: IDENTIFIKATION DES ENTFERNTEN HOSTS HAT SICH GEÄNDERT!</string>
-	<string name="host_verification_failure_warning">MÖGLICHERWEISE TUT JEMAND ETWAS BÖSES!\nJemand könnte Sie jetzt gerade belauschen (man-in-the-middle attack)!\nEs ist auch möglich, dass nur der Host-Key geändert wurde.</string>
-	<string name="prompt_host_disconnected">Der Host hat die Verbindung beendet.\nSitzung schließen?</string>
-	<string name="prompt_continue_connecting">Sind Sie sicher, dass Sie sich verbinden wollen?</string>
-	<string name="host_authenticity_warning">Die Authentizität von Host '%1$s' kann nicht bestätigt werden.</string>
-	<string name="host_fingerprint">Fingerabdruck von Host %1$s Schlüssel ist %2$</string>
-	<string name="hostpref_postlogin_summary">Befehle, die auf dem entfernten Host nach der Anmeldung gestartet werden sollen.</string>
+
 	<string name="color_red">rot</string>
 	<string name="color_green">grün</string>
 	<string name="color_blue">blau</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b814b8a..664cc3e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -350,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Atrás</string>
 
+	<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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index aa4d3e0..5dbe20c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -45,8 +45,7 @@
 	<string name="pubkey_unknown_format">Format inconnu</string>
 	<string name="pubkey_change_password">Changer le mot de passe</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_import_parse_problem">Problem parsing imported private key</string>
 	<string name="pubkey_unlock">Déverrouiller la clé</string>
 	<string name="pubkey_failed_add">Bad password for key '%1$s'. Authentication failed.</string>
 	<string name="pubkey_memory_load">Charger en mémoire</string>
@@ -88,7 +87,7 @@
 	<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">L'autenthicité du serveur '%1' ne peut être établie.</string>
+	<string name="host_authenticity_warning">L'autenthicité du serveur '%1$s' ne peut être établie.</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>
 
@@ -263,11 +262,11 @@
 	<string name="hostpref_port_title">Port</string>
 
 	<!-- The time that has elapsed since a host was connected to when it has been less than an hour. -->
-	<string name="bind_minutes">Il ya %1 $s minutes</string>
+	<string name="bind_minutes">Il ya %1$s minutes</string>
 	<!-- The time that has elapsed since a host was connected to when it has been less than a day. -->
-	<string name="bind_hours">Il y a %1 $s heures</string>
+	<string name="bind_hours">Il y a %1$s heures</string>
 	<!-- The time that has elapsed since a host was connected to when it has been a day or more. -->
-	<string name="bind_days">Il y a %1 $s jours</string>
+	<string name="bind_days">Il y a %1$s jours</string>
 
 	<!-- Message given when user copies from the terminal. -->
 	<string name="console_copy_done">%1$d octets copié dans le presse-papier</string>
@@ -351,7 +350,9 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Précédent</string>
 
-	<string name="terminal_hostkey_warn">L'autenthicité du serveur '%1' ne peut être établie.</string>
+	<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>
 
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 47a4b34..64a5da3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -350,6 +350,8 @@
 	<!-- 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>
+
 	<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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cdcc240..8c8b5c5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -350,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Tilbake</string>
 
+	<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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 627ee9f..8ab198d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -350,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Terug</string>
 
+	<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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a8e69f8..26ef0e5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -45,8 +45,7 @@
 	<string name="pubkey_unknown_format">Неизвестный формат</string>
 	<string name="pubkey_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_import_parse_problem">Problem parsing imported private key</string>
 	<string name="pubkey_unlock">Разблокировать ключ</string>
 	<string name="pubkey_failed_add">Неверный пароль для ключа '%1$s'. Аутентификация не удалась</string>
 	<string name="pubkey_memory_load">Загрузка в память</string>
@@ -351,6 +350,8 @@
 	<!-- 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_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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f6c6e07..f6a192d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -350,6 +350,8 @@
 	<!-- Button to go to the previous page in the first time start-up wizard. -->
 	<string name="wizard_back">Tillbaka</string>
 
+	<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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ce991af..a6409b2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -350,6 +350,8 @@
 	<!-- 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>
+
 	<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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ec0c88..2969d35 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,8 +45,7 @@
 	<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_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>
@@ -351,6 +350,8 @@
 	<!-- 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>
+
 	<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>
-- 
cgit v1.2.3