From b1e36ff4d0ec32527d7917cce6f022bd19fff117 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 30 May 2009 01:31:47 +0000
Subject: Avoid the wrath of Romain

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@238 df292f66-193f-0410-a5fc-6d59da041ff2
---
 res/layout/act_console.xml         |  49 +++---
 res/layout/act_generatepubkey.xml  | 327 +++++++++++++++++++------------------
 res/layout/act_help.xml            |  16 +-
 res/layout/act_help_topic.xml      |   6 +-
 res/layout/act_hostlist.xml        | 108 ++++++------
 res/layout/act_portforwardlist.xml |  24 +--
 res/layout/act_pubkeylist.xml      |  22 +--
 res/layout/act_wizard.xml          |  16 +-
 res/layout/dia_changepassword.xml  | 143 ++++++++--------
 res/layout/dia_gatherentropy.xml   |  10 +-
 res/layout/dia_password.xml        |   9 +-
 res/layout/dia_portforward.xml     | 123 +++++++++-----
 res/layout/dia_resize.xml          |  12 +-
 res/layout/item_portforward.xml    |  19 ++-
 res/layout/item_pubkey.xml         |  64 ++++----
 res/layout/item_terminal.xml       |  35 ++--
 res/layout/wiz_eula.xml            | 132 +++++++--------
 17 files changed, 573 insertions(+), 542 deletions(-)

diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index 336dddc..2a995fc 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -2,39 +2,40 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"  
-	android:layout_height="fill_parent"  
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
 	android:background="#ff000000"
 	>
-	
+
 	<TextView
 		android:id="@android:id/empty"
-		android:layout_width="fill_parent"  
-		android:layout_height="fill_parent"  
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
 		android:text="@string/terminal_no_hosts_connected"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center" 
+		android:gravity="center"
 		/>
 
 	<ViewFlipper
-		android:id="@+id/console_flip"  
-		android:layout_width="fill_parent"  
-		android:layout_height="fill_parent" 
+		android:id="@+id/console_flip"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
 		/>
 
 	<RelativeLayout
@@ -46,7 +47,7 @@
 		android:background="#80000000"
 		android:visibility="gone"
 		>
-		
+
 		<TextView
 			android:id="@+id/console_password_hint"
 			android:layout_height="wrap_content"
@@ -54,18 +55,18 @@
 			android:layout_width="fill_parent"
 			android:visibility="gone"
 			/>
-			
+
 		<EditText
 			android:id="@+id/console_password"
-			android:layout_width="fill_parent"  
+			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:password="true"
 			android:singleLine="true"
 			android:layout_below="@+id/console_password_hint"
 			/>
-		
+
 	</RelativeLayout>
-	
+
 	<RelativeLayout
 		android:id="@+id/console_boolean_group"
 		android:layout_width="fill_parent"
@@ -77,14 +78,14 @@
 		android:fadingEdgeLength="25dip"
 		android:visibility="gone"
 		>
-		
+
 		<TextView
 			android:id="@+id/console_prompt"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:layout_width="fill_parent"
 			/>
-			
+
 		<Button
 			android:id="@+id/console_prompt_no"
 			android:text="No"
@@ -92,7 +93,7 @@
 			android:paddingBottom="10dip"
 			android:paddingLeft="40dip"
 			android:paddingRight="40dip"
-			android:layout_width="wrap_content"  
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
 			android:layout_below="@+id/console_prompt"
@@ -106,12 +107,12 @@
 			android:paddingBottom="10dip"
 			android:paddingLeft="40dip"
 			android:paddingRight="40dip"
-			android:layout_width="wrap_content"  
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_toLeftOf="@+id/console_prompt_no"
 			android:layout_below="@+id/console_prompt"
 			/>
-	
+
 	</RelativeLayout>
