Externalize preference strings so they may be translated.

3 files changed, 159 insertions, 51 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55ecb7e..ef4d8d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,6 +73,9 @@
 	<!-- 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>
+
 	<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>
@@ -122,6 +125,67 @@
 	<!-- Do not translate -->
 	<string name="pref_bumpyarrows">bumpyarrows</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>
+
 	<!-- 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. -->
@@ -141,6 +205,45 @@
 	<!-- 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>
+
+	<!-- Host post-login automation preference title -->
+	<string name="hostpref_postlogin_title">Post-login automation</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>
+
+	<!-- 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>
+
 	<!-- 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. -->
@@ -240,11 +343,17 @@
 	<string name="terminal_auth_pass_hint">Password</string>
 	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</string>
 
+	<string name="terminal_auth_pubkey_any">Attempting 'publickey' authentication with any in-memory public keys</string>
+	<string name="terminal_auth_pubkey_invalid">Selected public key is invalid, try reselecting key in host editor</string>
+	<string name="terminal_auth_pubkey_specific">Attempting 'publickey' authentication with a specific public key</string>
+
 	<string name="terminal_auth_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="local_shell_unavailable">Failure! Local shell is unavailable on this phone.</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. -->
diff --git a/res/xml/host_prefs.xml b/res/xml/host_prefs.xml
index 01e5546..387528a 100644
--- a/res/xml/host_prefs.xml
+++ b/res/xml/host_prefs.xml
@@ -20,13 +20,13 @@
 
 	<EditTextPreference
 		android:key="nickname"
-		android:title="Nickname"
+		android:title="@string/hostpref_nickname_title"
 		android:singleLine="true"
 		/>
 
 	<ListPreference
 		android:key="color"
-		android:title="Color category"
+		android:title="@string/hostpref_color_title"
 		android:entries="@array/list_colors"
 		android:entryValues="@array/list_colors"
 		/>
@@ -39,59 +39,58 @@
 
 	<ListPreference
 		android:key="pubkeyid"
-		android:title="Use pubkey authentication"
+		android:title="@string/hostpref_pubkeyid_title"
 		android:entries="@array/list_pubkeyids"
 		android:entryValues="@array/list_pubkeyids_value"
 		/>
 		
 	<EditTextPreference
 		android:key="postlogin"
-		android:title="Post-login automation"
+		android:title="@string/hostpref_postlogin_title"
 		android:summary="Commands to run on remote server once authenticated"
 		/>
 		
 	<CheckBoxPreference
 		android:key="compression"
-		android:title="Enable compression"
-		android:summary="This may help with slower networks"
+		android:title="@string/hostpref_compression_title"
+		android:summary="@string/hostpref_compression_summary"
 		/>
 		
 	<CheckBoxPreference
 		android:key="wantsession"
-		android:title="Start shell session"
-		android:summary="Disable this preference to only use port forwards"
+		android:title="@string/hostpref_wantsession_title"
+		android:summary="@string/hostpref_wantsession_summary"
 		/>
 
 	<ListPreference
 		android:key="encoding"
-		android:title="Encoding"
-		android:summary="Character encoding for the host"
+		android:title="@string/hostpref_encoding_title"
+		android:summary="@string/hostpref_encoding_summary"
 		android:entries="@array/list_encodings"
 		android:entryValues="@array/list_encodings_value"
 		/>
 	
 	<PreferenceCategory
-		android:title="Connection settings">
+		android:title="@string/hostpref_connection_category">
 		
 		<EditTextPreference
 			android:key="username"
-			android:title="Username"
+			android:title="@string/hostpref_username_title"
 			android:singleLine="true"
 			/>
 
 		<EditTextPreference
 			android:key="hostname"
-			android:title="Host"
+			android:title="@string/hostpref_hostname_title"
 			android:singleLine="true"
 			/>
 
 		<EditTextPreference
 			android:key="port"
-			android:title="Port"
+			android:title="@string/hostpref_port_title"
 			android:singleLine="true"
 			/>
 
 	</PreferenceCategory>
 
-
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 676d866..ef384f1 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,37 +19,37 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<CheckBoxPreference
-		android:key="@string/pref_memkeys"
-		android:title="Remember keys in memory"
-		android:summary="Keep unlocked SSH keys in memory until backend service is terminated"
+		android:key="memkeys"
+		android:title="@string/pref_memkeys_title"
+		android:summary="@string/pref_memkeys_summary"
 		android:defaultValue="true"
 		/>
 
 	<ListPreference
