# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1402698796 25200
# Node ID aac8e0496ef98b222acde62ecda2c9aacc596e1d
# Parent  ce8f132423390ed08ceefa0878de6bb6c63e3cea
add 5250 config entries

diff -r ce8f13242339 -r aac8e0496ef9 res/values/strings.xml
--- a/res/values/strings.xml	Fri Jun 13 15:27:08 2014 -0700
+++ b/res/values/strings.xml	Fri Jun 13 15:33:16 2014 -0700
@@ -346,6 +346,10 @@
 	<!-- Monitor field title for host editor preference -->
 	<string name="hostpref_monitor_title">"Monitor Init String"</string>
 
+	<!-- Override global emulation (terminal type) host editor preference -->
+	<string name="hostpref_emulation_title">"Emulation mode"</string>
+	<string name="hostpref_emulation_summary">"Override global emulation mode / answerback string"</string>
+
 	<!-- Host 5250_encryption preference title -->
 	<string name="hostpref_5250_encryption_title">"Host 5250 Encryption"</string>
 
diff -r ce8f13242339 -r aac8e0496ef9 res/xml/host_prefs.xml
--- a/res/xml/host_prefs.xml	Fri Jun 13 15:27:08 2014 -0700
+++ b/res/xml/host_prefs.xml	Fri Jun 13 15:33:16 2014 -0700
@@ -136,6 +136,7 @@
         <EditTextPreference
             android:key="hostemulation"
             android:title="@string/hostpref_emulation_title"
+            android:summary="@string/hostpref_emulation_summary"
             android:singleLine="true"
             />
 
diff -r ce8f13242339 -r aac8e0496ef9 src/com/five_ten_sg/connectbot/util/HostDatabase.java
--- a/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Fri Jun 13 15:27:08 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Fri Jun 13 15:33:16 2014 -0700
@@ -46,7 +46,7 @@
     public final static String TAG = "ConnectBot.HostDatabase";
 
     public final static String DB_NAME = "hosts";
-    public final static int DB_VERSION = 25;
+    public final static int DB_VERSION = 26;
 
     public final static String TABLE_HOSTS = "hosts";
     public final static String FIELD_HOST_NICKNAME = "nickname";