-	
-</RelativeLayout>
\ No newline at end of file
+
+</RelativeLayout>
diff --git a/res/layout/act_generatepubkey.xml b/res/layout/act_generatepubkey.xml
index b5a5fe6..dac505f 100644
--- a/res/layout/act_generatepubkey.xml
+++ b/res/layout/act_generatepubkey.xml
@@ -1,167 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    ConnectBot: simple, powerful, open-source SSH client for Android
-    Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey This program
-    is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version. This program is distributed
-    in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-    without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-    more details. You should have received a copy of the GNU General
-    Public License along with this program. If not, see
-    <http://www.gnu.org/licenses/>.
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:scrollbars="vertical"
-    android:layout_width="fill_parent">
-
-    <TableLayout
-        android:orientation="vertical"
-        android:layout_height="wrap_content"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:scrollbars="vertical"
-        android:layout_width="fill_parent">
-
-        <TableRow>
-            <TextView
-                android:text="@string/prompt_nickname"
-                android:paddingRight="10dip"
-                android:gravity="right|center_vertical"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <EditText
-                android:id="@+id/nickname"
-                android:hint="@string/prompt_nickname_hint_pubkey"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <TableRow>
-            <TextView
-                android:text="@string/prompt_type"
-                android:paddingRight="10dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:gravity="bottom|right"
-                android:layout_gravity="center_vertical" />
-
-            <RadioGroup
-                android:id="@+id/key_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:checkedButton="@+id/rsa">
-
-                <RadioButton
-                    android:id="@+id/rsa"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="RSA"
-                    android:paddingRight="30dip" />
-
-                <RadioButton
-                    android:id="@+id/dsa"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="DSA" />
-            </RadioGroup>
-        </TableRow>
-
-        <TableRow>
-            <TextView
-                android:text="@string/prompt_bits"
-                android:paddingRight="10dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:gravity="right|center_vertical" />
-
-            <EditText
-                android:id="@+id/bits"
-                android:layout_height="wrap_content"
-                android:text="1024"
-                android:numeric="integer"
-                android:singleLine="true"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <SeekBar
-            android:layout_height="wrap_content"
-            android:id="@+id/bits_slider"
-            android:layout_width="fill_parent"
-            android:paddingBottom="10dip"
-            android:max="3328"
-            android:progress="256" />
-
-        <TextView
-            android:text="@string/prompt_password_can_be_blank"
-            android:gravity="left"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content" />
-
-        <TableRow>
-            <TextView
-                android:paddingRight="10dip"
-                android:gravity="right|center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/prompt_password" />
-
-            <EditText
-                android:id="@+id/password1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:password="true"
-                android:singleLine="true"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <TableRow>
-            <LinearLayout
-                android:paddingRight="10dip"
-                android:orientation="vertical"
-                android:gravity="right|center_vertical">
-
-                <TextView
-                    android:gravity="right|bottom"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/prompt_password" />
-
-                <TextView
-                    android:gravity="right|top"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/prompt_again" />
-            </LinearLayout>
-
-            <EditText
-                android:id="@+id/password2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:password="true"
-                android:singleLine="true"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/unlock_at_startup"
-            android:text="@string/pubkey_load_on_start" />
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/save"
-            android:text="@string/pubkey_generate"
-            android:enabled="false" />
-    </TableLayout>
-</ScrollView>
\ No newline at end of file
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="wrap_content"
+	android:scrollbars="vertical"
+	android:layout_width="fill_parent">
+
+	<TableLayout
+		android:orientation="vertical"
+		android:layout_height="wrap_content"
+		android:paddingLeft="10dip"
+		android:paddingRight="10dip"
+		android:scrollbars="vertical"
+		android:layout_width="fill_parent">
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_nickname"
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium" />
+
+			<EditText
+				android:id="@+id/nickname"
+				android:hint="@string/prompt_nickname_hint_pubkey"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_weight="1" />
+		</TableRow>
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_type"
+				android:paddingRight="10dip"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:gravity="bottom|right"
+				android:layout_gravity="center_vertical" />
+
+			<RadioGroup
+				android:id="@+id/key_type"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:checkedButton="@+id/rsa">
+
+				<RadioButton
+					android:id="@+id/rsa"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="RSA"
+					android:paddingRight="30dip" />
+
+				<RadioButton
+					android:id="@+id/dsa"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="DSA" />
+			</RadioGroup>
+		</TableRow>
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_bits"
+				android:paddingRight="10dip"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:gravity="right|center_vertical" />
+
+			<EditText
+				android:id="@+id/bits"
+				android:layout_height="wrap_content"
+				android:text="1024"
+				android:numeric="integer"
+				android:singleLine="true"
+				android:layout_weight="1" />
+		</TableRow>
+
+		<SeekBar
+			android:layout_height="wrap_content"
+			android:id="@+id/bits_slider"
+			android:layout_width="fill_parent"
+			android:paddingBottom="10dip"
+			android:max="3328"
+			android:progress="256" />
+
+		<TextView
+			android:text="@string/prompt_password_can_be_blank"
+			android:gravity="left"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content" />
+
+		<TableRow>
+			<TextView
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:text="@string/prompt_password" />
+
+			<EditText
+				android:id="@+id/password1"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:password="true"
+				android:singleLine="true"
+				android:layout_weight="1" />
+		</TableRow>
+
+		<TableRow>
+			<LinearLayout
+				android:paddingRight="10dip"
+				android:orientation="vertical"
+				android:gravity="right|center_vertical">
+
+				<TextView
+					android:gravity="right|bottom"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:text="@string/prompt_password" />
+
+				<TextView
+					android:gravity="right|top"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:text="@string/prompt_again" />
+			</LinearLayout>
+
+			<EditText
+				android:id="@+id/password2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:password="true"
+				android:singleLine="true"
+				android:layout_weight="1" />
+		</TableRow>
+
+		<CheckBox
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/unlock_at_startup"
+			android:text="@string/pubkey_load_on_start" />
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/save"
+			android:text="@string/pubkey_generate"
+			android:enabled="false" />
+	</TableLayout>
+</ScrollView>
diff --git a/res/layout/act_help.xml b/res/layout/act_help.xml
index 5cc8e5f..8457991 100644
--- a/res/layout/act_help.xml
+++ b/res/layout/act_help.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -23,7 +23,7 @@
 	android:layout_height="wrap_content"
 	android:layout_weight="1"
 	>
