* added better keyboard shortcut into to wizard

* moved a large chunk of strings into strings.xml, still need to think harder about how to handle in TerminalBridge because it needs a Resources object
* udpated version strings in manifest to 1.1 and 110
* removed R.java file to help svn-build-bot

4 files changed, 155 insertions, 11 deletions

diff --git a/res/drawable/keyboard.png b/res/drawable/keyboard.png
new file mode 100644
index 0000000..a62e9dd
--- /dev/null
+++ b/res/drawable/keyboard.png
diff --git a/res/layout/wiz_features.xml b/res/layout/wiz_features.xml
index cfda82a..c372010 100644
--- a/res/layout/wiz_features.xml
+++ b/res/layout/wiz_features.xml
@@ -44,15 +44,7 @@
 		android:layout_height="wrap_content"
 		android:text="When you have multiple sessions open, you can 'pan' between them by swiping your finger left-to-right or right-to-left over the screen."
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:paddingBottom="10dip"
-		/>
-
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:text="Use the volume up/down buttons to change font size for a console."
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:paddingBottom="10dip"
+		android:paddingBottom="15dip"
 		/>
 
 	<TextView
@@ -60,7 +52,7 @@
 		android:layout_height="wrap_content"
 		android:text="Long-press on your Android desktop to create direct shortcuts to frequently-used SSH hosts."
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:paddingBottom="10dip"
+		android:paddingBottom="15dip"
 		/>
 
 	<TextView
@@ -68,7 +60,7 @@
 		android:layout_height="wrap_content"
 		android:text="Slide your finger up/down on the right-half of the terminal screen to look at the scrollback history.  Slide up/down on the left-half to send the page up/down keys."
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:paddingBottom="10dip"
+		android:paddingBottom="15dip"
 		/>
 
 </LinearLayout>
diff --git a/res/layout/wiz_keyboard.xml b/res/layout/wiz_keyboard.xml
new file mode 100644
index 0000000..b51bb62
--- /dev/null
+++ b/res/layout/wiz_keyboard.xml
@@ -0,0 +1,89 @@
+<?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/>.
+-->
+<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"
+		android:layout_height="wrap_content"
+		android:text="Keyboard magic"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:paddingBottom="10dip"
+		android:textStyle="bold"
+		/>
+		
+	<ImageView
+		android:layout_width="fill_parent"
+		android:layout_height="150dip"
+		android:src="@drawable/keyboard"
+		android:paddingBottom="10dip"
+		/>
+	
+	
+	<TableLayout 
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		>
+		
+		<TableRow>
+			<TextView android:text="Volume key" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Tap up/down to\nchange font size\nin console" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+
+		<TableRow>
+			<TextView android:text="Right alt" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Tap for '/'" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+
+		<TableRow>
+			<TextView android:text="Right shift" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Tap for 'TAB' key" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+
+		<TableRow>
+			<TextView android:text="Trackball" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Tap once to toggle\nCTRL on, twice\nto send Esc" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+
+		<TableRow>
+			<TextView android:text="Left shift" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Hold left shift and\ntap number for\nF1, F2, etc" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+		
+		<TableRow>
+			<TextView android:text="Picture key" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
+			<TextView android:text="Tap to send Ctrl+A\nSpace (for 'screen'\nusers)" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
+		</TableRow>
+
+	</TableLayout>
+	
+</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2ec0bc6..607734b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="msg_copyright">Copyright &#169; 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
     <string name="msg_version">v1.0</string>
 
+
 	<string name="pref_emulation">emulation</string>
 	<string name="pref_scrollback">scrollback</string>
 	<string name="pref_keepalive">keepalive</string>
@@ -42,4 +43,66 @@
     <string name="bind_hours">%s hours ago</string>
     <string name="bind_days">%s days ago</string>
     
+
+
+	<string name="console_copy_done">Copied %d bytes to clipboard</string>
+	<string name="console_copy_start">Touch and drag to select area to copy</string>
+
+	<string name="console_menu_disconnect">Disconnect</string>
+	<string name="console_menu_copy">Copy</string>
+	<string name="console_menu_paste">Paste</string>
+	<string name="console_menu_tunnel">Tunnel</string>
+
+	<string name="tunnel_pos">Create tunnel</string>
+	<string name="tunnel_neg">Cancel</string>
+
+	<string name="tunnel_done_local">Successfully created tunnel -L%d:%s:%d</string>
+	<string name="tunnel_done_remote">Successfully created tunnel -R%d:%s:%d</string>
+	<string name="tunnel_problem">Problem creating tunnel, maybe you're using ports under 1024?</string>
+
+	<string name="list_format_error">Use the format 'username@hostname:port'</string>
+	<string name="list_menu_sortcolor">Sort by color</string>
+	<string name="list_menu_sortname">Sort by name</string>
+	<string name="list_menu_settings">Settings</string>
+	<string name="list_menu_about">About</string>
+
+	<string name="list_host_disconnect">Disconnect</string>
+	<string name="list_host_edit">Edit host</string>
+	<string name="list_host_delete">Delete host</string>
+
+	<string name="delete_message">Are you sure you want to delete '%s'?</string>
+	<string name="delete_pos">Yes, delete</string>
+	<string name="delete_neg">Cancel</string>
+
+
+	<string name="wizard_agree">Agree</string>
+	<string name="wizard_cancel">Cancel</string>
+	<string name="wizard_next">Next</string>
+	<string name="wizard_back">Back</string>
+
+
+	<string name="terminal_hostkey_warn">The authenticity of host '%s' can't be established.</string>
+	<string name="terminal_hostkey">RSA key fingerprint is %s</string>
+	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>
+
+	<string name="terminal_failed">Host key verification failed.</string>
+
+	<string name="terminal_auth">Trying to authenticate</string>
+
+	<string name="terminal_auth_pass">Attempting 'password' authentication</string>
+	<string name="terminal_auth_pass_hint">Password</string>
+	<string name="terminal_auth_pass_fail">Authentication method 'password' failed</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="upgrade">New version</string>
+	<string name="upgrade_pos">Yes, upgrade</string>
+	<string name="upgrade_neg">Not right now</string>
+
+
+
+
 </resources>