-		android:key="@string/pref_update"
-		android:title="Update check"
-		android:summary="Set the maximum frequency to check for ConnectBot updates"
+		android:key="update"
+		android:title="@string/pref_update_title"
+		android:summary="@string/pref_update_summary"
 		android:entries="@array/list_update"
 		android:entryValues="@array/list_update"
 		android:defaultValue="@string/list_update_daily"
 		/>
 
 	<PreferenceCategory
-		android:title="Terminal emulation">
+		android:title="@string/pref_emulation_category">
 		
 		<ListPreference
-			android:key="@string/pref_emulation"
-			android:title="Emulation mode"
-			android:summary="Terminal emulation mode to use for PTY connections"
+			android:key="emulation"
+			android:title="@string/pref_emulation_title"
+			android:summary="@string/pref_emulation_summary"
 			android:entries="@array/list_emulation_modes"
 			android:defaultValue="screen"
 			android:entryValues="@array/list_emulation_modes"
 			/>
 	
 		<EditTextPreference
-			android:key="@string/pref_scrollback"
-			android:title="Scrollback size"
-			android:summary="Size of scrollback buffer to keep in memory for each console"
+			android:key="scrollback"
+			android:title="@string/pref_scrollback_title"
+			android:summary="@string/pref_scrollback_summary"
 			android:defaultValue="140"
 			android:singleLine="true"
 			/>
@@ -57,60 +57,60 @@
 	</PreferenceCategory>
 
 	<PreferenceCategory
-		android:title="User interface">
+		android:title="@string/pref_ui_category">
 
 		<ListPreference
-			android:key="@string/pref_rotation"
-			android:title="Rotation mode"
-			android:summary="How to change rotation when keyboard popped in/out"
+			android:key="rotation"
+			android:title="@string/pref_rotation_title"
+			android:summary="@string/pref_rotation_summary"
 			android:entries="@array/list_rotation"
 			android:entryValues="@array/list_rotation"
 			android:defaultValue="@string/list_rotation_land"
 			/>
 
 		<CheckBoxPreference
-			android:key="@string/pref_fullscreen"
-			android:title="Full screen"
-			android:summary="Hide status bar while in console"
+			android:key="fullscreen"
+			android:title="@string/pref_fullscreen_title"
+			android:summary="@string/pref_fullscreen_summary"
 			android:defaultValue="false"
 			/>
 			
 		<ListPreference
-			android:key="@string/pref_keymode"
-			android:title="Directory shortcuts"
-			android:summary="Select how to use Alt for \'/\' and Shift for Tab"
+			android:key="keymode"
+			android:title="@string/pref_keymode_title"
+			android:summary="@string/pref_keymode_summary"
 			android:entries="@array/list_keymode"
 			android:entryValues="@array/list_keymode"
 			android:defaultValue="@string/list_keymode_right"
 			/>
 	
 		<ListPreference
-			android:key="@string/pref_camera"
-			android:title="Camera shortcut"
-			android:summary="Select which shortcut to trigger when camera button is pushed"
+			android:key="camera"
+			android:title="@string/pref_camera_title"
+			android:summary="@string/pref_camera_summary"
 			android:entries="@array/list_camera"
 			android:entryValues="@array/list_camera"
 			android:defaultValue="@string/list_camera_ctrlaspace"
 			/>
 
 		<CheckBoxPreference
-			android:key="@string/pref_keepalive"
-			android:title="Keep screen awake"
-			android:summary="Prevent the screen from turning off when working in a console"
+			android:key="keepalive"
+			android:title="@string/pref_keepalive_title"
+			android:summary="@string/pref_keepalive_summary"
 			android:defaultValue="true"
 			/>
 			
 		<CheckBoxPreference
-			android:key="@string/pref_wifilock"
-			android:title="Keep Wi-Fi active"
-			android:summary="Prevent Wi-Fi from turning off when a session is active"
+			android:key="wifilock"
+			android:title="@string/pref_wifilock_title"
+			android:summary="@string/pref_wifilock_summary"
 			android:defaultValue="true"
 			/>
 
 		<CheckBoxPreference
-			android:key="@string/pref_bumpyarrows"
-			android:title="Bumpy arrow keys"
-			android:summary="Vibrate when sending arrow keys from trackball, useful for laggy connections"
+			android:key="bumpyarrows"
+			android:title="@string/pref_bumpyarrows_title"
+			android:summary="@string/pref_bumpyarrows_summary"
 			android:defaultValue="true"
 			/>