-	
+
 	<LinearLayout
 		android:id="@+id/topics"
 		android:orientation="vertical"
@@ -31,7 +31,7 @@
 		android:layout_height="fill_parent"
 		android:gravity="center_horizontal"
 		>
-	
+
 		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
 			android:gravity="right"
 			android:paddingRight="2dip"
 			/>
-			
+
 		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
@@ -50,6 +50,6 @@
 			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:gravity="center_horizontal"
 			/>
-		
+
 	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/act_help_topic.xml b/res/layout/act_help_topic.xml
index 052bede..cb88938 100644
--- a/res/layout/act_help_topic.xml
+++ b/res/layout/act_help_topic.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
diff --git a/res/layout/act_hostlist.xml b/res/layout/act_hostlist.xml
index 091ae3e..7c29617 100644
--- a/res/layout/act_hostlist.xml
+++ b/res/layout/act_hostlist.xml
@@ -1,57 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    ConnectBot: simple, powerful, open-source SSH client for Android
-    Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey This program
-    is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version. This program is distributed
-    in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-    without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-    more details. You should have received a copy of the GNU General
-    Public License along with this program. If not, see
-    <http://www.gnu.org/licenses/>.
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>
 -->
 
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <ListView
-            android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-
-        <TextView
-            android:id="@android:id/empty"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:text="@string/list_host_empty"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center" />
-
-    </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="5dip">
-
-        <EditText
-            android:id="@+id/front_quickconnect"
-            android:singleLine="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/hint_userhost" />
-
-    </FrameLayout>
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	>
+
+	<RelativeLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1"
+		>
+
+		<ListView
+			android:id="@android:id/list"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			/>
+
+		<TextView
+			android:id="@android:id/empty"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:text="@string/list_host_empty"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:gravity="center"
+			/>
+
+	</RelativeLayout>
+
+	<FrameLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="5dip"
+		>
+
+		<EditText
+			android:id="@+id/front_quickconnect"
+			android:singleLine="true"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:hint="@string/hint_userhost"
+			/>
 
+	</FrameLayout>
 </LinearLayout>
diff --git a/res/layout/act_portforwardlist.xml b/res/layout/act_portforwardlist.xml
index f2fea38..418a4cd 100644
--- a/res/layout/act_portforwardlist.xml
+++ b/res/layout/act_portforwardlist.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -22,18 +22,18 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
-	
+
 	<ListView android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"
 		/>
-		
-   <TextView android:id="@android:id/empty"
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent"
-        android:text="@string/portforward_list_empty"
+
+	<TextView android:id="@android:id/empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:text="@string/portforward_list_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center"
-        />
-</LinearLayout>
\ No newline at end of file
+		android:gravity="center"
+		/>
+</LinearLayout>
diff --git a/res/layout/act_pubkeylist.xml b/res/layout/act_pubkeylist.xml
index 1467086..0d79dfa 100644
--- a/res/layout/act_pubkeylist.xml
+++ b/res/layout/act_pubkeylist.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -22,18 +22,18 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
-	
+
 	<ListView android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"
 		/>
