From b4ae12d36fe991f54abfc7c525800421bbfcf878 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 17 Dec 2011 16:58:51 -0600
Subject: Externalize some strings

---
 res/layout-land/item_host.xml |  3 ++-
 res/layout-port/item_host.xml |  1 +
 res/layout/act_console.xml    |  3 +++
 res/layout/item_pubkey.xml    |  4 +++-
 res/values/strings.xml        | 26 ++++++++++++++++++++++++--
 tests/.classpath              |  2 +-
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/res/layout-land/item_host.xml b/res/layout-land/item_host.xml
index 4dd23a3..9cde624 100644
--- a/res/layout-land/item_host.xml
+++ b/res/layout-land/item_host.xml
@@ -28,12 +28,13 @@
 	<ImageView
 		android:id="@android:id/icon"
 		android:src="@drawable/connected"
+		android:contentDescription="@string/image_description_connected"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
 		android:paddingTop="5dip"
 		/>
-		
+
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
diff --git a/res/layout-port/item_host.xml b/res/layout-port/item_host.xml
index f8b9e85..24d34ba 100644
--- a/res/layout-port/item_host.xml
+++ b/res/layout-port/item_host.xml
@@ -32,6 +32,7 @@
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
 		android:paddingTop="5dip"
+		android:contentDescription="@string/image_description_connected"
 		/>
 		
 	<TextView
diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index 7d0cfee..f7db787 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -134,6 +134,7 @@
 			android:layout_alignParentBottom="true"
 			android:layout_alignParentRight="true"
 			android:src="@+drawable/button_keyboard"
+			android:contentDescription="@string/image_description_show_keyboard"
 			/>
 
 		<ImageView
@@ -144,6 +145,7 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentBottom="true"
 			android:src="@+drawable/button_ctrl"
+			android:contentDescription="@string/image_description_toggle_control_character"
 			/>
 
 		<ImageView
@@ -154,6 +156,7 @@
 			android:layout_toRightOf="@+id/button_ctrl"
 			android:layout_alignParentBottom="true"
 			android:src="@+drawable/button_esc"
+			android:contentDescription="@string/image_description_send_escape_character"
 			/>
 
 	</RelativeLayout>
diff --git a/res/layout/item_pubkey.xml b/res/layout/item_pubkey.xml
index a0d49ba..7f4fa5f 100644
--- a/res/layout/item_pubkey.xml
+++ b/res/layout/item_pubkey.xml
@@ -29,8 +29,10 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:src="@drawable/pubkey"
+		android:contentDescription="@string/image_description_key_is_locked"
 		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true" android:layout_marginLeft="10dip"/>
+		android:layout_alignParentTop="true"
+		android:layout_marginLeft="10dip"/>
 
 	<TextView
 		android:id="@android:id/text1"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d76c49e..43df648 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -465,6 +465,28 @@
 	<string name="color_green">"green"</string>
 	<string name="color_blue">"blue"</string>
 	<string name="color_gray">"gray"</string>
-	<string name="colors_fg">FG:</string>
-	<string name="color_bg">BG:</string>
+
+	<!-- Very short label indicating the thing next to it is "foreground color." -->
+	<string name="colors_fg">"FG":</string>
+
+	<!-- Very short label indicating the thing next to it is "background color." -->
+	<string name="color_bg">"BG:"</string>
+
+	<!-- Describes the image of the "connected to host" icon for accessibility purposes. -->
+	<string name="image_description_connected">"Connected."</string>
+
+	<!-- Describes the icon of the "locked pubkey" icon for accessibility purposes. -->
+	<string name="image_description_key_is_locked">"Key is locked."</string>
+
+	<!-- Describes the icon of the "send control character" button in the terminal view for
+	     accessibility purposes. -->
+	<string name="image_description_toggle_control_character">Toggle control character.</string>
+
+	<!-- Describes the icon of the "send escape character" button in the terminal view for
+	     accessibility purposes. -->
+	<string name="image_description_send_escape_character">Send escape character.</string>
+
+	<!-- Describes the icon of the "show keyboard" button in the terminal view for accessibility
+	     purposes. -->
+	<string name="image_description_show_keyboard">Show keyboard.</string>
 </resources>
diff --git a/tests/.classpath b/tests/.classpath
index ae03331..d43ec27 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/connectbot"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
-- 
cgit v1.2.3