From d83358cd2ad4cf34a8ea83f5b42d11f9177bf007 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@googlemail.com>
Date: Mon, 2 Jun 2014 21:35:50 +0200
Subject: [PATCH] Increased version number removed strings which must be taken
 from library project moved TrayTotp settings entry, corrected title string

---
 .../Properties/AndroidManifest_net.xml        |  2 +-
 .../Resources/values/strings.xml              |  2 -
 .../Resources/xml/preferences.xml             | 40 ++++++++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index ac9d00c0..400ec26e 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="42" android:versionName="0.9.4-preview1" package="keepass2android.keepass2android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="43" android:versionName="0.9.4-preview1b" package="keepass2android.keepass2android" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
 	<permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" />
 	<application android:label="keepass2android" android:icon="@drawable/ic_launcher">
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index ac7eaae0..69958113 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -57,7 +57,6 @@
   <string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
   <string name="ellipsis">\u2026</string>
 
-  <string name="english_ime_settings">Custom.english_ime_setting</string>
   <string name="enter_filename">Enter database filename</string>
   <string name="entry_accessed">Accessed</string>
   <string name="entry_cancel">Cancel</string>
@@ -405,7 +404,6 @@
 
 	<string name="error_adding_keyfile">Error while adding the key file!</string>
 
-	<string name="language_selection_title">Custo.language_selection_title</string>
 	<string name="init_otp">Load OTP auxiliary file…</string>
 	<string name="otp_explanation">Enter the next One-time-passwords (OTPs). Swipe your Yubikey NEO at the back of your device to enter via NFC.</string>
 	<string name="otp_hint">OTP %1$d</string>
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index f763ed98..5e7dec2e 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -311,6 +311,27 @@
 			<intent android:action="keepass2android.softkeyboard.LatinIMESettings"/>
 		</PreferenceScreen>
 		
+		<PreferenceScreen
+	  android:key="@string/TrayTotp_prefs_key"
+	  android:title="@string/TrayTotp_prefs"
+		>
+
+			<EditTextPreference
+				 android:enabled="true"
+				 android:persistent="true"
+				 android:summary="@string/TrayTotp_SeedField_summary"
+				 android:defaultValue="TOTP Seed"
+				 android:title="@string/TrayTotp_SeedField_title"
+				 android:key="@string/TrayTotp_SeedField_key" />
+			<EditTextPreference
+				 android:enabled="true"
+				 android:persistent="true"
+				 android:summary="@string/TrayTotp_SettingsField_summary"
+				 android:defaultValue="TOTP Settings"
+				 android:title="@string/TrayTotp_SettingsField_title"
+				 android:key="@string/TrayTotp_SettingsField_key" />
+	</PreferenceScreen>
+		
 
 	</PreferenceScreen>
 
@@ -325,25 +346,6 @@
 		<intent android:action="keepass2android.AboutActivity"/>
 	</PreferenceScreen>
 	
-<PreferenceScreen
-	  android:key="@string/TrayTotp_prefs_key"
-	  android:title="@string/TrayTotp_prefs"
-		>
 
-			<EditTextPreference
-				 android:enabled="true"
-				 android:persistent="true"
-				 android:summary="@string/TrayTotp_SeedField_summary"
-				 android:defaultValue="TOTP Seed"
-				 android:title="@string/BinaryDirectory_title"
-				 android:key="@string/TrayTotp_SeedField_key" />
-			<EditTextPreference
-				 android:enabled="true"
-				 android:persistent="true"
-				 android:summary="@string/TrayTotp_SettingsField_summary"
-				 android:defaultValue="TOTP Settings"
-				 android:title="@string/TrayTotp_SettingsField_title"
-				 android:key="@string/TrayTotp_SettingsField_key" />
-	</PreferenceScreen>
 		
 </PreferenceScreen>