-		
-   <TextView android:id="@android:id/empty"
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent"
-        android:text="@string/pubkey_list_empty"
+
+	<TextView android:id="@android:id/empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:text="@string/pubkey_list_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center"
-        />
+		android:gravity="center"
+		/>
 </LinearLayout>
diff --git a/res/layout/act_wizard.xml b/res/layout/act_wizard.xml
index 9d59126..2af392c 100644
--- a/res/layout/act_wizard.xml
+++ b/res/layout/act_wizard.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -30,14 +30,14 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		/>
-		
+
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:padding="5dip"
 		>
-		
+
 		<Button
 			android:id="@+id/action_prev"
 			android:layout_width="120dip"
@@ -46,7 +46,7 @@
 			android:text="Cancel"
 			android:gravity="center"
 			/>
-	
+
 		<Button
 			android:id="@+id/action_next"
 			android:layout_width="120dip"
@@ -55,7 +55,7 @@
 			android:text="Agree"
 			android:gravity="center"
 			/>
-	
+
 	</LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/dia_changepassword.xml b/res/layout/dia_changepassword.xml
index 2487b79..e7a6478 100644
--- a/res/layout/dia_changepassword.xml
+++ b/res/layout/dia_changepassword.xml
@@ -2,102 +2,97 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="wrap_content"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:paddingLeft="10dip"
 	android:paddingRight="10dip"
 	>
-	
-	<TableLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		>
-		
-		<TableRow android:id="@+id/old_password_prompt">
+
+	<TableRow android:id="@+id/old_password_prompt">
+		<TextView
+			android:text="@string/prompt_old_password"
+			android:paddingRight="10dip"
+			android:gravity="right|center_vertical"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_width="wrap_content"
+			/>
+
+		<EditText
+			android:id="@+id/old_password"
+			android:layout_width="200dip"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:password="true"
+			/>
+	</TableRow>
+
+	<TableRow>
+		<TextView
+			android:text="@string/prompt_password"
+			android:paddingRight="10dip"
+			android:gravity="right|center_vertical"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_width="wrap_content"
+			/>
+
+		<EditText
+			android:id="@+id/password1"
+			android:layout_width="200dip"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:password="true"
+			/>
+	</TableRow>
+
+	<TableRow>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:gravity="right"
+			>
+
 			<TextView
-				android:text="@string/prompt_old_password"
-				android:paddingRight="10dip"
-				android:gravity="right|center_vertical"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				/>
-				
-			<EditText
-				android:id="@+id/old_password"
-				android:layout_width="200dip"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:password="true"
-				/>
-		</TableRow>
-				
-		<TableRow>
-			<TextView
 				android:text="@string/prompt_password"
 				android:paddingRight="10dip"
-				android:gravity="right|center_vertical"
+				android:gravity="right|bottom"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
-				
-			<EditText
-				android:id="@+id/password1"
-				android:layout_width="200dip"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:password="true"
-				/>
-		</TableRow>
-		
-		<TableRow>
-			<LinearLayout
+
+			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:gravity="right"
-				>
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/prompt_password"
-					android:paddingRight="10dip"
-					android:gravity="right|bottom"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					/>
-					
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/prompt_again"
-					android:paddingRight="10dip"
-					android:gravity="right|top"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
-			</LinearLayout>
-			
-			<EditText
-				android:id="@+id/password2"
-				android:layout_width="200dip"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:password="true"
+				android:text="@string/prompt_again"
+				android:paddingRight="10dip"
+				android:gravity="right|top"
+				android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
-		</TableRow>
-		
-	</TableLayout>
-</LinearLayout>
\ No newline at end of file
+		</LinearLayout>
+
+		<EditText
+			android:id="@+id/password2"
+			android:layout_width="200dip"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:password="true"
+			/>
+	</TableRow>
+</TableLayout>
diff --git a/res/layout/dia_gatherentropy.xml b/res/layout/dia_gatherentropy.xml
index 0dbb412..6639235 100644
--- a/res/layout/dia_gatherentropy.xml
+++ b/res/layout/dia_gatherentropy.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -24,14 +24,14 @@
 	android:paddingLeft="10dip"
 	android:paddingRight="10dip"
 	>
