From 8e53848094c245e6a37b165674c088e09e119892 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@googlemail.com>
Date: Thu, 30 Jan 2014 11:52:43 +0100
Subject: [PATCH] add missing resource file, improved string in keyboard
 settings

---
 .../gen/keepass2android/softkeyboard/R.java   |   2 --
 .../java/res/values/strings_kp2a.xml          |  23 ++++++++++++++++++
 .../kp2akeytransform/bin/kp2akeytransform.jar | Bin 4055 -> 4055 bytes
 .../Resources/values/strings.xml              |   5 ++--
 4 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 src/java/KP2ASoftKeyboard2/java/res/values/strings_kp2a.xml

diff --git a/src/java/KP2ASoftKeyboard2/java/gen/keepass2android/softkeyboard/R.java b/src/java/KP2ASoftKeyboard2/java/gen/keepass2android/softkeyboard/R.java
index 58477d7a..50e97645 100644
--- a/src/java/KP2ASoftKeyboard2/java/gen/keepass2android/softkeyboard/R.java
+++ b/src/java/KP2ASoftKeyboard2/java/gen/keepass2android/softkeyboard/R.java
@@ -727,8 +727,6 @@ containing a value of this type.
         public static int kp2a_simple_keyboard_summary=0x7f0c009a;
         public static int kp2a_switch_on_sendgodone=0x7f0c009d;
         public static int kp2a_switch_on_sendgodone_summary=0x7f0c009e;
-        public static int kp2a_switch_rooted=0x7f0c009f;
-        public static int kp2a_switch_rooted_summary=0x7f0c00a0;
         public static int kp2a_user=0x7f0c0092;
         /**  Label for "switch to alphabetic" key.  Must be short to fit on key! 
          */
diff --git a/src/java/KP2ASoftKeyboard2/java/res/values/strings_kp2a.xml b/src/java/KP2ASoftKeyboard2/java/res/values/strings_kp2a.xml
new file mode 100644
index 00000000..b6303c0a
--- /dev/null
+++ b/src/java/KP2ASoftKeyboard2/java/res/values/strings_kp2a.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="change_entry">Select another entry</string>
+    <string name="open_entry">Select entry</string>
+    <string name="open_entry_for_app">Search for entry with "%1$s"</string>
+    <string name="kp2a_user">User</string>
+    <string name="kp2a_password">Password</string>
+    
+    <string name="kp2a_prefs">Credential input settings</string>
+    <string name="kp2a_auto_fill">Auto-Fill enabled</string>
+    <string name="kp2a_auto_fill_summary">Automatically fill in text when an empty field is entered, if a Keepass2Android entry is available for the keyboard and there is a value which matches the field\'s hint text.</string>
+    <string name="kp2a_remember_auto_fill">Remember field hint texts</string>
+    <string name="kp2a_remember_auto_fill_summary">If a text field is filled by manually selecting the Keepass2Android value, remember which value was entered into the text field. The text field is later redetected by its hint text.</string>
+    <string name="kp2a_simple_keyboard">Simple keyboard</string>
+    <string name="kp2a_simple_keyboard_summary">Show the simple 1-row keyboard if an entry is available for the keyboard. If disabled, a dialog is shown when the Keepass2Android key is pressed.</string>
+    
+    <string name="kp2a_lock_on_sendgodone">Lock database when done</string>
+    <string name="kp2a_lock_on_sendgodone_summary">When pressing the Done/Send/Go key on the simple 1-row keyboard, automatically lock the database.</string>
+    
+    <string name="kp2a_switch_on_sendgodone">Switch keyboard when done</string>
+    <string name="kp2a_switch_on_sendgodone_summary">When pressing the Done/Send/Go key on the simple 1-row keyboard, switch the keyboard.</string>
+    
+</resources>
diff --git a/src/java/kp2akeytransform/bin/kp2akeytransform.jar b/src/java/kp2akeytransform/bin/kp2akeytransform.jar
index 5a43a2879c95b80be060928e7fa6a2ffe29c1a2d..b79edbb40ee00ee9ef352d2bdffd4a961f6bc95d 100644
GIT binary patch
delta 117
zcmcaEe_ft8z?+#xgn@&DgJH9Z?L=O8=D8}i8^e8>K=kCfoJN~(GP$#YIGdF@${E3o
qxtxEY3~pW~W}vpoYk8f)>Ob=afoTuEL@>REFA7X^@<aH!{8<32pCW(&

delta 117
zcmcaEe_ft8z?+#xgn@&DgF(8;Vj{0Qvv#4y#&BOI5IuP=r_tt{Ozx~8&Sqtfaz-#?
qF6Un;gPWI$8K`aYT3%<c`p>*UVA_K(5lpY)ivrV}{1ARFe-;2K#vncb

diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 21b821d7..bdcc2f3d 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -265,7 +265,7 @@
   <string name="ShowKp2aKeyboardNotification_title">KP2A keyboard notification</string>
   <string name="ShowKp2aKeyboardNotification_summary">Make full entry accessible through the KP2A keyboard (recommended).</string>
   <string name="OpenKp2aKeyboardAutomatically_title">Switch keyboard</string>
-  <string name="OpenKp2aKeyboardAutomatically_summary">Open keyboard selection dialog when entry is available through KP2A keyboard after search from the browser or from the keyboard.</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">Open keyboard selection dialog when entry is available through KP2A keyboard after search from the browser.</string>
 	
 	<string name="kp2a_switch_rooted">Auto-switch on rooted devices</string>
     <string name="kp2a_switch_rooted_summary">On rooted devices, it is possible to automatically switch to the Keepass2Android keyboard (after search for an entry or by clicking the KP2A keyboard notification) and to switch back to the previous keyboard without showing the Input method picker. This also requires to install the Secure Settings app. See the KP2A documentation for more information!</string>
@@ -408,10 +408,11 @@
 	<string name="ChangeLog_title">Change log</string>
 
 	<string name="ChangeLog_0_9_3">
-		<b>Version 0.9.3 preview 2</b>\n
+		<b>Version 0.9.3</b>\n
 		* New keyboard with many improvements. See settings to customize.\n
 		* Read-only support for kdb (Keepass 1 files). Experimental!\n
 		* Added SFTP support\n
+		* Added workaround for bug in ART (Android 4.4.2)\n
 		* Bug fixes\n
 	</string>