-	
+
 	<TextView
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/pubkey_touch_hint"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="center"/>
-		
+
 	<org.connectbot.util.EntropyView
 		android:id="@+id/entropy"
 		android:layout_width="fill_parent"
diff --git a/res/layout/dia_password.xml b/res/layout/dia_password.xml
index 1f84986..1750600 100644
--- a/res/layout/dia_password.xml
+++ b/res/layout/dia_password.xml
@@ -2,20 +2,21 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="250dip"
 	android:layout_height="wrap_content"
@@ -31,6 +32,6 @@
 		android:password="true"
 		android:hint="Password"
 		/>
-			
+
 </LinearLayout>
 
diff --git a/res/layout/dia_portforward.xml b/res/layout/dia_portforward.xml
index ae36c50..fe7abcb 100644
--- a/res/layout/dia_portforward.xml
+++ b/res/layout/dia_portforward.xml
@@ -2,67 +2,104 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="fill_parent"
-	android:layout_width="fill_parent"	
+	android:layout_width="fill_parent"
 	android:scrollbars="vertical"
 	>
-	
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:orientation="vertical"
+
+	<TableLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:paddingLeft="10dip"
 		android:paddingRight="10dip"
 		>
-		
-		<TableLayout 
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			>
-			
-			<TableRow>
-				<TextView android:text="@string/prompt_nickname" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-				<EditText android:id="@+id/nickname" android:hint="Internal Webserver" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" />
-			</TableRow>
-			
-			<TableRow>
-				<TextView android:text="@string/prompt_type" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-				<Spinner android:id="@+id/portforward_type"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:entries="@array/list_portforward_types"
-					android:prompt="@string/prompt_type"
-					android:layout_weight="1"
-					/>
-			</TableRow>
-			
-			<TableRow>
-				<TextView android:text="@string/prompt_source_port" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-				<EditText android:id="@+id/portforward_source" android:hint="143" android:layout_width="fill_parent" android:layout_height="wrap_content" android:numeric="integer" android:singleLine="true" android:layout_weight="1" />
-			</TableRow>
-			
-			<TableRow>
-				<TextView android:text="@string/prompt_destination" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-				<EditText android:id="@+id/portforward_destination" android:hint="localhost:143" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" />
-			</TableRow>
-	
-		</TableLayout>
-	
-	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_nickname"
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
+
+			<EditText
+				android:id="@+id/nickname"
+				android:hint="Internal Webserver"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_weight="1"
+				/>
+		</TableRow>
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_type"
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
+
+			<Spinner android:id="@+id/portforward_type"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:entries="@array/list_portforward_types"
+				android:prompt="@string/prompt_type"
+				android:layout_weight="1"
+				/>
+		</TableRow>
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_source_port"
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
+
+			<EditText
+				android:id="@+id/portforward_source"
+				android:hint="143"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:numeric="integer"
+				android:singleLine="true"
+				android:layout_weight="1"
+				/>
+		</TableRow>
+
+		<TableRow>
+			<TextView
+				android:text="@string/prompt_destination"
+				android:paddingRight="10dip"
+				android:gravity="right|center_vertical"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
+
+			<EditText
+				android:id="@+id/portforward_destination"
+				android:hint="localhost:143"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_weight="1"
+				/>
+		</TableRow>
+	</TableLayout>
+</ScrollView>
diff --git a/res/layout/dia_resize.xml b/res/layout/dia_resize.xml
index 208e7a4..49a7958 100644
--- a/res/layout/dia_resize.xml
+++ b/res/layout/dia_resize.xml
@@ -2,17 +2,17 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -24,7 +24,7 @@
 	android:paddingLeft="10dip"
 	android:paddingRight="10dip"
 	>
-			
+
 	<EditText
 		android:id="@+id/width"
 		android:layout_width="100dip"
@@ -42,11 +42,11 @@
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		/>
 
-	
+
 	<EditText
 		android:id="@+id/height"
 		android:layout_width="100dip"
 		android:layout_height="wrap_content"
 		android:singleLine="true"
 		android:numeric="integer" android:text="25"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/item_portforward.xml b/res/layout/item_portforward.xml
index fd53d98..5ab467c 100644
--- a/res/layout/item_portforward.xml
+++ b/res/layout/item_portforward.xml
@@ -2,39 +2,40 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	android:gravity="left|center_vertical" android:layout_width="wrap_content">
-	
+
 	<TextView
-		android:id="@android:id/text1"  
+		android:id="@android:id/text1"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:text="Tunnel Nickname"
 		/>
-		
+
 	<TextView
-		android:id="@android:id/text2"  
+		android:id="@android:id/text2"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:text="Local port 8080 to 192.168.1.1:80"
 		/>
-		
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
diff --git a/res/layout/item_pubkey.xml b/res/layout/item_pubkey.xml
index 0f811b8..0a58e6a 100644
--- a/res/layout/item_pubkey.xml
+++ b/res/layout/item_pubkey.xml
@@ -2,58 +2,50 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@android:id/content"  
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/content"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:padding="10dip"
-	android:orientation="horizontal">
-	
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_weight="1"
-		android:gravity="left|center_vertical">
-		
-		<TextView
-			android:id="@android:id/text1"  
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:text="Key Example"
-			/>
-			
-		<TextView
-			android:id="@android:id/text2"  
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:text="DSA 1024-bit"
-			/>
-	</LinearLayout>
-	
+	android:padding="10dip">
+
 	<ImageView
 		android:id="@android:id/icon1"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:src="@drawable/pubkey"
-		android:paddingTop="5dip"
-		android:layout_gravity="right"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentTop="true" android:layout_marginLeft="10dip"/>
+
+	<TextView
+		android:id="@android:id/text1"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="Key Example"
+		android:layout_alignParentLeft="true"
+		android:bufferType="normal" android:layout_width="wrap_content" android:layout_toLeftOf="@android:id/icon1"/>
+
+	<TextView
+		android:id="@android:id/text2"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:text="DSA 1024-bit"
+		android:layout_below="@android:id/text1"
 		/>
-		
-</LinearLayout>
\ No newline at end of file
+
+</RelativeLayout>
diff --git a/res/layout/item_terminal.xml b/res/layout/item_terminal.xml
index 7415406..1fc77d3 100644
--- a/res/layout/item_terminal.xml
+++ b/res/layout/item_terminal.xml
@@ -2,42 +2,35 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
-	
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:gravity="center"
-		>
 
-		<TextView
-			android:id="@+id/terminal_overlay"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:background="#aa000000"
-			android:padding="10dip"
-			/>
-	
-	</LinearLayout>
+	<TextView
+		android:id="@+id/terminal_overlay"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:background="#aa000000"
+		android:padding="10dip"
+		android:layout_centerInParent="true"
+		/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/wiz_eula.xml b/res/layout/wiz_eula.xml
index e0df10b..86a8bd4 100644
--- a/res/layout/wiz_eula.xml
+++ b/res/layout/wiz_eula.xml
@@ -2,94 +2,94 @@
 <!--
 	ConnectBot: simple, powerful, open-source SSH client for Android
 	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:layout_weight="1"
 	>
-	
-<LinearLayout
-	android:orientation="vertical"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:padding="10dip"
-	>
 
-	<TextView
-		android:layout_width="fill_parent"
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		/>
+		android:padding="10dip"
+		>
 
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
 
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:text="Before we get started, we need to get some legal information out of the way.  ConnectBot is provided under a GPLv3 license.  Here are a few key points:\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
 
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:autoLink="web"
-		android:text="You can view the full text at http://www.gnu.org/licenses/gpl-3.0.txt"
-		android:textSize="14sp"
-		android:textColor="#bebebe"
-		/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:text="Before we get started, we need to get some legal information out of the way.  ConnectBot is provided under a GPLv3 license.  Here are a few key points:\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			/>
 
- 	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:text="About and Credits"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		/>
- 
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:autoLink="web"
-		android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-20004 http://www.jcraft.com"
-		android:textSize="14sp"
-		android:textColor="#bebebe"
-		/>
- 
-		
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dip"
-		android:text="@string/msg_version"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
-		
-</LinearLayout>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:autoLink="web"
+			android:text="You can view the full text at http://www.gnu.org/licenses/gpl-3.0.txt"
+			android:textSize="14sp"
+			android:textColor="#bebebe"
+			/>
+
+ 		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:text="About and Credits"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:autoLink="web"
+			android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-20004 http://www.jcraft.com"
+			android:textSize="14sp"
+			android:textColor="#bebebe"
+			/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dip"
+			android:text="@string/msg_version"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			/>
+
+	</LinearLayout>
 
 </ScrollView>
-- 
cgit v1.2.3